Merged updated British English translation from gnome-2-28 branch

This doesn't deal with any of the consequent fuzzy translations — it just
ensures we don't lose the work done for gnome-2-28.

1 files changed, 11513 insertions, 10067 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 5074fa1a20..bdcfd22276 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,14 +2,13 @@
 # Robert Brady <rwb197@zepler.org>, 2000.
 # Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
 # Bruce Cowan <bcowan@fastmail.co.uk>, 2009.
-#: ../shell/main.c:603
+#: ../shell/main.c:507
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution gnome-2.8\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=evolution\n"
-"POT-Creation-Date: 2009-04-07 17:21+0000\n"
-"PO-Revision-Date: 2009-04-05 16:13+0100\n"
+"Project-Id-Version: evolution\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-09-12 19:16+0100\n"
+"PO-Revision-Date: 2009-09-08 19:41+0100\n"
 "Last-Translator: Bruce Cowan <bcowan@fastmail.co.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,322 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution address book"
-msgstr "evolution address book"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "New Contact"
-msgstr "New Contact"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "New Contact List"
-msgstr "New Contact List"
-
-#: ../a11y/addressbook/ea-minicard-view.c:162
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "current address book folder %s has %d card"
-msgstr[1] "current address book folder %s has %d cards"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "Open"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "Contact List: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "Contact: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
-#: ../a11y/calendar/ea-cal-view-event.c:265
-msgid "It has alarms."
-msgstr "It has alarms."
-
-#: ../a11y/calendar/ea-cal-view-event.c:268
-msgid "It has recurrences."
-msgstr "It has recurrences."
-
-#: ../a11y/calendar/ea-cal-view-event.c:271
-msgid "It is a meeting."
-msgstr "It is a meeting."
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Calendar Event: Summary is %s."
-
-#: ../a11y/calendar/ea-cal-view-event.c:279
-msgid "Calendar Event: It has no summary."
-msgstr "Calendar Event: It has no summary."
-
-#: ../a11y/calendar/ea-cal-view-event.c:299
-msgid "calendar view event"
-msgstr "calendar view event"
-
-#: ../a11y/calendar/ea-cal-view-event.c:527
-msgid "Grab Focus"
-msgstr "Grab Focus"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "New Appointment"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "New All Day Event"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "New Meeting"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "Go to Today"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "Go to Date"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
-msgid "a table to view and select the current time range"
-msgstr "a table to view and select the current time range"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "It has %d event."
-msgstr[1] "It has %d events."
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "It has no events."
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Work Week View: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Day View: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "calendar view for a work week"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "calendar view for one or more days"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
-msgid "%d %b"
-msgstr "%d %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
-msgid "Gnome Calendar"
-msgstr "Gnome Calendar"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "search bar"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "evolution calendar search bar"
-
-#: ../a11y/calendar/ea-jump-button.c:147
-msgid "Jump button"
-msgstr "Jump button"
-
-#: ../a11y/calendar/ea-jump-button.c:156
-msgid "Click here, you can find more events."
-msgstr "Click here, you can find more events."
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Month View: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Week View: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "calendar view for a month"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "calendar view for one or more weeks"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "popup"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "pop up a child"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
-msgid "edit"
-msgstr "edit"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
-msgid "begin editing this cell"
-msgstr "begin editing this cell"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
-msgid "toggle"
-msgstr "toggle"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
-msgid "toggle the cell"
-msgstr "toggle the cell"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "expand"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "expands the row in the ETree containing this cell"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "collapse"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "collapses the row in the ETree containing this cell"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
-msgid "Table Cell"
-msgstr "Table Cell"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
-msgid "click to add"
-msgstr "click to add"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
-msgid "click"
-msgstr "click"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "sort"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Calendar: from %s to %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "evolution calendar item"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "Combo Button"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "Activate Default"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "Popup Menu"
-
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Toggle Attachment Bar"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "activate"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -386,13 +69,13 @@ msgstr "Could not remove address book."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -412,7 +95,7 @@ msgstr "Failed to authenticate with LDAP server."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1116
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
@@ -530,7 +213,7 @@ msgid ""
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:519
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -564,754 +247,20 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:598
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1621
+#: ../addressbook/conduit/address-conduit.c:1622
 msgid "Could not load address book"
 msgstr "Could not load address book"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1699
+#: ../addressbook/conduit/address-conduit.c:1702
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "C_ontacts"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "Certificates"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
-msgid "Contacts"
-msgstr "Contacts"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Evolution Address Book"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address popup"
-msgstr "Evolution Address Book address popup"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution Address Book address viewer"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution Address Book card viewer"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book component"
-msgstr "Evolution Address Book component"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "Evolution S/MIME Certificate Management Control"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "Manage your S/MIME certificates here"
-
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
-msgid "On This Computer"
-msgstr "On This Computer"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
-msgid "Personal"
-msgstr "Personal"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "On LDAP Servers"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Contact"
-
-#: ../addressbook/gui/component/addressbook-component.c:239
-msgid "Create a new contact"
-msgstr "Create a new contact"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
-msgctxt "New"
-msgid "Contact _List"
-msgstr "Contact _List"
-
-#: ../addressbook/gui/component/addressbook-component.c:247
-msgid "Create a new contact list"
-msgstr "Create a new contact list"
-
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
-msgid "New Address Book"
-msgstr "New Address Book"
-
-#: ../addressbook/gui/component/addressbook-component.c:254
-msgctxt "New"
-msgid "Address _Book"
-msgstr "Address _Book"
-
-#: ../addressbook/gui/component/addressbook-component.c:255
-msgid "Create a new address book"
-msgstr "Create a new address book"
-
-#: ../addressbook/gui/component/addressbook-component.c:418
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "Failed upgrading Address Book settings or folders."
-
-#: ../addressbook/gui/component/addressbook-config.c:332
-msgid "Base"
-msgstr "Base"
-
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
-msgid "_Type:"
-msgstr "_Type:"
-
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy _book content locally for offline operation"
-msgstr "Copy _book content locally for offline operation"
-
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "General"
-
-#: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "Address Book"
-
-#: ../addressbook/gui/component/addressbook-config.c:1003
-msgid "Server Information"
-msgstr "Server Information"
-
-#: ../addressbook/gui/component/addressbook-config.c:1005
-msgid "Authentication"
-msgstr "Authentication"
-
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "Details"
-
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
-msgid "Searching"
-msgstr "Searching"
-
-#: ../addressbook/gui/component/addressbook-config.c:1011
-msgid "Downloading"
-msgstr "Downloading"
-
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "Address Book Properties"
-msgstr "Address Book Properties"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
-msgid "Migrating..."
-msgstr "Migrating..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrating '%s':"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:646
-msgid "LDAP Servers"
-msgstr "LDAP Servers"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:761
-msgid "Autocompletion Settings"
-msgstr "Autocompletion Settings"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Rename the \"%s\" folder to:"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
-msgid "Rename Folder"
-msgstr "Rename Folder"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
-msgid "Folder names cannot contain '/'"
-msgstr "Folder names cannot contain '/'"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "_New Address Book"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "Save As vCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Rename..."
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "_Delete"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Properties"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "Contact Source Selector"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Enter password for %s (user %s)"
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:423
-#: ../plugins/publish-calendar/publish-calendar.c:191
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Enter password"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Autocomplete length"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML for the list of completion URIs"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML for the list of completion URIs."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "Show autocompleted name with an address"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "Show preview pane"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr "URI for the folder last used in the select names dialogue"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-msgid "URI for the folder last used in the select names dialog."
-msgstr "URI for the folder last used in the select names dialogue."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-msgid "Vertical pane position"
-msgstr "Vertical pane position"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Whether to force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "Whether to show the preview pane."
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Always _show address of the autocompleted contact"
-msgstr "Always _show address of the autocompleted contact"
-
-#: ../addressbook/gui/component/autocompletion-config.c:180
-msgid "Look up in address books"
-msgstr "Look up in address books"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:4
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>Authentication</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>Downloading</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>Searching</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>Type:</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "Add Address Book"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "Always"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "Anonymously"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-msgid "B_rowse this book until limit reached"
-msgstr "B_rowse this book until limit reached"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "Basic"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Distinguished name"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "E-mail address"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution will use this e-mail address to authenticate you with the server."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "Find Possible Search Bases"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "Lo_gin:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "Never"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "No encryption"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "One"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL encryption"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search Filter"
-msgstr "Search Filter"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "Search _base:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search _filter:"
-msgstr "Search _filter:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "Search filter"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Sub"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "Supported Search Bases"
-msgstr "Supported Search Bases"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS encryption"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"E-mail Address\" requires anonymous access to your LDAP "
-"server."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "Using distinguished name (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "Using e-mail address"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Whenever Possible"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "_Add Address Book"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-msgid "_Download limit:"
-msgstr "_Download limit:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-msgid "_Find Possible Search Bases"
-msgstr "_Find Possible Search Bases"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:52
-msgid "_Login method:"
-msgstr "_Login method:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "_Name:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:55
-msgid "_Search scope:"
-msgstr "_Search scope:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-msgid "_Timeout:"
-msgstr "_Timeout:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:58
-msgid "_Use secure connection:"
-msgstr "_Use secure connection:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:59
-msgid "cards"
-msgstr "cards"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:375
-msgid "minutes"
-msgstr "minutes"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>E-mail</b>"
@@ -1333,1322 +282,316 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Miscellaneous</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>Notes</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Other</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>Telephone</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Web Addresses</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>Work</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
+msgstr "Ca_tegories…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1238
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
-msgstr "Full _Name..."
+msgstr "Full _Name…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2494
 msgid "Image"
 msgstr "Image"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "Telephone"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "Work"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Address:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "_Assistant:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_Birthday:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:822
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_City:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "_Company:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "_Country:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "_Department:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "_File under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "_Free/Busy:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_Home Page:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Manager:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "_Notes:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Office:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "_Spouse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "_State/Province/County:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "_Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "_Wants to receive HTML mail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "_Web Log:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Where:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "Address"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1258
+#: ../addressbook/gui/widgets/e-addressbook-model.c:523
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:542
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1827 ../widgets/text/e-text.c:3689
-#: ../widgets/text/e-text.c:3690
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "United States"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "Afghanistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "Albania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "Algeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "American Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "Andorra"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "Angola"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "Anguilla"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "Antarctica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "Antigua And Barbuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "Argentina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "Armenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "Aruba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "Australia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "Austria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "Azerbaijan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "Bahamas"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "Bahrain"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "Barbados"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "Belarus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "Belgium"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "Belize"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "Benin"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "Bermuda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "Bhutan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "Bolivia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "Bosnia And Herzegowina"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "Botswana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "Bouvet Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "Brazil"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "British Indian Ocean Territory"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "Bulgaria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "Burundi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "Cambodia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "Cameroon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "Canada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "Cape Verde"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "Cayman Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "Central African Republic"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "Chad"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "Chile"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "China"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "Christmas Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "Cocos (Keeling) Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "Colombia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "Comoros"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "Congo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Congo, The Democratic Republic Of The"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "Cook Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "Cote d'Ivoire"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "Croatia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "Cuba"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "Cyprus"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "Czech Republic"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "Denmark"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "Djibouti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "Dominica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "Dominican Republic"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "Ecuador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "Egypt"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "El Salvador"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "Eritrea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "Estonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "Ethiopia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "Falkland Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "Faroe Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "Fiji"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "Finland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "France"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "French Guiana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "French Polynesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "French Southern Territories"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "Gabon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "Gambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "Georgia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "Germany"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "Ghana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "Greece"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "Greenland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "Grenada"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "Guadeloupe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "Guam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "Guatemala"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "Guernsey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "Guyana"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "Haiti"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "Heard And McDonald Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "Holy See"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "Honduras"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "Hong Kong"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "Hungary"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "Iceland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "India"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "Indonesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "Iran"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "Iraq"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "Ireland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Isle of Man"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "Israel"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "Italy"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "Jamaica"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "Japan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "Jersey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "Jordan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "Kazakhstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "Kenya"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "Kiribati"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Korea, Democratic People's Republic Of"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "Korea, Republic Of"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "Kuwait"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "Kyrgyzstan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "Laos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "Latvia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "Lebanon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "Lesotho"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "Liberia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "Libya"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "Liechtenstein"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "Lithuania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "Macao"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "Macedonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "Madagascar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "Malawi"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "Malaysia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "Maldives"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "Mali"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "Malta"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "Marshall Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "Martinique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "Mauritania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "Mauritius"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "Mayotte"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "Mexico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "Micronesia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "Moldova, Republic Of"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "Monaco"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "Mongolia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "Montserrat"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "Morocco"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "Mozambique"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "Myanmar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "Namibia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "Nauru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "Nepal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "Netherlands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "Netherlands Antilles"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "New Caledonia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "New Zealand"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "Nicaragua"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "Niger"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "Nigeria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "Niue"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "Norfolk Island"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "Northern Mariana Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "Norway"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "Oman"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "Pakistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "Palau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "Palestinian Territory"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "Panama"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "Papua New Guinea"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "Paraguay"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "Peru"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "Philippines"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "Pitcairn"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "Poland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "Puerto Rico"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "Qatar"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "Reunion"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "Romania"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "Russian Federation"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "Rwanda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "Saint Kitts And Nevis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "Saint Lucia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "Saint Vincent And The Grenadines"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "Samoa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "San Marino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "Sao Tome And Principe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "Saudi Arabia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "Senegal"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "Serbia And Montenegro"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "Seychelles"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "Sierra Leone"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "Singapore"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "Slovakia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "Slovenia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "Solomon Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "Somalia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "South Africa"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "South Georgia And The South Sandwich Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "Spain"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "St. Helena"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "St. Pierre And Miquelon"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "Sudan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "Suriname"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Svalbard And Jan Mayen Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "Swaziland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "Sweden"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "Switzerland"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "Syria"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "Tajikistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "Tanzania, United Republic Of"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "Thailand"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "Timor-Leste"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "Togo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "Tokelau"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "Tonga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "Trinidad And Tobago"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "Tunisia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "Turkey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "Turkmenistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "Turks And Caicos Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "Tuvalu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "Uganda"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "Ukraine"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "United Arab Emirates"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "United Kingdom"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "United States Minor Outlying Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "Uruguay"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "Uzbekistan"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "Venezuela"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "Viet Nam"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "Virgin Islands, British"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "Virgin Islands, U.S."
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "Wallis And Futuna Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "Western Sahara"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "Yemen"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "Zambia"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "Zimbabwe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:475
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "Name"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:535
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:537
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:538
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:536
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:534
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:533
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "Service"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "Location"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "Username"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:76
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../modules/mail/e-mail-shell-migrate.c:956
+msgid "Work"
+msgstr "Work"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
 msgid "Home"
 msgstr "Home"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2297
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:445
+#: ../calendar/gui/e-calendar-view.c:1603
 msgid "Other"
 msgstr "Other"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:536
+msgid "Error adding contact"
+msgstr "Error adding contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+msgid "Error modifying contact"
+msgstr "Error modifying contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+msgid "Error removing contact"
+msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Source Book"
 msgstr "Source Book"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
 msgid "Target Book"
 msgstr "Target Book"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
 msgid "Required Fields"
 msgstr "Required Fields"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
 msgid "Changed"
 msgstr "Changed"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
 #, c-format
 msgid "Contact Editor - %s"
-msgstr "Contact Editor - %s"
+msgstr "Contact Editor — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2883
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2656,200 +599,127 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3205
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:331
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:427
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:323
+#, fuzzy
+msgid "Shell"
+msgstr "Seychelles"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:324
+msgid "The EShell singleton"
 msgstr ""
-"Are you sure you want\n"
-"to delete these contact lists?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 msgstr ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Address _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "Ci_ty:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "Countr_y:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "Full Address"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "Post _Code:"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Miss"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "_First:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "_Last:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "_Middle:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "_Suffix:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "Add IM Account"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "_Account name:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "_IM Service:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "_Location:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>Members</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
-msgstr "Select..."
+msgstr "Select…"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
@@ -2863,25 +733,36 @@ msgstr "_List name:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an e-mail address or drag a contact into the list below:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:928
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1319
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+msgid "Error adding list"
+msgstr "Error adding list"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
+msgid "Error modifying list"
+msgstr "Error modifying list"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
+msgid "Error removing list"
+msgstr "Error removing list"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1228
+#: ../addressbook/gui/widgets/e-addressbook-model.c:513
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:528
 msgid "Book"
 msgstr "Book"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1248
 msgid "Is New List"
 msgstr "Is New List"
 
@@ -2923,69 +804,81 @@ msgstr ""
 "in this folder.  Would you like to add it anyway?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:510
+#: ../addressbook/gui/widgets/eab-contact-display.c:515
+#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:786
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Any field contains"
 msgstr "Any field contains"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "Email begins with"
 msgstr "E-mail begins with"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "Name contains"
 msgstr "Name contains"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+msgid "Error getting book view"
+msgstr "Error getting book view"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:533
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:535
 msgid "Query"
 msgstr "Query"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
-msgid "Error getting book view"
-msgstr "Error getting book view"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+#, fuzzy
+msgid "Search Interrupted"
+msgstr "Search Filter"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
+#: ../addressbook/gui/widgets/e-addressbook-view.c:645
+#: ../calendar/gui/e-calendar-table.c:886 ../calendar/gui/e-memo-table.c:669
+#: ../modules/calendar/e-memo-shell-content.c:597
+#: ../modules/calendar/e-task-shell-content.c:620
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3553
-#: ../widgets/text/e-text.c:3554
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Model"
 
@@ -2993,114 +886,82 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "Name begins with"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../calendar/gui/e-calendar-table.c:897 ../calendar/gui/e-memo-table.c:680
+#, fuzzy
+msgid "Shell View"
+msgstr "Select View: %s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
 msgid "Source"
 msgstr "Source"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:566
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Type"
-msgstr "Type"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
-msgid "Save as vCard..."
-msgstr "Save as vCard..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "_Open"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "_New Contact..."
-msgstr "_New Contact..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1134
+#, fuzzy
+msgid "Are you sure you want to delete these contact lists?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contact lists?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-msgid "New Contact _List..."
-msgstr "New Contact _List..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1138
+#, fuzzy
+msgid "Are you sure you want to delete this contact list?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contact lists?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Save as vCard..."
-msgstr "_Save as vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1142
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contact"
-msgstr "_Forward Contact"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1148
+#, fuzzy
+msgid "Are you sure you want to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "_Forward Contacts"
-msgstr "_Forward Contacts"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1152
+#, fuzzy
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to Contact"
-msgstr "Send _Message to Contact"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1156
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to List"
-msgstr "Send _Message to List"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
+msgid "Save as vCard..."
+msgstr "Save as vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "Send _Message to Contacts"
-msgstr "Send _Message to Contacts"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1345
+#, fuzzy, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "_Print"
-msgstr "_Print"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Cop_y to Address Book..."
-msgstr "Cop_y to Address Book..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-msgid "Mo_ve to Address Book..."
-msgstr "Mo_ve to Address Book..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-msgid "Cu_t"
-msgstr "Cu_t"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2072 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Copy"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-msgid "P_aste"
-msgstr "P_aste"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Any Category"
-msgstr "Any Category"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1350
+msgid "_Don't Display"
+msgstr "_Don't Display"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
-msgid "Unmatched"
-msgstr "Unmatched"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+msgid "Display _All Contacts"
+msgstr "Display _All Contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:553
 msgid "Assistant"
 msgstr "Assistant"
 
@@ -3129,8 +990,7 @@ msgid "Car Phone"
 msgstr "Car Phone"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3138,7 +998,7 @@ msgid "Categories"
 msgstr "Categories"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Company"
 msgstr "Company"
 
@@ -3187,22 +1047,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:552
 msgid "Manager"
 msgstr "Manager"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:526
 msgid "Nickname"
 msgstr "Nickname"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
 msgid "Note"
 msgstr "Note"
 
@@ -3231,14 +1091,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Role"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Spouse"
 msgstr "Spouse"
 
@@ -3257,6 +1117,7 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:519
 msgid "Title"
 msgstr "Title"
 
@@ -3268,63 +1129,59 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Website"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Width"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3739 ../widgets/text/e-text.c:3740
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Height"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Has Focus"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Field"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Field Name"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "Text Model"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Max field name length"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "Column Width"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3332,9 +1189,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Searching for the Contacts..."
+"Searching for the Contacts…"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3348,7 +1205,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -3362,7 +1219,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3372,7 +1229,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -3382,251 +1239,315 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:521
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Work E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Home E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "Other E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Selected"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Has Cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:621
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolution address book"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "New Contact"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:622
-msgid "_Send New Message To..."
-msgstr "_Send New Message To..."
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "New Contact List"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "current address book folder %s has %d card"
+msgstr[1] "current address book folder %s has %d cards"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "Open"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Contact List: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Contact: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
 msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:196
+#: ../widgets/misc/e-web-view.c:330
+msgid "_Send New Message To..."
+msgstr "_Send New Message To…"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:206
+#: ../widgets/misc/e-web-view.c:303
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+#: ../widgets/misc/e-web-view.c:313
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
 msgid "(map)"
 msgstr "(map)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:309
+#: ../addressbook/gui/widgets/eab-contact-display.c:320
 msgid "map"
 msgstr "map"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:753
 msgid "List Members"
 msgstr "List Members"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Department"
 msgstr "Department"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Profession"
 msgstr "Profession"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../modules/calendar/e-cal-shell-view-actions.c:214
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:329
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Phone"
 msgstr "Phone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
+msgid "Address"
+msgstr "Address"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Web Log"
 msgstr "Web Log"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2576
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../calendar/gui/e-calendar-view.c:1894 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2577
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../calendar/gui/e-calendar-view.c:1895
 msgid "Anniversary"
 msgstr "Anniversary"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#. orange
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/mail/e-mail-shell-migrate.c:957
+#: ../plugins/email-custom-header/email-custom-header.c:336
+msgid "Personal"
+msgstr "Personal"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:771
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:807
 msgid "Home page"
 msgstr "Home page"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:815
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Success"
 msgstr "Success"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Backend busy"
 msgstr "Backend busy"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Address Book does not exist"
 msgstr "Address Book does not exist"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "No Self Contact defined"
 msgstr "No Self Contact defined"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Permission denied"
 msgstr "Permission denied"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Contact not found"
 msgstr "Contact not found"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact ID already exists"
 msgstr "Contact ID already exists"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../calendar/gui/e-cal-component-preview.c:201
+#: ../calendar/gui/e-cal-model-tasks.c:465
+#: ../calendar/gui/e-cal-model-tasks.c:781
+#: ../calendar/gui/e-calendar-table.c:224
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:800 ../calendar/gui/print.c:2578
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Could not cancel"
 msgstr "Could not cancel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "TLS not Available"
 msgstr "TLS not Available"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "No such source"
 msgstr "No such source"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Not available in offline mode"
 msgstr "Not available in offline mode"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Other error"
 msgstr "Other error"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Invalid server version"
 msgstr "Invalid server version"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Unsupported authentication method"
 msgstr "Unsupported authentication method"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3636,7 +1557,7 @@ msgstr ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -3645,7 +1566,7 @@ msgstr ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:125
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -3653,7 +1574,7 @@ msgstr ""
 "This version of Evolution does not have LDAP support compiled into it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -3661,11 +1582,11 @@ msgstr ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:142
 msgid "Detailed error message:"
 msgstr "Detailed error message:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3677,7 +1598,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this address book."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -3689,69 +1610,20 @@ msgstr ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid "The backend for this address book was unable to parse this query."
 msgstr "The backend for this address book was unable to parse this query."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book refused to perform this query."
 msgstr "The backend for this address book refused to perform this query."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "Error adding list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
-msgid "Error adding contact"
-msgstr "Error adding contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "Error modifying list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "Error modifying contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "Error removing list"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
-msgid "Error removing contact"
-msgstr "Error removing contact"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgstr[1] ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "_Don't Display"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "Display _All Contacts"
-
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3760,363 +1632,140 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 msgid "Overwrite"
 msgstr "Overwrite"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:255
+#: ../addressbook/gui/widgets/eab-gui-util.c:258
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contact"
 msgstr[1] "contacts"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:304
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:341
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:455
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:599
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:602
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:604
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "Multiple vCards"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard for %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "Contact information"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "Contact information for %s"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
-msgid "Querying Address Book..."
-msgstr "Querying Address Book..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "There is one other contact."
-msgstr[1] "There are %d other contacts."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "Show Full vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "Show Compact vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "Save in address book"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Card View"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:5
 msgid "Importing..."
-msgstr "Importing..."
+msgstr "Importing…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard Importer"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Blank forms at end:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Body"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "Bottom:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "Dimensions:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "F_ont..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "Fonts"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Footer:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "Format"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:440 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Header"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Header/Footer"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Headings"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Headings for each letter"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Height:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Immediately follow each other"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Include:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Landscape"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Left:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Letter tabs on side"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Margins"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "Number of columns:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Options"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Orientation"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "Page"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Page Setup:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Paper"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Paper source:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Portrait"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Preview:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Print using grey shading"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Reverse on even pages"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "Right:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "Sections:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "Shading"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "Size:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Start on a new page"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Style name:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "Top:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "Type:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "Width:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "_Font..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Can not open file"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "Couldn't get list of address books"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "failed to open book"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "List local address book folders"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Show cards as vcard or csv file"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "Export in asynchronous mode"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4124,32 +1773,55 @@ msgstr ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Command line arguments error, please use --help option to see the usage."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Only support csv or vcard format."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "In async mode, output must be file."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "In normal mode, there is no need for the size option."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
+#: ../addressbook/util/addressbook.c:102
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
+
+#: ../addressbook/util/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
+
+#: ../addressbook/util/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Enter password for %s (user %s)"
+
+#: ../addressbook/util/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Enter password"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -4554,7 +2226,7 @@ msgstr "Your tasks will not be available until Evolution is restarted."
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:332
 msgid "_Save"
 msgstr "_Save"
 
@@ -4576,312 +2248,54 @@ msgstr "_Send Notice"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 msgid "Split Multi-Day Events:"
 msgstr "Split Multi-Day Events:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1520
+#: ../calendar/conduits/calendar/calendar-conduit.c:1521
+#: ../calendar/conduits/memo/memo-conduit.c:814
+#: ../calendar/conduits/memo/memo-conduit.c:815
+#: ../calendar/conduits/todo/todo-conduit.c:1014
+#: ../calendar/conduits/todo/todo-conduit.c:1015
 msgid "Could not start evolution-data-server"
 msgstr "Could not start evolution-data-server"
 
+#: ../calendar/conduits/calendar/calendar-conduit.c:1628
 #: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "Could not read pilot's Calendar application block"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:908
+#: ../calendar/conduits/memo/memo-conduit.c:911
 msgid "Could not read pilot's Memo application block"
 msgstr "Could not read pilot's Memo application block"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:955
+#: ../calendar/conduits/memo/memo-conduit.c:958
 msgid "Could not write pilot's Memo application block"
 msgstr "Could not write pilot's Memo application block"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Default Priority:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1098
+#: ../calendar/conduits/todo/todo-conduit.c:1101
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1143
+#: ../calendar/conduits/todo/todo-conduit.c:1146
 msgid "Could not write pilot's ToDo application block"
 msgstr "Could not write pilot's ToDo application block"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
-msgid "Calendars"
-msgstr "Calendars"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolution's Memos component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Evolution's Tasks component"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "Memo_s"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:389
-#: ../calendar/gui/memos-control.c:405
-msgid "Memos"
-msgstr "Memos"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Tasks"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "_Calendars"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minute"
-msgstr[1] "minutes"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:376
-msgid "hours"
-msgid_plural "hours"
-msgstr[0] "hour"
-msgstr[1] "hours"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
-msgid "Start time"
-msgstr "Start time"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-msgid "Appointments"
-msgstr "Appointments"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Dismiss _All"
-msgstr "Dismiss _All"
-
-#. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
-msgid "Location:"
-msgstr "Location:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "Snooze _time:"
-msgstr "Snooze _time:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-msgid "_Dismiss"
-msgstr "_Dismiss"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-msgid "_Snooze"
-msgstr "_Snooze"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
-msgid "location of appointment"
-msgstr "location of appointment"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
-msgid "No summary available."
-msgstr "No summary available."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-msgid "No description available."
-msgstr "No description available."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
-msgid "No location information available."
-msgstr "No location information available."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
-#, c-format
-msgid "You have %d alarms"
-msgstr "You have %d alarms"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
-#: ../e-util/e-non-intrusive-error-dialog.h:41
-msgid "Warning"
-msgstr "Warning"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution does not support calendar reminders with\n"
-"e-mail notifications yet, but this reminder was\n"
-"configured to send an e-mail.  Evolution will display\n"
-"a normal reminder dialogue box instead."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
-#, c-format
-msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
-msgstr ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
-msgid "Do not ask me about this program again."
-msgstr "Do not ask me about this program again."
-
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-
-#: ../calendar/gui/alarm-notify/util.c:44
-msgid "invalid time"
-msgstr "invalid time"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
-#: ../calendar/gui/misc.c:116
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
-#: ../calendar/gui/misc.c:122
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
-#: ../calendar/gui/misc.c:126
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
-
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Alarm programs"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Amount of time in seconds the error should be shown on the status bar."
 
@@ -4902,121 +2316,141 @@ msgid "Calendars to run alarms for"
 msgstr "Calendars to run alarms for"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "Check this to use system timezone in Evolution."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Colour to draw the Marcus Bains line in the Day View."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "Compress weekends in month view"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Confirm expunge"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "Count of default recurrence for a new event. -1 means forever."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Days on which the start and end of work hours should be indicated."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Default appointment reminder"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Default recurrence count"
+msgstr "Default recurrence count"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Default reminder units"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Default reminder value"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "Directory for saving alarm audio files"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "Event Gradient"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "Event Transparency"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "Free/busy server URLs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "Free/busy template URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "Gradient of the events in calendar views."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "Hide completed tasks"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "Hide task units"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "Hide task value"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "Horizontal pane position"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervals shown in Day and Work Week views, in minutes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "Last alarm time"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Level beyond which the message should be logged."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr "List of recently used second time zones in a Day View."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "List of server URLs for free/busy publishing."
 msgstr "List of server URLs for free/busy publishing."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains Line"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains Line Colour - Day View"
+msgstr "Marcus Bains Line Colour — Day View"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains Line Colour - Time bar"
+msgstr "Marcus Bains Line Colour — Time bar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -5024,39 +2458,53 @@ msgstr ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Maximum number of recently used timezones to remember."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#, fuzzy
+msgid "Memo layout style"
+msgstr "_Reply style:"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#, fuzzy
+msgid "Memo preview pane position (vertical)"
+msgstr "Month view vertical pane position"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minute the workday ends on, 0 to 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minute the workday starts on, 0 to 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "Month view horizontal pane position"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "Month view vertical pane position"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining a default reminder."
 msgstr "Number of units for determining a default reminder."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Number of units for determining when to hide tasks."
 msgstr "Number of units for determining when to hide tasks."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "Overdue tasks colour"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5064,7 +2512,7 @@ msgstr ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5072,7 +2520,19 @@ msgstr ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5080,15 +2540,7 @@ msgstr ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5096,7 +2548,7 @@ msgstr ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5104,69 +2556,85 @@ msgstr ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary calendar"
+msgstr "Primary calendar"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+msgid "Primary memo list"
+msgstr "Primary memo list"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+msgid "Primary task list"
+msgstr "Primary task list"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programs that are allowed to be run by alarms."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr "Recently used second time zones in a Day View"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "Save directory for alarm audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+msgid "Scroll Month View by a week"
+msgstr "Scroll Month View by a week"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Show RSVP field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Show Role field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
 msgstr "Show appointment end times in week and month views"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Show categories field in the event/meeting/task editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "Show display alarms in notification tray"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Show status field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Show the \"Preview\" pane"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+msgid "Show the memo preview pane"
 msgstr "Show the \"Preview\" pane"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Show the \"Preview\" pane."
-msgstr "Show the \"Preview\" pane."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#, fuzzy
+msgid "Show the task preview pane"
+msgstr "Show the \"Preview\" pane"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Show timezone field in the event/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Show type field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week number in Day and Work Week View"
 msgstr "Show week number in Day and Work Week View"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Show week numbers in date navigator"
 msgstr "Show week numbers in date navigator"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -5174,15 +2642,25 @@ msgstr ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid "Tasks due today color"
-msgstr "Tasks due today colour"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Tasks vertical pane position"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+msgid "Task preview pane position (horizontal)"
 msgstr "Tasks vertical pane position"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#, fuzzy
+msgid "Task preview pane position (vertical)"
+msgstr "Tasks vertical pane position"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Tasks due today color"
+msgstr "Tasks due today colour"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5191,7 +2669,7 @@ msgstr ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5199,11 +2677,25 @@ msgstr ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "The second timezone for a Day View"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5211,20 +2703,19 @@ msgstr ""
 "This can have three possible values: 0 for errors, 1 for warnings, 2 for "
 "debug messages."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "Time divisions"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "Time the last alarm ran, in time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5232,41 +2723,65 @@ msgstr ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "Twenty four hour time format"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "URI of the highlighted (\"primary\") calendar"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "URI of the highlighted (\"primary\") memo list"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "URI of the highlighted (\"primary\") task list"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+msgid "Use system timezone"
+msgstr "Use system timezone"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "Use the system timezone instead of the timezone selected in Evolution."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "Vertical pane position"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "Week start"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Whether or not to use the notification tray for display alarms."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Whether to ask for confirmation when deleting an appointment or task."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Whether to ask for confirmation when expunging appointments and tasks."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5274,287 +2789,89 @@ msgstr ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Whether to display the end time of events in the week and month views."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Whether to hide completed tasks in the tasks view."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "Whether to scroll a Month View by a week, not by a month."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a default reminder for appointments."
 msgstr "Whether to set a default reminder for appointments."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Whether to show RSVP field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Whether to show categories field in the event/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Whether to show role field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Whether to show status field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Whether to show timezone field in the event/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Whether to show type field in the event/task/meeting editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "Whether to show week number in the Day and Work Week View."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Whether to show week numbers in the date navigator."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Whether to use daylight savings time while displaying events."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "Work days"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "Workday end hour"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "Workday end minute"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "Workday start hour"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "Workday start minute"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "daylight savings time"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Description contains"
-msgstr "Description contains"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Category is"
-msgstr "Category is"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Comment contains"
-msgstr "Comment contains"
-
-#: ../calendar/gui/cal-search-bar.c:79
-msgid "Location contains"
-msgstr "Location contains"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Next 7 Days' Tasks"
-msgstr "Next 7 Days' Tasks"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Active Tasks"
-msgstr "Active Tasks"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Overdue Tasks"
-msgstr "Overdue Tasks"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Completed Tasks"
-msgstr "Completed Tasks"
-
-#: ../calendar/gui/cal-search-bar.c:656
-msgid "Tasks with Attachments"
-msgstr "Tasks with Attachments"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Active Appointments"
-msgstr "Active Appointments"
-
-#: ../calendar/gui/cal-search-bar.c:706
-msgid "Next 7 Days' Appointments"
-msgstr "Next 7 Days' Appointments"
-
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Print"
-
-#: ../calendar/gui/calendar-commands.c:315
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-
-#: ../calendar/gui/calendar-commands.c:321
-msgid "Purge events older than"
-msgstr "Purge events older than"
-
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "days"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
-#. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
-msgid "On The Web"
-msgstr "On The Web"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "Birthdays & Anniversaries"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "Weather"
-
-#: ../calendar/gui/calendar-component.c:676
-msgid "_New Calendar"
-msgstr "_New Calendar"
-
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
-msgid "_Copy..."
-msgstr "_Copy..."
-
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
-msgid "_Make available for offline use"
-msgstr "_Make available for offline use"
-
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
-msgid "_Do not make available for offline use"
-msgstr "_Do not make available for offline use"
-
-#: ../calendar/gui/calendar-component.c:1013
-msgid "Failed upgrading calendars."
-msgstr "Failed upgrading calendars."
-
-#: ../calendar/gui/calendar-component.c:1142
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "Unable to open the calendar '%s' for creating events and meetings"
-
-#: ../calendar/gui/calendar-component.c:1158
-msgid "There is no calendar available for creating events and meetings"
-msgstr "There is no calendar available for creating events and meetings"
-
-#: ../calendar/gui/calendar-component.c:1271
-msgid "Calendar Source Selector"
-msgstr "Calendar Source Selector"
-
-#: ../calendar/gui/calendar-component.c:1487
-msgid "New appointment"
-msgstr "New appointment"
-
-#: ../calendar/gui/calendar-component.c:1488
-msgctxt "New"
-msgid "_Appointment"
-msgstr "_Appointment"
-
-#: ../calendar/gui/calendar-component.c:1489
-msgid "Create a new appointment"
-msgstr "Create a new appointment"
-
-#: ../calendar/gui/calendar-component.c:1495
-msgid "New meeting"
-msgstr "New meeting"
-
-#: ../calendar/gui/calendar-component.c:1496
-msgctxt "New"
-msgid "M_eeting"
-msgstr "M_eeting"
-
-#: ../calendar/gui/calendar-component.c:1497
-msgid "Create a new meeting request"
-msgstr "Create a new meeting request"
-
-#: ../calendar/gui/calendar-component.c:1503
-msgid "New all day appointment"
-msgstr "New all day appointment"
-
-#: ../calendar/gui/calendar-component.c:1504
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "All Day A_ppointment"
-
-#: ../calendar/gui/calendar-component.c:1505
-msgid "Create a new all-day appointment"
-msgstr "Create a new all-day appointment"
-
-#: ../calendar/gui/calendar-component.c:1511
-msgid "New calendar"
-msgstr "New calendar"
-
-#: ../calendar/gui/calendar-component.c:1512
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "Cale_ndar"
-
-#: ../calendar/gui/calendar-component.c:1513
-msgid "Create a new calendar"
-msgstr "Create a new calendar"
+#: ../calendar/gui/cal-editor-utils.c:105
+msgid "Invalid object"
+msgstr "Invalid object"
 
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
@@ -5594,20 +2911,20 @@ msgid "Category"
 msgstr "Category"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Classification"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
+#: ../calendar/gui/e-cal-model.c:526 ../calendar/gui/e-calendar-table.c:704
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Confidential"
 msgstr "Confidential"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Description"
@@ -5627,35 +2944,41 @@ msgstr "Do Not Exist"
 msgid "Exist"
 msgstr "Exist"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:721
+#: ../plugins/save-calendar/csv-format.c:370
+msgid "Location"
+msgstr "Location"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organiser"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
+#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
+#: ../calendar/gui/e-cal-model.c:515 ../calendar/gui/e-cal-model.c:522
+#: ../calendar/gui/e-calendar-table.c:702 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:295
 msgid "Recurrence"
 msgstr "Recurrence"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Summary"
 msgstr "Summary"
 
@@ -5675,34 +2998,38 @@ msgid "does not contain"
 msgstr "does not contain"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "is"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "is not"
 
-#: ../calendar/gui/comp-editor-factory.c:409
-msgid "Error while opening the calendar"
-msgstr "Error while opening the calendar"
+#: ../calendar/gui/dialogs/alarm-dialog.c:627
+msgid "Edit Alarm"
+msgstr "Edit Alarm"
 
-#: ../calendar/gui/comp-editor-factory.c:415
-msgid "Method not supported when opening the calendar"
-msgstr "Method not supported when opening the calendar"
+#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Pop up an alert"
 
-#: ../calendar/gui/comp-editor-factory.c:421
-msgid "Permission denied to open the calendar"
-msgstr "Permission denied to open the calendar"
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Play a sound"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
-msgid "Unknown error"
-msgstr "Unknown error"
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Run a program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:607
-msgid "Edit Alarm"
-msgstr "Edit Alarm"
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Send an e-mail"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
@@ -5733,83 +3060,68 @@ msgid "Mes_sage:"
 msgstr "Mes_sage:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Play a sound"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Pop up an alert"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Run a program"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Select A File"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Send To:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Send an e-mail"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Arguments:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "_Repeat the alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Sound:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "after"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "before"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "day(s)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "end of appointment"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"before\n"
+"after"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "extra times every"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "hour(s)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "minute(s)"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"minutes\n"
+"hours\n"
+"days"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "start of appointment"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"start of appointment\n"
+"end of appointment"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5820,47 +3132,55 @@ msgid "A_dd"
 msgstr "A_dd"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarms"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2905
+#: ../calendar/gui/e-cal-model-tasks.c:773
 #: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1727
-#: ../widgets/misc/e-signature-combo-box.c:74
+#: ../calendar/gui/e-itip-control.c:1159 ../filter/filter-rule.c:946
+#: ../mail/em-account-editor.c:919 ../mail/em-account-editor.c:1728
+#: ../modules/mail/e-mail-junk-hook.c:95
+#: ../plugins/calendar-weather/calendar-weather.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:378
+#: ../plugins/email-custom-header/email-custom-header.c:393
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2217
+#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1555
+#: ../widgets/misc/e-dateedit.c:1766
+#: ../widgets/misc/e-signature-combo-box.c:75
+#: ../widgets/table/e-cell-date-edit.c:312
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "Selected Calendars for Alarms"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Time and date:"
+msgstr "Time and date:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "Date only:"
+msgstr "Date only:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(Shown in a Day View)"
@@ -5887,51 +3207,72 @@ msgstr ""
 "<i>%u and %d will be replaced by user and domain from the e-mail address.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">Alarms</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alerts</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">Date/Time Format</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Default Free/Busy Server</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../mail/mail-config.glade.h:18
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Task List</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Time</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Work Week</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "Adjust for daylight sa_ving time"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "Day _ends:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Display"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+msgid "Display alarms in _notification area only"
+msgstr "Display alarms in _notification area only"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "Friday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:82
+#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/addressbook/ldap-config.glade.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:2567
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "General"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5941,13 +3282,13 @@ msgstr ""
 "Hours\n"
 "Days"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "Monday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5965,215 +3306,245 @@ msgstr ""
 "Saturday\n"
 "Sunday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:102
 msgid "Pick a color"
 msgstr "Pick a colour"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "S_un"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr "Sc_roll Month View by a week"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
 msgstr "Se_cond zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Select the calendars for alarm notification"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "Sh_ow a reminder"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
 msgstr "Show a _reminder"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Show week n_umber in Day and Work Week View"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "Sunday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "T_asks due today:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "T_hu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Template:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "Time format:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Use s_ystem time zone"
+msgstr "Use s_ystem time zone"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "Wednesday"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "Wee_k starts on:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "Work days:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hour (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "_24 hour"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ask for confirmation when deleting items"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "_Compress weekends in month view"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "_Fri"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "_Hide completed tasks after"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "_Mon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "_Overdue tasks:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "_Sat"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "_Show appointment end times in week and month view"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "_Time divisions:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "_Tue"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "_Wed"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr "before every anniversary/birthday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "before every appointment"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Type:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:542
+msgid "_Type:"
+msgstr "_Type:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:150
+#: ../modules/addressbook/ldap-config.glade.h:36
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "_Name:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Cop_y calendar contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Cop_y task list contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Cop_y memo list contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Colou_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Task List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Task List Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "New Task List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Memo List Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "New Memo List"
 
@@ -6226,297 +3597,244 @@ msgstr "%s  You have made no changes, update the editor?"
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2350
 msgid " to "
 msgstr " to "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2354
 msgid " (Completed "
 msgstr " (Completed "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2356
 msgid "Completed "
 msgstr "Completed "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2361
 msgid " (Due "
 msgstr " (Due "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2363
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "Attached message - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1786
-#: ../composer/e-msg-composer.c:2005
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Attached message"
-msgstr[1] "%d attached messages"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2073
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "_Move"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2075
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "Cancel _Drag"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3316 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:456
-msgid "attachment"
-msgstr "attachment"
+#: ../calendar/gui/dialogs/comp-editor.c:238
+msgid "Could not save attachments"
+msgstr "Could not save attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:501
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:596
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:603
 #, c-format
 msgid "Meeting - %s"
-msgstr "Meeting - %s"
+msgstr "Meeting — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:605
 #, c-format
 msgid "Appointment - %s"
-msgstr "Appointment - %s"
+msgstr "Appointment — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "Assigned Task - %s"
+msgstr "Assigned Task — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Task - %s"
-msgstr "Task - %s"
+msgstr "Task — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:618
 #, c-format
 msgid "Memo - %s"
-msgstr "Memo - %s"
+msgstr "Memo — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:634
 msgid "No Summary"
 msgstr "No Summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:788
 msgid "Keep original item?"
 msgstr "Keep original item?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:992
 msgid "Click here to close the current window"
 msgstr "Click here to close the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:999
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1006
 msgid "Cut selected text to the clipboard"
 msgstr "Cut selected text to the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Click here to view help available"
 msgstr "Click here to view help available"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:1020
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1041
 msgid "Click here to save the current window"
 msgstr "Click here to save the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1048
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1055
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1062
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:111
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../shell/e-shell-window-actions.c:1599
+#: ../widgets/menus/gal-define-views.glade.h:5
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1069 ../mail/e-mail-browser.c:104
+#: ../shell/e-shell-window-actions.c:1606
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1076
+#: ../shell/e-shell-window-actions.c:1613
 msgid "_Help"
 msgstr "_Help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1648
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../composer/e-composer-actions.c:304
 msgid "_Attachment..."
-msgstr "_Attachment..."
+msgstr "_Attachment…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Click here to attach a file"
 msgstr "Click here to attach a file"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1186
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1210
+#: ../composer/e-composer-private.c:68
 msgid "Recent _Documents"
 msgstr "Recent _Documents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Attach"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> Attachment"
-msgstr[1] "<b>%d</b> Attachments"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "Hide Attachment _Bar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "Show Attachment _Bar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_Remove"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "_Add attachment..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "Show Attachments"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "Press space key to toggle attachment bar"
+#: ../calendar/gui/dialogs/comp-editor.c:1738
+msgid "Save"
+msgstr "Save"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3349
+#: ../calendar/gui/dialogs/comp-editor.c:2013
+#: ../calendar/gui/dialogs/comp-editor.c:2062
+#: ../calendar/gui/dialogs/comp-editor.c:2944
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3378
+#: ../calendar/gui/dialogs/comp-editor.c:2912 ../mail/em-utils.c:359
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "attachment"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2974
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -6586,10 +3904,10 @@ msgstr "The item could not be deleted due to an error"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
-msgstr "Contacts..."
+msgstr "Contacts…"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Delegate To:"
 
@@ -6616,7 +3934,7 @@ msgstr "Make this a recurring event"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "Send Options"
 
@@ -6649,203 +3967,242 @@ msgstr "_Free/Busy"
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:292
 msgid "Appoint_ment"
 msgstr "Appoint_ment"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:750
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "Event cannot be edited, because the selected calendar is read only"
+
+#: ../calendar/gui/dialogs/event-page.c:754
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "Event cannot be fully edited, because you are not the organiser"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:2662
 msgid "This event has alarms"
 msgstr "This event has alarms"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:829
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:878
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1064
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1067
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:833
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1248
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1271
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1440
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "The organizer selected no longer has an account."
 msgstr "The organiser selected no longer has an account."
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1446
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:899
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1471
+#: ../calendar/gui/dialogs/task-page.c:923
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
-msgid "_Add "
-msgstr "_Add "
-
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2535
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2579
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1717
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "You are acting on behalf of %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2879
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d day before appointment"
 msgstr[1] "%d days before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2885
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hour before appointment"
 msgstr[1] "%d hours before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2891
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute before appointment"
 msgstr[1] "%d minutes before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2904
 msgid "Customize"
 msgstr "Customise"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "1 day before appointment"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "1 hour before appointment"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "15 minutes before appointment"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
-msgstr "Attendee_s..."
+msgstr "Attendee_s…"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Attendees"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Custom Alarm:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Event Description"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Su_mmary:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Description:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:363
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Location:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Time:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "for"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:167 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
-msgstr "until"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>Att_endees</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "C_hange Organiser"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Co_ntacts..."
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"for\n"
+"until"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Organiser:"
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:515
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
+#, fuzzy
+msgid "hours"
+msgstr "hour"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../modules/addressbook/ldap-config.glade.h:43
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:514
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:739
+msgid "minutes"
+msgstr "minutes"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2499
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "Memo cannot be edited, because the selected memo list is read only"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Memo cannot be fully edited, because you are not the organiser"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Unable to open memos in '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1037 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:938 ../mail/em-format-html.c:2137
+#: ../mail/em-format-html.c:2195 ../mail/em-format-html.c:2220
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "To"
 
@@ -6859,7 +4216,7 @@ msgid "T_o:"
 msgstr "T_o:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:378
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Group:"
@@ -6884,37 +4241,37 @@ msgstr "You are modifying a recurring task. What would you like to modify?"
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "You are modifying a recurring memo. What would you like to modify?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "End time of the recurrence was before event's start"
 msgstr "End time of the recurrence was before event's start"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:958
 msgid "on"
 msgstr "on"
 
@@ -6922,7 +4279,7 @@ msgstr "on"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "first"
 msgstr "first"
 
@@ -6931,7 +4288,7 @@ msgstr "first"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1021
 msgid "second"
 msgstr "second"
 
@@ -6939,7 +4296,7 @@ msgstr "second"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "third"
 msgstr "third"
 
@@ -6947,21 +4304,29 @@ msgstr "third"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "fourth"
 msgstr "fourth"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
+msgid "fifth"
+msgstr "fifth"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "last"
 msgstr "last"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -6969,7 +4334,7 @@ msgstr "Other Date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -6977,7 +4342,7 @@ msgstr "1st to 10th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -6985,45 +4350,45 @@ msgstr "11th to 20th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "day"
 msgstr "day"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1237
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Could not get a selection to modify."
 msgstr "Could not get a selection to modify."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Modify exception"
 msgstr "Modify exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 msgid "Could not get a selection to delete."
 msgstr "Could not get a selection to delete."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -7040,50 +4405,56 @@ msgstr "<b>Preview</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Recurrence</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "Every"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "This appointment rec_urs"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "forever"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "month(s)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "week(s)"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "year(s)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"for\n"
+"until\n"
+"forever"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "Send my alarms with this event"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+msgid "Notify new attendees _only"
+msgstr "Notify new attendees _only"
+
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:484
 msgid "Web Page"
 msgstr "Web Page"
 
@@ -7095,74 +4466,38 @@ msgstr "<span weight=\"bold\">Miscellaneous</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Status</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "Completed"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "High"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "In Progress"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "Low"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1007 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "Normal"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Not Started"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Cancelled"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "P_ercent complete:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "Stat_us:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Undefined"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Date completed:"
@@ -7185,39 +4520,47 @@ msgid "Click to change or view the status details of the task"
 msgstr "Click to change or view the status details of the task"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:360
 msgid "_Send Options"
 msgstr "_Send Options"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:335
 msgid "_Task"
 msgstr "_Task"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:338
 msgid "Task Details"
 msgstr "Task Details"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:334
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Task cannot be edited, because the selected task list is read only"
+
+#: ../calendar/gui/dialogs/task-page.c:338
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Task cannot be fully edited, because you are not the organiser"
+
+#: ../calendar/gui/dialogs/task-page.c:386
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_ser:"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:806
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1674
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
-msgstr "Atte_ndees..."
+msgstr "Atte_ndees…"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
-msgstr "Categor_ies..."
+msgstr "Categor_ies…"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_ue date:"
@@ -7243,6 +4586,31 @@ msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:406 ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:412 ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/e-alarm-list.c:418 ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
@@ -7303,80 +4671,138 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
-#, c-format
-msgid "Click to open %s"
-msgstr "Click to open %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-preview.c:110 ../filter/filter-rule.c:863
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
-msgid "Start Date:"
-msgstr "Start Date:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Description:"
-msgstr "Description:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "Web Page:"
+#: ../calendar/gui/e-cal-component-preview.c:116
+#, fuzzy
+msgid "Categories:"
+msgstr "Categories"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:151
+#: ../calendar/gui/e-itip-control.c:1163
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:158
+#: ../calendar/gui/e-cal-component-preview.c:169
+msgid "Start Date:"
+msgstr "Start Date:"
+
+#: ../calendar/gui/e-cal-component-preview.c:180
 msgid "Due Date:"
 msgstr "Due Date:"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:191
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:777
+#: ../calendar/gui/e-cal-model-tasks.c:854
+#: ../calendar/gui/e-calendar-table.c:220
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:798 ../calendar/gui/print.c:2572
+msgid "In Progress"
+msgstr "In Progress"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:779
+#: ../calendar/gui/e-calendar-table.c:222
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:799 ../calendar/gui/e-itip-control.c:948
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/print.c:2575 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:360
+msgid "Completed"
+msgstr "Completed"
+
+#: ../calendar/gui/e-cal-component-preview.c:205
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:775
+#: ../calendar/gui/e-calendar-table.c:218
+#: ../calendar/gui/e-calendar-table.c:229
+#: ../calendar/gui/e-calendar-table.c:797 ../calendar/gui/print.c:2569
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Not Started"
+
+#: ../calendar/gui/e-cal-component-preview.c:216
 msgid "Priority:"
 msgstr "Priority:"
 
+#: ../calendar/gui/e-cal-component-preview.c:218
+#: ../calendar/gui/e-calendar-table.c:724 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1077
+msgid "High"
+msgstr "High"
+
+#: ../calendar/gui/e-cal-component-preview.c:220
+#: ../calendar/gui/e-cal-model.c:1232 ../calendar/gui/e-calendar-table.c:725
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1076
+msgid "Normal"
+msgstr "Normal"
+
+#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-calendar-table.c:726 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1075
+msgid "Low"
+msgstr "Low"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-itip-control.c:1219
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:65
+msgid "Description:"
+msgstr "Description:"
+
+#: ../calendar/gui/e-cal-component-preview.c:263
+msgid "Web Page:"
+msgstr "Web Page:"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Created"
+msgstr "Created"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "End Date"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Last modified"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Start Date"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:776
 msgid "Free"
 msgstr "Free"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:777
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Busy"
 msgstr "Busy"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:727
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7386,234 +4812,167 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:856
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
+#: ../calendar/gui/e-cal-model.c:362 ../calendar/gui/gnome-cal.c:523
+#: ../shell/e-shell.c:720
+#, fuzzy
+msgid "Shell Settings"
+msgstr "Settings"
+
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../shell/e-shell.c:721
+#, fuzzy
+msgid "Application-wide settings"
+msgstr "Autocompletion Settings"
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
+#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:977
+#: ../calendar/gui/print.c:994 ../e-util/e-charset.c:52
+#: ../mail/em-utils.c:1224 ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2242
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:827
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:1009
+#: ../calendar/gui/e-cal-model.c:1234
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:1011
+#: ../calendar/gui/e-cal-model.c:1236
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "Save As..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "Select folder to save selected attachments..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "_Save As..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "Set as _Background"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "_Save Selected"
-
-#: ../calendar/gui/e-cal-popup.c:431 ../mail/em-popup.c:827
-#, c-format
-msgid "Open in %s..."
-msgstr "Open in %s..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:337 ../calendar/gui/e-memo-table.c:270
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2437
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:1743 ../calendar/gui/e-memo-table.c:306
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organiser: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2441
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:309
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:415 ../calendar/gui/e-memo-table.c:348
 msgid "Start: "
 msgstr "Start: "
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/e-memo-table.c:366
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:727 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Undefined"
+
+#: ../calendar/gui/e-calendar-table.c:746
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:747
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:748
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:749
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:750
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:751
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:752
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:753
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:754
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:755
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:756
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:864 ../calendar/gui/print.c:1973
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../modules/calendar/e-cal-shell-content.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:301
+#: ../modules/calendar/e-task-shell-view.c:426
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../calendar/gui/e-calendar-table.c:1108
+#: ../calendar/gui/e-calendar-view.c:610 ../calendar/gui/e-memo-table.c:894
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1403
+#: ../calendar/gui/e-calendar-view.c:828 ../calendar/gui/e-memo-table.c:1118
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
-msgid "Save as..."
-msgstr "Save as..."
-
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1796
-msgid "New _Task"
-msgstr "New _Task"
-
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
-msgid "Open _Web Page"
-msgstr "Open _Web Page"
-
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940
-msgid "P_rint..."
-msgstr "P_rint..."
-
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "C_ut"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "_Paste"
-
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "_Assign Task"
-
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "_Forward as iCalendar"
-
-#: ../calendar/gui/e-calendar-table.c:1613
-msgid "_Mark as Complete"
-msgstr "_Mark as Complete"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Mark Selected Tasks as Complete"
-msgstr "_Mark Selected Tasks as Complete"
-
-#: ../calendar/gui/e-calendar-table.c:1615
-msgid "_Mark as Incomplete"
-msgstr "_Mark as Incomplete"
-
-#: ../calendar/gui/e-calendar-table.c:1616
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Mark Selected Tasks as Incomplete"
-
-#: ../calendar/gui/e-calendar-table.c:1621
-msgid "_Delete Selected Tasks"
-msgstr "_Delete Selected Tasks"
-
-#: ../calendar/gui/e-calendar-table.c:1858
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "Click to add a task"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% Complete"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Click to add a task"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Complete"
@@ -7622,167 +4981,96 @@ msgstr "Complete"
 msgid "Completion date"
 msgstr "Completion date"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "Due date"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Priority"
 msgstr "Priority"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Start date"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
-#: ../calendar/gui/e-calendar-view.c:1482
-msgid "Moving items"
-msgstr "Moving items"
-
-#: ../calendar/gui/e-calendar-view.c:1484
-msgid "Copying items"
-msgstr "Copying items"
-
-#: ../calendar/gui/e-calendar-view.c:1793
-msgid "New _Appointment..."
-msgstr "New _Appointment..."
-
-#: ../calendar/gui/e-calendar-view.c:1794
-msgid "New All Day _Event"
-msgstr "New All Day _Event"
-
-#: ../calendar/gui/e-calendar-view.c:1795
-msgid "New _Meeting"
-msgstr "New _Meeting"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
-msgid "_Current View"
-msgstr "_Current View"
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Select T_oday"
-msgstr "Select T_oday"
-
-#: ../calendar/gui/e-calendar-view.c:1809
-msgid "_Select Date..."
-msgstr "_Select Date..."
-
-#: ../calendar/gui/e-calendar-view.c:1815
-msgid "Pri_nt..."
-msgstr "Pri_nt..."
-
-#: ../calendar/gui/e-calendar-view.c:1825
-msgid "Cop_y to Calendar..."
-msgstr "Cop_y to Calendar..."
-
-#: ../calendar/gui/e-calendar-view.c:1826
-msgid "Mo_ve to Calendar..."
-msgstr "Mo_ve to Calendar..."
-
-#: ../calendar/gui/e-calendar-view.c:1827
-msgid "_Delegate Meeting..."
-msgstr "_Delegate Meeting..."
-
-#: ../calendar/gui/e-calendar-view.c:1828
-msgid "_Schedule Meeting..."
-msgstr "_Schedule Meeting..."
-
-#: ../calendar/gui/e-calendar-view.c:1829
-msgid "_Forward as iCalendar..."
-msgstr "_Forward as iCalendar..."
-
-#: ../calendar/gui/e-calendar-view.c:1830
-msgid "_Reply"
-msgstr "_Reply"
-
-#: ../calendar/gui/e-calendar-view.c:1831 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Reply to _All"
-msgstr "Reply to _All"
-
-#: ../calendar/gui/e-calendar-view.c:1836
-msgid "Make this Occurrence _Movable"
-msgstr "Make this Occurrence _Movable"
-
-#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "Delete this _Occurrence"
-
-#: ../calendar/gui/e-calendar-view.c:1838
-msgid "Delete _All Occurrences"
-msgstr "Delete _All Occurrences"
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-calendar-view.c:1598
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-itip-control.c:1194
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-calendar-view.c:1599
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../plugins/itip-formatter/itip-formatter.c:2236
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-calendar-view.c:2294
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-view.c:1600
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-calendar-view.c:2295
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../plugins/itip-formatter/itip-formatter.c:2239
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:1602
 msgid "Needs action"
 msgstr "Needs action"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:1763 ../calendar/gui/print.c:2531
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2491
+#: ../calendar/gui/e-calendar-view.c:1794
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7810,48 +5098,73 @@ msgstr "Show the second time zone"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:843 ../calendar/gui/e-day-view.c:1888
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1665
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:847 ../calendar/gui/e-day-view.c:1905
+#: ../calendar/gui/e-week-view-main-item.c:368
+#: ../calendar/gui/ea-gnome-calendar.c:189
+#: ../modules/calendar/e-cal-shell-view-private.c:856
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1921
+#: ../calendar/gui/e-week-view-main-item.c:382
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:892
+msgid "%d %b"
+msgstr "%d %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:1124 ../calendar/gui/e-week-view.c:510
+#: ../calendar/gui/print.c:824
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/e-day-view.c:1127 ../calendar/gui/e-week-view.c:513
+#: ../calendar/gui/print.c:826
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2321
+#: ../calendar/gui/e-day-view.c:2626
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:767
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:784
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every %d days"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:797
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every %d weeks"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:804
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7859,35 +5172,35 @@ msgstr[0] "Every week on "
 msgstr[1] "Every %d weeks on "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:815
 msgid " and "
 msgstr " and "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:824
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:840
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:851
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every %d months"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:863
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every %d years"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:876
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7895,36 +5208,36 @@ msgstr[0] "a total of %d time"
 msgstr[1] "a total of %d times"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:887
 msgid ", ending on "
 msgstr ", ending on "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:909
 msgid "Starts"
 msgstr "Starts"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:923
 msgid "Ends"
 msgstr "Ends"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:963
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Due"
 msgstr "Due"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:1004 ../calendar/gui/e-itip-control.c:1061
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1021
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7935,7 +5248,7 @@ msgid "An unknown person"
 msgstr "An unknown person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1144
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7943,12 +5256,18 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#. Location
+#: ../calendar/gui/e-itip-control.c:1173
+#: ../plugins/itip-formatter/itip-view.c:1023
+msgid "Location:"
+msgstr "Location:"
+
+#: ../calendar/gui/e-itip-control.c:1196
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7956,268 +5275,270 @@ msgstr ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "The task has been cancelled, however it could not be found in your task lists"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1371
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1372
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> wishes to be added to an existing meeting."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1383
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1384
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> has replied to a meeting request."
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1399
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1400
 msgid "Meeting Cancelation"
 msgstr "Meeting Cancellation"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1410 ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1527
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1438
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1439
 msgid "Task Information"
 msgstr "Task Information"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requests %s to perform a task."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1448
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requests you perform a task."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1449
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> wishes to be added to an existing task."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Update"
 msgstr "Task Update"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1468
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> has replied to a task assignment."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1469
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Task Cancelation"
 msgstr "Task Cancellation"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1512
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> has published free/busy information."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1513
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1517
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requests your free/busy information."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1518
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1522
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1523
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1528
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1604
 msgid "The message does not appear to be properly formed"
 msgstr "The message does not appear to be properly formed"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1663
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1696
 msgid "The attachment does not contain a valid calendar message"
 msgstr "The attachment does not contain a valid calendar message"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1734
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1976
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2010
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2027
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2045
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2069
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2076
+#: ../plugins/itip-formatter/itip-formatter.c:1394
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2107 ../calendar/gui/e-itip-control.c:2164
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2113 ../calendar/gui/e-itip-control.c:2172
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2290
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-meeting-list-view.c:586
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2359
 msgid "Update"
 msgstr "Update"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2383
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Accept"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2384
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2385
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Decline"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2410
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2434
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2458
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2482
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -8239,99 +5560,99 @@ msgstr "Loading Calendar"
 
 #: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
-msgstr "Loading calendar..."
+msgstr "Loading calendar…"
+
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Organiser:"
 
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Server Message:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Resources"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "Attendees"
-
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:973
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:974 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Group"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:975
 msgid "Resource"
 msgstr "Resource"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:976
 msgid "Room"
 msgstr "Room"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:990
 msgid "Chair"
 msgstr "Chair"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:991
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:992
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:993
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Needs Action"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:541
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 msgid "In Process"
 msgstr "In Process"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2127
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2272
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -8339,78 +5660,78 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2158
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2303
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "A_ttendees..."
-msgstr "A_ttendees..."
+msgstr "A_ttendees…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:582
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:609
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:624
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:639
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:657
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:672
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:689
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:762
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:799
 msgid "_End time:"
 msgstr "_End time:"
 
@@ -8438,182 +5759,251 @@ msgstr "Language"
 msgid "Member"
 msgstr "Member"
 
-#: ../calendar/gui/e-memo-table.c:955
-msgid "_Delete Selected Memos"
-msgstr "_Delete Selected Memos"
+#: ../calendar/gui/e-memo-table.c:647
+#: ../modules/calendar/e-cal-shell-content.c:429
+#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:270
+#: ../modules/calendar/e-memo-shell-view.c:279
+msgid "Memos"
+msgstr "Memos"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"Error on %s:\n"
-" %s"
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "Select Timezone"
 
-#: ../calendar/gui/e-memos.c:812
-msgid "Loading memos"
-msgstr "Loading memos"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1646
+msgid "%d %B"
+msgstr "%d %B"
 
-#: ../calendar/gui/e-memos.c:903
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Opening memos at %s"
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "It has alarms."
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
-msgid "Deleting selected objects..."
-msgstr "Deleting selected objects..."
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "It has recurrences."
 
-#: ../calendar/gui/e-tasks.c:963
-msgid "Loading tasks"
-msgstr "Loading tasks"
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "It is a meeting."
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "Opening tasks at %s"
+msgid "Calendar Event: Summary is %s."
+msgstr "Calendar Event: Summary is %s."
 
-#: ../calendar/gui/e-tasks.c:1306
-msgid "Completing tasks..."
-msgstr "Completing tasks..."
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "Calendar Event: It has no summary."
 
-#: ../calendar/gui/e-tasks.c:1356
-msgid "Expunging"
-msgstr "Expunging"
+#: ../calendar/gui/ea-cal-view-event.c:297
+msgid "calendar view event"
+msgstr "calendar view event"
 
-#: ../calendar/gui/e-timezone-entry.c:127
-msgid "Select Timezone"
-msgstr "Select Timezone"
+#: ../calendar/gui/ea-cal-view-event.c:525
+msgid "Grab Focus"
+msgstr "Grab Focus"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
-msgid "%d %B"
-msgstr "%d %B"
+#: ../calendar/gui/ea-cal-view.c:298
+msgid "New Appointment"
+msgstr "New Appointment"
 
-#: ../calendar/gui/gnome-cal.c:2648
-msgid "_Custom View"
-msgstr "_Custom View"
+#: ../calendar/gui/ea-cal-view.c:299
+msgid "New All Day Event"
+msgstr "New All Day Event"
 
-#: ../calendar/gui/gnome-cal.c:2649
-msgid "_Save Custom View"
-msgstr "_Save Custom View"
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Meeting"
+msgstr "New Meeting"
 
-#: ../calendar/gui/gnome-cal.c:2654
-msgid "_Define Views..."
-msgstr "_Define Views..."
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "Go to Today"
+msgstr "Go to Today"
 
-#: ../calendar/gui/gnome-cal.c:2891
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "Loading appointments at %s"
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "Go to Date"
+msgstr "Go to Date"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/ea-day-view-main-item.c:300
+#: ../calendar/gui/ea-week-view-main-item.c:297
+msgid "a table to view and select the current time range"
+msgstr "a table to view and select the current time range"
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "Loading tasks at %s"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "It has %d event."
+msgstr[1] "It has %d events."
 
-#: ../calendar/gui/gnome-cal.c:2915
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "It has no events."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:158
 #, c-format
-msgid "Loading memos at %s"
-msgstr "Loading memos at %s"
+msgid "Work Week View: %s. %s"
+msgstr "Work Week View: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
-msgid "Opening %s"
-msgstr "Opening %s"
+msgid "Day View: %s. %s"
+msgstr "Day View: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3995
-msgid "Purging"
-msgstr "Purging"
+#: ../calendar/gui/ea-day-view.c:195
+msgid "calendar view for a work week"
+msgstr "calendar view for a work week"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "April"
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for one or more days"
+msgstr "calendar view for one or more days"
 
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "August"
+#: ../calendar/gui/ea-gnome-calendar.c:186
+#: ../modules/calendar/e-cal-shell-view-private.c:852
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "December"
+#: ../calendar/gui/ea-gnome-calendar.c:191
+#: ../calendar/gui/ea-gnome-calendar.c:196
+#: ../calendar/gui/ea-gnome-calendar.c:198
+#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
+#: ../modules/calendar/e-cal-shell-view-private.c:868
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "February"
+#: ../calendar/gui/ea-gnome-calendar.c:215
+#: ../calendar/gui/ea-gnome-calendar.c:221
+#: ../calendar/gui/ea-gnome-calendar.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../modules/calendar/e-cal-shell-view-private.c:885
+#: ../modules/calendar/e-cal-shell-view-private.c:896
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
 
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "January"
+#: ../calendar/gui/ea-gnome-calendar.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:782
+msgid "Gnome Calendar"
+msgstr "Gnome Calendar"
 
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "July"
+#: ../calendar/gui/ea-jump-button.c:146
+msgid "Jump button"
+msgstr "Jump button"
 
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "June"
+#: ../calendar/gui/ea-jump-button.c:155
+msgid "Click here, you can find more events."
+msgstr "Click here, you can find more events."
 
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "March"
+#: ../calendar/gui/ea-week-view.c:153
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Month View: %s. %s"
 
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "May"
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Week View: %s. %s"
 
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "November"
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "calendar view for a month"
 
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "October"
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
-msgid "Select Date"
-msgstr "Select Date"
+#: ../calendar/gui/gnome-cal.c:1944
+#, c-format
+msgid "Loading appointments at %s"
+msgstr "Loading appointments at %s"
+
+#: ../calendar/gui/gnome-cal.c:2030
+#, c-format
+msgid "Opening %s"
+msgstr "Opening %s"
+
+#: ../calendar/gui/goto-dialog.glade.h:1
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "September"
+msgid "Select Date"
+msgstr "Select Date"
 
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Select Today"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:642
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -8621,7 +6011,7 @@ msgstr "Calendar information"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:676
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -8630,7 +6020,7 @@ msgstr "Accepted"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:683
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -8642,7 +6032,7 @@ msgstr "Tentatively Accepted"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:738
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -8651,7 +6041,7 @@ msgstr "Declined"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:697
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -8659,7 +6049,7 @@ msgstr "Delegated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:710
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -8667,7 +6057,7 @@ msgstr "Updated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:717
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -8675,7 +6065,7 @@ msgstr "Cancel"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:724
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -8683,437 +6073,222 @@ msgstr "Refresh"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:731
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:801
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:809
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:980
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/memos-component.c:507
-msgid "_New Memo List"
-msgstr "_New Memo List"
-
-#: ../calendar/gui/memos-component.c:590
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d memo"
-msgstr[1] "%d memos"
-
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d selected"
-msgstr[1] ", %d selected"
-
-#: ../calendar/gui/memos-component.c:639
-msgid "Failed upgrading memos."
-msgstr "Failed upgrading memos."
-
-#: ../calendar/gui/memos-component.c:769
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "Unable to open the memo list '%s' for creating events and meetings"
-
-#: ../calendar/gui/memos-component.c:782
-msgid "There is no calendar available for creating memos"
-msgstr "There is no calendar available for creating memos"
-
-#: ../calendar/gui/memos-component.c:892
-msgid "Memo Source Selector"
-msgstr "Memo Source Selector"
-
-#: ../calendar/gui/memos-component.c:1071
-msgid "New memo"
-msgstr "New memo"
-
-#: ../calendar/gui/memos-component.c:1072
-msgctxt "New"
-msgid "Mem_o"
-msgstr "Mem_o"
-
-#: ../calendar/gui/memos-component.c:1073
-msgid "Create a new memo"
-msgstr "Create a new memo"
-
-#: ../calendar/gui/memos-component.c:1079
-msgid "New shared memo"
-msgstr "New shared memo"
-
-#: ../calendar/gui/memos-component.c:1080
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "_Shared memo"
-
-#: ../calendar/gui/memos-component.c:1081
-msgid "Create a shared new memo"
-msgstr "Create a shared new memo"
-
-#: ../calendar/gui/memos-component.c:1087
-msgid "New memo list"
-msgstr "New memo list"
-
-#: ../calendar/gui/memos-component.c:1088
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "Memo li_st"
-
-#: ../calendar/gui/memos-component.c:1089
-msgid "Create a new memo list"
-msgstr "Create a new memo list"
-
-#: ../calendar/gui/memos-control.c:389 ../calendar/gui/memos-control.c:405
-msgid "Print Memos"
-msgstr "Print Memos"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Unable to migrate old settings from evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Unable to migrate calendar `%s'"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Unable to migrate tasks `%s'"
-
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "Notes"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:510
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:511
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:512
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:513
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:514
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:515
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:516
 msgid "31st"
 msgstr "31st"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2495
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2497
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2522
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2545
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2585
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2614
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2625
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2638
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2649
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#: ../calendar/gui/tasks-component.c:499
-msgid "_New Task List"
-msgstr "_New Task List"
-
-#: ../calendar/gui/tasks-component.c:582
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d task"
-msgstr[1] "%d tasks"
-
-#: ../calendar/gui/tasks-component.c:631
-msgid "Failed upgrading tasks."
-msgstr "Failed upgrading tasks."
-
-#: ../calendar/gui/tasks-component.c:764
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "Unable to open the task list '%s' for creating events and meetings"
-
-#: ../calendar/gui/tasks-component.c:777
-msgid "There is no calendar available for creating tasks"
-msgstr "There is no calendar available for creating tasks"
-
-#: ../calendar/gui/tasks-component.c:888
-msgid "Task Source Selector"
-msgstr "Task Source Selector"
-
-#: ../calendar/gui/tasks-component.c:1142
-msgid "New task"
-msgstr "New task"
-
-#: ../calendar/gui/tasks-component.c:1143
-msgctxt "New"
-msgid "_Task"
-msgstr "_Task"
-
-#: ../calendar/gui/tasks-component.c:1144
-msgid "Create a new task"
-msgstr "Create a new task"
-
-#: ../calendar/gui/tasks-component.c:1150
-msgid "New assigned task"
-msgstr "New assigned task"
-
-#: ../calendar/gui/tasks-component.c:1151
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "Assigne_d Task"
-
-#: ../calendar/gui/tasks-component.c:1152
-msgid "Create a new assigned task"
-msgstr "Create a new assigned task"
-
-#: ../calendar/gui/tasks-component.c:1158
-msgid "New task list"
-msgstr "New task list"
-
-#: ../calendar/gui/tasks-component.c:1159
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "Tas_k list"
-
-#: ../calendar/gui/tasks-component.c:1160
-msgid "Create a new task list"
-msgstr "Create a new task list"
-
-#: ../calendar/gui/tasks-control.c:488
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-
-#: ../calendar/gui/tasks-control.c:491 ../mail/em-folder-view.c:1128
-msgid "Do not ask me again."
-msgstr "Do not ask me again."
-
-#: ../calendar/gui/tasks-control.c:528 ../calendar/gui/tasks-control.c:544
-msgid "Print Tasks"
-msgstr "Print Tasks"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -9127,11 +6302,11 @@ msgstr "Cancelled"
 msgid "In progress"
 msgstr "In progress"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "is greater than"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "is less than"
 
@@ -9139,37 +6314,37 @@ msgstr "is less than"
 msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar files (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Reminder!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar files (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
@@ -10722,217 +7897,185 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "Could not open autosave file"
-
-#: ../composer/e-composer-autosave.c:280
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "Insert Attachment"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "A_ttach"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:202
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-memo-shell-view-actions.c:489
+#: ../modules/calendar/e-task-shell-view-actions.c:616
+msgid "Save as..."
+msgstr "Save as…"
+
+#: ../composer/e-composer-actions.c:306
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:311
+#: ../widgets/misc/e-signature-editor.c:200
 msgid "_Close"
 msgstr "_Close"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:313
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:318
 msgid "_Print..."
-msgstr "_Print..."
+msgstr "_Print…"
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:325
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:334
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:339
 msgid "Save _As..."
-msgstr "Save _As..."
+msgstr "Save _As…"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:341
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:346
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:348
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:353 ../composer/e-composer-private.c:192
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:355
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:362
 msgid "Insert Send options"
 msgstr "Insert Send options"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:367
 msgid "New _Message"
 msgstr "New _Message"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:369
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:376
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:383
 msgid "_Security"
 msgstr "_Security"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:393
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:401
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:409
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:411
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:417
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:419
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:425
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:427
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encrypt this message with your S/MIME Encryption Certificate"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:433
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:435
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign this message with your S/MIME Signature Certificate"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:441
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:443
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the BCC field is displayed"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:449
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:451
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the CC field is displayed"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:457
 msgid "_From Field"
 msgstr "_From Field"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:459
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Toggles whether the From chooser is displayed"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "_Post-To Field"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Toggles whether the Post-To field is displayed"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:465
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:467
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "_Subject Field"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "Toggles whether the Subject field is displayed"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "_To Field"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "Toggles whether the To field is displayed"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:510
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-autosave.c:445
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Enter the addresses that will receive a carbon copy of the message"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10940,65 +8083,80 @@ msgstr ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:949
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:949
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:936
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:301
+#: ../modules/mail/em-mailer-prefs.c:77
+msgid "From"
+msgstr "From"
+
+#: ../composer/e-composer-header-table.c:958
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:963
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:969
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:969
+#, fuzzy
+msgid "Show CC"
+msgstr "Show"
+
+#: ../composer/e-composer-header-table.c:975
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:975
+#, fuzzy
+msgid "Show BCC"
+msgstr "Show"
+
+#: ../composer/e-composer-header-table.c:980
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:984
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:993
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "Posting destination"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "Choose folders to post the message to."
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1573
-msgid "Show _Attachment Bar"
-msgstr "Show _Attachment Bar"
+#: ../composer/e-composer-private.c:208
+msgid "Save draft"
+msgstr "Save draft"
+
+#. Check buttons
+#: ../composer/e-msg-composer.c:191 ../mail/em-utils.c:144
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
+msgid "_Do not show this message again."
+msgstr "_Do not show this message again."
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:900
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:907
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11006,23 +8164,11 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1515 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Attachment"
-msgstr[1] "Attachments"
-
-#: ../composer/e-msg-composer.c:1571
-msgid "Hide _Attachment Bar"
-msgstr "Hide _Attachment Bar"
-
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2813
+#: ../composer/e-msg-composer.c:1334 ../composer/e-msg-composer.c:2112
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4095
+#: ../composer/e-msg-composer.c:3320
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11189,7 +8335,7 @@ msgstr "_Save Draft"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution Mail and Calendar"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -11205,101 +8351,222 @@ msgstr "address card"
 msgid "calendar information"
 msgstr "calendar information"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Baltic"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Central European"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Chinese"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Greek"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Hebrew"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Japanese"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Korean"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Thai"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turkish"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Western European"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Western European, New"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+msgid "Traditional"
+msgstr "Traditional"
+
+#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:91
+msgid "Simplified"
+msgstr "Simplified"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "Ukrainian"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "Visual"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:193
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "Today"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Tomorrow"
+
+#: ../e-util/e-datetime-format.c:204
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+msgid "%d days from now"
+msgstr "%d days from now"
+
+#: ../e-util/e-datetime-format.c:209
+#, c-format
+msgid "%d days ago"
+msgstr "%d days ago"
+
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
+msgid "Use locale default"
+msgstr "Use locale default"
+
+#: ../e-util/e-datetime-format.c:496
+msgid "Format:"
+msgstr "Format:"
+
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution Error"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution Warning"
 
-#: ../e-util/e-error.c:118
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution Information"
 
-#: ../e-util/e-error.c:120
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "Evolution Query"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:452
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Internal error, unknown error '%s' requested"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "Component"
-
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
+#: ../e-util/e-logger.c:172
+#, fuzzy
+msgid "Name of the logger"
 msgstr "Name of the component being logged"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-module.c:188
+#, fuzzy
+msgid "Filename"
+msgstr "F_ilename:"
+
+#: ../e-util/e-module.c:189
+#, fuzzy
+msgid "The filename of the module"
+msgstr "The filename to display in the mail."
+
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "Debug Logs"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "Show _errors in the status bar for"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "second(s)."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "Log Messages:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "Log Level"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:493
 msgid "Time"
 msgstr "Time"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2583
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
+#: ../shell/e-shell-window-actions.c:1459
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Error"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Errors"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
+msgid "Warning"
+msgstr "Warning"
+
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "Warnings and Errors"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "Debug"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "Error, Warnings and Debug messages"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../e-util/e-plugin.c:291 ../filter/rule-editor.c:802
+#: ../modules/mail/em-composer-prefs.c:474
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:717
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:292
 msgid "Whether the plugin is enabled"
 msgstr "Whether the plugin is enabled"
 
@@ -11317,6 +8584,10 @@ msgid ""
 msgstr ""
 "The printing system did not report any additional details about the error."
 
+#: ../e-util/e-signature.c:695
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Because \"{1}\"."
@@ -11345,70 +8616,118 @@ msgstr "Overwrite file?"
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
-#: ../e-util/e-util-labels.c:39
-msgid "I_mportant"
-msgstr "I_mportant"
+#: ../e-util/gconf-bridge.c:1222
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf error: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:40
-msgid "_Work"
-msgstr "_Work"
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
+msgstr "All further errors shown only on terminal."
 
-#. orange
-#: ../e-util/e-util-labels.c:41
-msgid "_Personal"
-msgstr "_Personal"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:937
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "Reply-To"
 
-#. green
-#: ../e-util/e-util-labels.c:42
-msgid "_To Do"
-msgstr "_To Do"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:939
+#: ../mail/em-format-html.c:2138 ../mail/em-format-html.c:2202
+#: ../mail/em-format-html.c:2223 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "Cc"
 
-#. blue
-#: ../e-util/e-util-labels.c:43
-msgid "_Later"
-msgstr "_Later"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2139 ../mail/em-format-html.c:2208
+#: ../mail/em-format-html.c:2226 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Bcc"
 
-#: ../e-util/e-util-labels.c:315
-msgid "Label _Name:"
-msgstr "Label _Name:"
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:941
+#: ../mail/em-filter-i18n.h:74 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:305 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1112
+msgid "Subject"
+msgstr "Subject"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Edit Label"
-msgstr "Edit Label"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2318
+#: ../modules/mail/em-mailer-prefs.c:1120
+msgid "Mailer"
+msgstr "Mailer"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Add Label"
-msgstr "Add Label"
+#: ../em-format/em-format-quote.c:429 ../mail/em-composer-utils.c:1135
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Forwarded Message --------"
+
+#: ../em-format/em-format.c:942 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:429
+#: ../widgets/misc/e-dateedit.c:451
+msgid "Date"
+msgstr "Date"
 
-#: ../e-util/e-util-labels.c:357
-msgid "Label name cannot be empty."
-msgstr "Label name cannot be empty."
+#: ../em-format/em-format.c:943 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "Newsgroups"
 
-#: ../e-util/e-util-labels.c:362
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+msgid "Face"
+msgstr "Face"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../em-format/em-format.c:1297
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf error: %s"
+msgid "%s attachment"
+msgstr "%s attachment"
 
-#: ../e-util/gconf-bridge.c:1232
-msgid "All further errors shown only on terminal."
-msgstr "All further errors shown only on terminal."
+#: ../em-format/em-format.c:1335
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: ../em-format/em-format.c:1472 ../em-format/em-format.c:1629
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: ../em-format/em-format.c:1480
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: ../em-format/em-format.c:1490
+msgid "Could not parse PGP/MIME message"
+msgstr "Could not parse PGP/MIME message"
+
+#: ../em-format/em-format.c:1490
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Could not parse PGP/MIME message: Unknown error"
+
+#: ../em-format/em-format.c:1648
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1794
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1785
+#: ../em-format/em-format.c:1794
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
+#: ../em-format/em-format.c:1868
+msgid "Could not parse PGP message"
+msgstr "Could not parse PGP message"
+
+#: ../em-format/em-format.c:1868
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Could not parse PGP message: Unknown error"
 
 #: ../filter/filter-datespec.c:81
 #, c-format
@@ -11522,69 +8841,68 @@ msgstr "now"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:442
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Choose a file"
 
-#: ../filter/filter-part.c:532
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:528
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:858
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:886
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:920
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:926
 msgid "If all conditions are met"
 msgstr "If all conditions are met"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:926
 msgid "If any conditions are met"
 msgstr "If any conditions are met"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:928
 msgid "_Find items:"
 msgstr "_Find items:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "All related"
 msgstr "All related"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "Replies"
 msgstr "Replies"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:948
 msgid "I_nclude threads"
 msgstr "I_nclude threads"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:295
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:296
 msgid "Outgoing"
 msgstr "Outgoing"
 
@@ -11669,140 +8987,845 @@ msgstr ""
 "the current time when filtering occurs."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "a time relative to the current time"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "ago"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "in the future"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "months"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "seconds"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"ago\n"
+"in the future"
 
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "the current time"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "the time you specify"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../plugins/google-account-setup/google-contacts-source.c:378
-msgid "weeks"
-msgstr "weeks"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "years"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
 
 #: ../filter/rule-editor.c:382
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:465
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:812
 msgid "Rule name"
 msgstr "Rule name"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1271
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Attachment"
+msgstr[1] "Attachments"
+
+#: ../mail/e-mail-attachment-bar.c:614
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "Icon View"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "List View"
+
+#: ../mail/e-mail-browser.c:617
+#, fuzzy
+msgid "Shell Module"
+msgstr "Selection Mode"
+
+#: ../mail/e-mail-browser.c:618 ../mail/message-list.c:2467
+msgid "The mail shell backend"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:628
+#, fuzzy
+msgid "Show Deleted"
+msgstr "Deleted"
+
+#: ../mail/e-mail-browser.c:629
+#, fuzzy
+msgid "Show deleted messages"
+msgstr "Forwarded messages"
+
+#: ../mail/e-mail-browser.c:663
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/e-shell-window-private.c:207
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../mail/e-mail-display.c:66
+#, fuzzy
+msgid "_Add to Address Book..."
+msgstr "_Add to Address Book"
+
+#: ../mail/e-mail-display.c:73
+#, fuzzy
+msgid "_To This Address"
+msgstr "_To this Address"
+
+#: ../mail/e-mail-display.c:80
+#, fuzzy
+msgid "_From This Address"
+msgstr "_From this Address"
+
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+msgid "Create Search _Folder"
+msgstr "Create _Search Folder"
+
+#: ../mail/e-mail-label-dialog.c:220
+#, fuzzy
+msgid "_Label name:"
+msgstr "Label _Name:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "I_mportant"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "_Work"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Personal"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "_To Do"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "_Later"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:555
+msgid "Add Label"
+msgstr "Add Label"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Edit Label"
+
+#: ../mail/e-mail-label-manager.c:349
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 msgstr ""
-"Configure mail preferences, including security and message display, here"
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "Colour"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure your e-mail accounts here"
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:599 ../mail/em-folder-tree.c:2347
+#: ../modules/mail/e-mail-shell-view-private.c:763
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
+msgid "Inbox"
+msgstr "Inbox"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "Configure your network connection settings here"
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:592
+msgid "Drafts"
+msgstr "Drafts"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:602
+msgid "Outbox"
+msgstr "Outbox"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:604
+msgid "Sent"
+msgstr "Sent"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:595
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:591
+msgid "Templates"
+msgstr "Templates"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:107
+#: ../modules/calendar/e-task-shell-view-actions.c:576
+#, fuzzy
+msgid "Do not ask me again"
+msgstr "Do not ask me again."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
+#: ../mail/e-mail-reader.c:215 ../mail/e-mail-reader.c:604
+#: ../mail/em-account-editor.c:667 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-folder-utils.c:393 ../mail/em-vfolder-rule.c:519
+msgid "Select Folder"
+msgstr "Select Folder"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
+#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:388
+msgid "C_opy"
+msgstr "C_opy"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Evolution Network configuration control"
+#: ../mail/e-mail-reader.c:604 ../mail/em-folder-utils.c:388
+msgid "_Move"
+msgstr "_Move"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "Mail"
+#: ../mail/e-mail-reader.c:1082
+msgid "A_dd Sender to Address Book"
+msgstr "A_dd Sender to Address Book"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
+#: ../mail/e-mail-reader.c:1084
+#, fuzzy
+msgid "Add sender to address book"
+msgstr "Add Sender to Address Book"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
+#: ../mail/e-mail-reader.c:1089
+msgid "Check for _Junk"
+msgstr "Check for _Junk"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "Network Preferences"
+#: ../mail/e-mail-reader.c:1091
+msgid "Filter the selected messages for junk status"
+msgstr "Filter the selected messages for junk status"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
-msgid "_Mail"
-msgstr "_Mail"
+#: ../mail/e-mail-reader.c:1098
+msgid "Copy selected messages to the clipboard"
+msgstr "Copy selected messages to the clipboard"
+
+#: ../mail/e-mail-reader.c:1103
+msgid "_Copy to Folder..."
+msgstr "_Copy to Folder…"
+
+#: ../mail/e-mail-reader.c:1105
+msgid "Copy selected messages to another folder"
+msgstr "Copy selected messages to another folder"
+
+#: ../mail/e-mail-reader.c:1110
+msgid "_Delete Message"
+msgstr "_Delete Message"
+
+#: ../mail/e-mail-reader.c:1112
+msgid "Mark the selected messages for deletion"
+msgstr "Mark the selected messages for deletion"
+
+#: ../mail/e-mail-reader.c:1117
+msgid "Filter on Mailing _List..."
+msgstr "Filter on Mailing _List…"
+
+#: ../mail/e-mail-reader.c:1119
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Create a rule to filter messages to this mailing list"
+
+#: ../mail/e-mail-reader.c:1124
+msgid "Filter on _Recipients..."
+msgstr "Filter on _Recipients…"
+
+#: ../mail/e-mail-reader.c:1126
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Create a rule to filter messages to these recipients"
+
+#: ../mail/e-mail-reader.c:1131
+msgid "Filter on Se_nder..."
+msgstr "Filter on Se_nder…"
+
+#: ../mail/e-mail-reader.c:1133
+msgid "Create a rule to filter messages from this sender"
+msgstr "Create a rule to filter messages from this sender"
+
+#: ../mail/e-mail-reader.c:1138
+msgid "Filter on _Subject..."
+msgstr "Filter on _Subject…"
+
+#: ../mail/e-mail-reader.c:1140
+msgid "Create a rule to filter messages with this subject"
+msgstr "Create a rule to filter messages with this subject"
+
+#: ../mail/e-mail-reader.c:1145
+msgid "A_pply Filters"
+msgstr "A_pply Filters"
+
+#: ../mail/e-mail-reader.c:1147
+msgid "Apply filter rules to the selected messages"
+msgstr "Apply filter rules to the selected messages"
+
+#: ../mail/e-mail-reader.c:1152
+msgid "_Find in Message..."
+msgstr "_Find in Message…"
+
+#: ../mail/e-mail-reader.c:1154
+msgid "Search for text in the body of the displayed message"
+msgstr "Search for text in the body of the displayed message"
+
+#: ../mail/e-mail-reader.c:1159
+msgid "_Clear Flag"
+msgstr "_Clear Flag"
+
+#: ../mail/e-mail-reader.c:1161
+#, fuzzy
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Create a new task from the selected message"
+
+#: ../mail/e-mail-reader.c:1166
+msgid "_Flag Completed"
+msgstr "_Flag Completed"
+
+#: ../mail/e-mail-reader.c:1168
+#, fuzzy
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "Select all messages in the same thread as the selected message"
+
+#: ../mail/e-mail-reader.c:1173
+msgid "Follow _Up..."
+msgstr "Follow _Up…"
+
+#: ../mail/e-mail-reader.c:1175
+#, fuzzy
+msgid "Flag the selected messages for follow-up"
+msgstr "Flag selected messages for follow-up"
+
+#: ../mail/e-mail-reader.c:1180
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "_Forward"
+
+#: ../mail/e-mail-reader.c:1182
+msgid "Forward the selected message to someone"
+msgstr "Forward the selected message to someone"
+
+#: ../mail/e-mail-reader.c:1187
+msgid "_Attached"
+msgstr "_Attached"
+
+#: ../mail/e-mail-reader.c:1189
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Forward the selected message to someone as an attachment"
+
+#: ../mail/e-mail-reader.c:1194
+msgid "_Inline"
+msgstr "_Inline"
+
+#: ../mail/e-mail-reader.c:1196
+msgid "Forward the selected message in the body of a new message"
+msgstr "Forward the selected message in the body of a new message"
+
+#: ../mail/e-mail-reader.c:1201
+msgid "_Quoted"
+msgstr "_Quoted"
+
+#: ../mail/e-mail-reader.c:1203
+msgid "Forward the selected message quoted like a reply"
+msgstr "Forward the selected message quoted like a reply"
+
+#: ../mail/e-mail-reader.c:1208
+msgid "_Load Images"
+msgstr "_Load Images"
+
+#: ../mail/e-mail-reader.c:1210
+msgid "Force images in HTML mail to be loaded"
+msgstr "Force images in HTML mail to be loaded"
+
+#: ../mail/e-mail-reader.c:1215
+msgid "_Important"
+msgstr "_Important"
+
+#: ../mail/e-mail-reader.c:1217
+msgid "Mark the selected messages as important"
+msgstr "Mark the selected messages as important"
+
+#: ../mail/e-mail-reader.c:1222
+msgid "_Junk"
+msgstr "_Junk"
+
+#: ../mail/e-mail-reader.c:1224
+msgid "Mark the selected messages as junk"
+msgstr "Mark the selected messages as junk"
+
+#: ../mail/e-mail-reader.c:1229
+msgid "_Not Junk"
+msgstr "_Not Junk"
+
+#: ../mail/e-mail-reader.c:1231
+#, fuzzy
+msgid "Mark the selected messasges as not being junk"
+msgstr "Mark the selected messages as not being junk"
+
+#: ../mail/e-mail-reader.c:1236
+msgid "_Read"
+msgstr "_Read"
+
+#: ../mail/e-mail-reader.c:1238
+msgid "Mark the selected messages as having been read"
+msgstr "Mark the selected messages as having been read"
+
+#: ../mail/e-mail-reader.c:1243
+msgid "Uni_mportant"
+msgstr "Uni_mportant"
+
+#: ../mail/e-mail-reader.c:1245
+msgid "Mark the selected messages as unimportant"
+msgstr "Mark the selected messages as unimportant"
+
+#: ../mail/e-mail-reader.c:1250
+msgid "_Unread"
+msgstr "_Unread"
+
+#: ../mail/e-mail-reader.c:1252
+msgid "Mark the selected messages as not having been read"
+msgstr "Mark the selected messages as not having been read"
+
+#: ../mail/e-mail-reader.c:1257
+msgid "_Edit as New Message..."
+msgstr "_Edit as New Message…"
+
+#: ../mail/e-mail-reader.c:1259
+msgid "Open the selected messages in the composer for editing"
+msgstr "Open the selected messages in the composer for editing"
+
+#: ../mail/e-mail-reader.c:1264
+msgid "Compose _New Message"
+msgstr "Compose _New Message"
+
+#: ../mail/e-mail-reader.c:1266
+msgid "Open a window for composing a mail message"
+msgstr "Open a window for composing a mail message"
+
+#: ../mail/e-mail-reader.c:1271
+msgid "_Open in New Window"
+msgstr "_Open in New Window"
+
+#: ../mail/e-mail-reader.c:1273
+msgid "Open the selected messages in a new window"
+msgstr "Open the selected messages in a new window"
+
+#: ../mail/e-mail-reader.c:1278
+msgid "_Move to Folder..."
+msgstr "_Move to Folder…"
+
+#: ../mail/e-mail-reader.c:1280
+msgid "Move selected messages to another folder"
+msgstr "Move selected messages to another folder"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "_Next Message"
+msgstr "_Next Message"
+
+#: ../mail/e-mail-reader.c:1287
+msgid "Display the next message"
+msgstr "Display the next message"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Next _Important Message"
+msgstr "Next _Important Message"
+
+#: ../mail/e-mail-reader.c:1294
+msgid "Display the next important message"
+msgstr "Display the next important message"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Next _Thread"
+msgstr "Next _Thread"
+
+#: ../mail/e-mail-reader.c:1301
+msgid "Display the next thread"
+msgstr "Display the next thread"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Next _Unread Message"
+msgstr "Next _Unread Message"
+
+#: ../mail/e-mail-reader.c:1308
+msgid "Display the next unread message"
+msgstr "Display the next unread message"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "_Previous Message"
+msgstr "_Previous Message"
+
+#: ../mail/e-mail-reader.c:1315
+msgid "Display the previous message"
+msgstr "Display the previous message"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "Pr_evious Important Message"
+msgstr "Pr_evious Important Message"
+
+#: ../mail/e-mail-reader.c:1322
+msgid "Display the previous important message"
+msgstr "Display the previous important message"
+
+#: ../mail/e-mail-reader.c:1327
+msgid "P_revious Unread Message"
+msgstr "P_revious Unread Message"
+
+#: ../mail/e-mail-reader.c:1329
+msgid "Display the previous unread message"
+msgstr "Display the previous unread message"
+
+#: ../mail/e-mail-reader.c:1336
+msgid "Print this message"
+msgstr "Print this message"
+
+#: ../mail/e-mail-reader.c:1343
+msgid "Preview the message to be printed"
+msgstr "Preview the message to be printed"
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Re_direct"
+msgstr "Re_direct"
+
+#: ../mail/e-mail-reader.c:1350
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Redirect (bounce) the selected message to someone"
+
+#: ../mail/e-mail-reader.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "Reply to _All"
+
+#: ../mail/e-mail-reader.c:1357
+#, fuzzy
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "Compose a reply to all of the recipients of the selected message"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Reply to _List"
+msgstr "Reply to _List"
+
+#: ../mail/e-mail-reader.c:1364
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Compose a reply to the mailing list of the selected message"
+
+#: ../mail/e-mail-reader.c:1369
+#: ../modules/mail/e-mail-attachment-handler.c:148
+msgid "_Reply to Sender"
+msgstr "_Reply to Sender"
+
+#: ../mail/e-mail-reader.c:1371
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Compose a reply to the sender of the selected message"
+
+#: ../mail/e-mail-reader.c:1376
+#, fuzzy
+msgid "_Save as mbox..."
+msgstr "Save as…"
+
+#: ../mail/e-mail-reader.c:1378
+#, fuzzy
+msgid "Save selected messages as an mbox file"
+msgstr "Save the selected messages as a text file"
+
+#: ../mail/e-mail-reader.c:1383
+msgid "Search Folder from Mailing _List..."
+msgstr "Search Folder from Mailing _List…"
+
+#: ../mail/e-mail-reader.c:1385
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "Create a Search Folder for this mailing list"
+
+#: ../mail/e-mail-reader.c:1390
+msgid "Search Folder from Recipien_ts..."
+msgstr "Search Folder from Recipien_ts…"
+
+#: ../mail/e-mail-reader.c:1392
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "Create a Search Folder for these recipients"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-mail-reader.c:1397
+msgid "Search Folder from Sen_der..."
+msgstr "Search Folder from Sen_der…"
+
+#: ../mail/e-mail-reader.c:1399
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr "Create a Search Folder for this sender"
+
+#: ../mail/e-mail-reader.c:1404
+msgid "Search Folder from S_ubject..."
+msgstr "Search Folder from S_ubject…"
+
+#: ../mail/e-mail-reader.c:1406
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr "Create a Search Folder for this subject"
+
+#: ../mail/e-mail-reader.c:1411
+msgid "Select _All Text"
+msgstr "Select _All Text"
+
+#: ../mail/e-mail-reader.c:1413
+msgid "Select all the text in a message"
+msgstr "Select all the text in a message"
+
+#: ../mail/e-mail-reader.c:1418
+msgid "_Message Source"
+msgstr "_Message Source"
+
+#: ../mail/e-mail-reader.c:1420
+msgid "Show the raw email source of the message"
+msgstr "Show the raw e-mail source of the message"
+
+#: ../mail/e-mail-reader.c:1432
+msgid "_Undelete Message"
+msgstr "_Undelete Message"
+
+#: ../mail/e-mail-reader.c:1434
+msgid "Undelete the selected messages"
+msgstr "Undelete the selected messages"
+
+#: ../mail/e-mail-reader.c:1439
+msgid "_Normal Size"
+msgstr "_Normal Size"
+
+#: ../mail/e-mail-reader.c:1441
+msgid "Reset the text to its original size"
+msgstr "Reset the text to its original size"
+
+#: ../mail/e-mail-reader.c:1446
+msgid "_Zoom In"
+msgstr "_Zoom In"
+
+#: ../mail/e-mail-reader.c:1448
+msgid "Increase the text size"
+msgstr "Increase the text size"
+
+#: ../mail/e-mail-reader.c:1453
+msgid "Zoom _Out"
+msgstr "Zoom _Out"
+
+#: ../mail/e-mail-reader.c:1455
+msgid "Decrease the text size"
+msgstr "Decrease the text size"
+
+#: ../mail/e-mail-reader.c:1462
+msgid "Create R_ule"
+msgstr "Create R_ule"
+
+#: ../mail/e-mail-reader.c:1469
+msgid "Ch_aracter Encoding"
+msgstr "Ch_aracter Encoding"
+
+#: ../mail/e-mail-reader.c:1476
+#, fuzzy
+msgid "F_orward As"
+msgstr "F_orward As…"
+
+#: ../mail/e-mail-reader.c:1483
+msgid "_Go To"
+msgstr "_Go To"
+
+#: ../mail/e-mail-reader.c:1490
+#, fuzzy
+msgid "Mar_k As"
+msgstr "Mar_k as"
+
+#: ../mail/e-mail-reader.c:1497
+msgid "_Message"
+msgstr "_Message"
+
+#: ../mail/e-mail-reader.c:1504
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../mail/e-mail-reader.c:1521
+msgid "Mark for Follo_w Up..."
+msgstr "Mark for Follo_w Up…"
+
+#: ../mail/e-mail-reader.c:1529
+msgid "Mark as _Important"
+msgstr "Mark as _Important"
+
+#: ../mail/e-mail-reader.c:1533
+msgid "Mark as _Junk"
+msgstr "Mark as _Junk"
+
+#: ../mail/e-mail-reader.c:1537
+msgid "Mark as _Not Junk"
+msgstr "Mark as _Not Junk"
+
+#: ../mail/e-mail-reader.c:1541
+msgid "Mar_k as Read"
+msgstr "Mar_k as Read"
+
+#: ../mail/e-mail-reader.c:1545
+#, fuzzy
+msgid "Mark as Uni_mportant"
+msgstr "Mark as Un_important"
+
+#: ../mail/e-mail-reader.c:1549
+msgid "Mark as _Unread"
+msgstr "Mark as _Unread"
+
+#: ../mail/e-mail-reader.c:1585
+msgid "_Caret Mode"
+msgstr "_Caret Mode"
+
+#: ../mail/e-mail-reader.c:1587
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Show a blinking cursor in the body of displayed messages"
+
+#: ../mail/e-mail-reader.c:1593
+msgid "All Message _Headers"
+msgstr "All Message _Headers"
+
+#: ../mail/e-mail-reader.c:1595
+msgid "Show messages with all email headers"
+msgstr "Show messages with all e-mail headers"
+
+#: ../mail/e-mail-reader.c:1807
+msgid "Unable to retrieve message"
+msgstr "Unable to retrieve message"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2208
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:612
+#: ../plugins/google-account-setup/google-source.c:783
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "Default"
+
+#: ../mail/e-mail-reader.c:2353 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../modules/calendar/e-memo-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:1105
+#: ../plugins/groupwise-features/share-folder.c:765
+msgid "Delete"
+msgstr "Delete"
+
+#: ../mail/e-mail-reader.c:2357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1194
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "Next"
+
+#: ../mail/e-mail-reader.c:2361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1187
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "Previous"
+
+#: ../mail/e-mail-reader.c:2365 ../mail/message-tag-followup.c:62
+msgid "Reply"
+msgstr "Reply"
+
+#: ../mail/e-mail-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "Matches: %d"
+
+#: ../mail/e-mail-search-bar.c:552
+msgid "Close the find bar"
+msgstr "Close the find bar"
+
+#: ../mail/e-mail-search-bar.c:560
+msgid "Fin_d:"
+msgstr "Fin_d:"
+
+#: ../mail/e-mail-search-bar.c:572
+msgid "Clear the search"
+msgstr "Clear the search"
+
+#: ../mail/e-mail-search-bar.c:595
+msgid "_Previous"
+msgstr "_Previous"
+
+#: ../mail/e-mail-search-bar.c:601
+msgid "Find the previous occurrence of the phrase"
+msgstr "Find the previous occurrence of the phrase"
+
+#: ../mail/e-mail-search-bar.c:611
+msgid "_Next"
+msgstr "_Next"
+
+#: ../mail/e-mail-search-bar.c:617
+msgid "Find the next occurrence of the phrase"
+msgstr "Find the next occurrence of the phrase"
+
+#: ../mail/e-mail-search-bar.c:627
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
+
+#: ../mail/e-mail-search-bar.c:655
+msgid "Reached bottom of page, continued from top"
+msgstr "Reached bottom of page, continued from top"
+
+#: ../mail/e-mail-search-bar.c:677
+msgid "Reached top of page, continued from bottom"
+msgstr "Reached top of page, continued from bottom"
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
+#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:220
+#: ../mail/message-list.c:1555
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:120
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:107
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:110
+#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/mail/e-mail-shell-migrate.c:2931
+msgid "On This Computer"
+msgstr "On This Computer"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:486
+msgid "No encryption"
+msgstr "No encryption"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:490
+msgid "TLS encryption"
+msgstr "TLS encryption"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:494
+msgid "SSL encryption"
+msgstr "SSL encryption"
+
+#: ../mail/em-account-editor.c:587
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Licence Agreement"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid ""
 "\n"
@@ -11815,119 +9838,155 @@ msgstr ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "Select Folder"
+#: ../mail/em-account-editor.c:1002
+msgid "Never"
+msgstr "Never"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "Autogenerated"
+#: ../mail/em-account-editor.c:1003
+msgid "Always"
+msgstr "Always"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:1004
 msgid "Ask for each message"
 msgstr "Ask for each message"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:2084
+msgid "Mail Configuration"
+msgstr "Mail Configuration"
+
+#: ../mail/em-account-editor.c:2085
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+
+#: ../mail/em-account-editor.c:2087 ../mail/em-account-editor.c:2213
+#: ../mail/mail-config.glade.h:87
 msgid "Identity"
 msgstr "Identity"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2088
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Please enter your name and e-mail address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in e-mail you send."
+
+#: ../mail/em-account-editor.c:2090 ../mail/em-account-editor.c:2254
+#: ../mail/mail-config.glade.h:107
 msgid "Receiving Email"
 msgstr "Receiving E-mail"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2091
+msgid "Please configure the following account settings."
+msgstr "Please configure the following account settings."
+
+#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2714
+msgid "Sending Email"
+msgstr "Sending E-mail"
+
+#: ../mail/em-account-editor.c:2094
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+
+#: ../mail/em-account-editor.c:2096
+msgid "Account Management"
+msgstr "Account Management"
+
+#: ../mail/em-account-editor.c:2097
+#, fuzzy
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
+
+#: ../mail/em-account-editor.c:2101
+msgid "Done"
+msgstr "Done"
+
+#: ../mail/em-account-editor.c:2102
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive e-mail \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
+
+#: ../mail/em-account-editor.c:2526
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2534
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
-msgid "Sending Email"
-msgstr "Sending E-mail"
-
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2776 ../mail/mail-config.glade.h:63
 msgid "Defaults"
 msgstr "Defaults"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:113
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Security"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2879 ../mail/em-account-editor.c:2947
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2880 ../mail/em-account-editor.c:2948
 msgid "Checking for New Messages"
 msgstr "Checking for New Messages"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3407 ../mail/mail-config.glade.h:35
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3407
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
-msgid "[Default]"
-msgstr "[Default]"
-
-#: ../mail/em-account-prefs.c:488
-msgid "Account name"
-msgstr "Account name"
-
-#: ../mail/em-account-prefs.c:490
-msgid "Protocol"
-msgstr "Protocol"
-
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1203 ../mail/mail-signature-editor.c:478
-msgid "Unnamed"
-msgstr "Unnamed"
-
-#: ../mail/em-composer-prefs.c:970
-msgid "Language(s)"
-msgstr "Language(s)"
-
-#: ../mail/em-composer-prefs.c:1019
-msgid "Add signature script"
-msgstr "Add signature script"
-
-#: ../mail/em-composer-prefs.c:1061
-msgid "Signature(s)"
-msgstr "Signature(s)"
-
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Forwarded Message --------"
-
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1590
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "No destination address provided; forward of the message has been cancelled."
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1596
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "No account found to use; forward of the message has been cancelled."
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2063
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2105
+#: ../mail/em-composer-utils.c:2110
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11935,11 +9994,19 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2253
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-composer-utils.c:2431
+msgid "Posting destination"
+msgstr "Posting destination"
+
+#: ../mail/em-composer-utils.c:2432
+msgid "Choose folders to post the message to."
+msgstr "Choose folders to post the message to."
+
+#: ../mail/em-filter-editor.c:188
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
@@ -11984,14 +10051,6 @@ msgstr "Date received"
 msgid "Date sent"
 msgstr "Date sent"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Delete"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Deleted"
@@ -12036,229 +10095,180 @@ msgstr "Expression"
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Forward to"
+
+#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:955
 msgid "Important"
 msgstr "Important"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "is after"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "is before"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "is Flagged"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "is not Flagged"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "is not set"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "is set"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:88
 msgid "Junk"
 msgstr "Junk"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "Label"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "Match All"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Message Body"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Message Header"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "Message is Junk"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "Message is not Junk"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Message Location"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Pipe to Program"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Play Sound"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Read"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Recipients"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "Regex Match"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Replied to"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "returns"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "returns greater than"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "returns less than"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Run Program"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Score"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Sender"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "Sender or Recipients"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "Set Label"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "Set Status"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "Size (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "sounds like"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "Source Account"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "Specific header"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "starts with"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
-msgid "Subject"
-msgstr "Subject"
-
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Unset Status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
-#: ../mail/em-folder-browser.c:193
-msgid "C_reate Search Folder From Search..."
-msgstr "C_reate Search Folder From Search..."
-
-#: ../mail/em-folder-browser.c:218
-msgid "All Messages"
-msgstr "All Messages"
-
-#: ../mail/em-folder-browser.c:219
-msgid "Unread Messages"
-msgstr "Unread Messages"
-
-#: ../mail/em-folder-browser.c:221
-msgid "No Label"
-msgstr "No Label"
-
-#: ../mail/em-folder-browser.c:228
-msgid "Read Messages"
-msgstr "Read Messages"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Recent Messages"
-msgstr "Recent Messages"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Last 5 Days' Messages"
-msgstr "Last 5 Days' Messages"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Messages with Attachments"
-msgstr "Messages with Attachments"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Important Messages"
-msgstr "Important Messages"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Messages Not Junk"
-msgstr "Messages Not Junk"
-
-#: ../mail/em-folder-browser.c:1188
-msgid "Account Search"
-msgstr "Account Search"
-
-#: ../mail/em-folder-browser.c:1241
-msgid "All Account Search"
-msgstr "All Account Search"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -12284,70 +10294,52 @@ msgstr "Quota usage (%s):"
 msgid "Quota usage"
 msgstr "Quota usage"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2598 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
-msgid "Inbox"
-msgstr "Inbox"
-
-#: ../mail/em-folder-properties.c:390
+#: ../mail/em-folder-properties.c:399
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:267
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:271
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:978 ../mail/mail-vfolder.c:1034
 msgid "Search Folders"
 msgstr "Search Folders"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
-msgid "Drafts"
-msgstr "Drafts"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Templates"
-
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
-msgid "Outbox"
-msgstr "Outbox"
-
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
-msgid "Sent"
-msgstr "Sent"
-
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:662 ../mail/em-folder-tree-model.c:998
 msgid "Loading..."
-msgstr "Loading..."
+msgstr "Loading…"
+
+#: ../mail/em-folder-tree.c:183 ../mail/mail-ops.c:1069
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Scanning folders in \"%s\""
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
@@ -12357,314 +10349,85 @@ msgstr "Loading..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
+#: ../mail/em-folder-tree.c:831
 #, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:1154
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:1321
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:1323
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:1330 ../mail/message-list.c:2052
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:1332 ../mail/message-list.c:2054
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:1347
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
-msgid "_Copy to Folder"
-msgstr "_Copy to Folder"
-
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
-msgid "_Move to Folder"
-msgstr "_Move to Folder"
-
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Scanning folders in \"%s\""
-
-#: ../mail/em-folder-tree.c:2117
-msgid "Open in _New Window"
-msgstr "Open in _New Window"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
-msgid "_New Folder..."
-msgstr "_New Folder..."
-
-#: ../mail/em-folder-tree.c:2125
-msgid "_Move..."
-msgstr "_Move..."
-
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "Re_fresh"
-
-#: ../mail/em-folder-tree.c:2134
-msgid "Fl_ush Outbox"
-msgstr "Fl_ush Outbox"
-
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "_Empty Wastebasket"
-
-#: ../mail/em-folder-tree.c:2243
-msgid "_Unread Search Folder"
-msgstr "_Unread Search Folder"
-
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copying `%s' to `%s'"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
-msgid "Select folder"
-msgstr "Select folder"
+#: ../mail/em-folder-utils.c:511
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Rename the \"%s\" folder to:"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
-msgid "C_opy"
-msgstr "C_opy"
+#: ../mail/em-folder-utils.c:513
+msgid "Rename Folder"
+msgstr "Rename Folder"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:519
+msgid "Folder names cannot contain '/'"
+msgstr "Folder names cannot contain '/'"
+
+#: ../mail/em-folder-utils.c:595
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: ../mail/em-folder-utils.c:691
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:757
+#, fuzzy
+msgid "Create Folder"
 msgstr "Create folder"
 
-#: ../mail/em-folder-utils.c:691
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:758
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:386
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "Mail Deletion Failed"
-
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "You do not have sufficient permissions to delete this mail."
-
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "_Reply to Sender"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "_Forward"
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
-msgid "_Edit as New Message..."
-msgstr "_Edit as New Message..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "U_ndelete"
-msgstr "U_ndelete"
-
-#: ../mail/em-folder-view.c:1344
-msgid "_Move to Folder..."
-msgstr "_Move to Folder..."
-
-#: ../mail/em-folder-view.c:1345
-msgid "_Copy to Folder..."
-msgstr "_Copy to Folder..."
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mar_k as Read"
-msgstr "Mar_k as Read"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as _Unread"
-msgstr "Mark as _Unread"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Important"
-msgstr "Mark as _Important"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as Un_important"
-msgstr "Mark as Un_important"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark as _Junk"
-msgstr "Mark as _Junk"
-
-#: ../mail/em-folder-view.c:1353
-msgid "Mark as _Not Junk"
-msgstr "Mark as _Not Junk"
-
-#: ../mail/em-folder-view.c:1354
-msgid "Mark for Follo_w Up..."
-msgstr "Mark for Follo_w Up..."
-
-#: ../mail/em-folder-view.c:1356
-msgid "_Label"
-msgstr "_Label"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
-msgid "_None"
-msgstr "_None"
-
-#: ../mail/em-folder-view.c:1360
-msgid "_New Label"
-msgstr "_New Label"
-
-#: ../mail/em-folder-view.c:1364
-msgid "Fla_g Completed"
-msgstr "Fla_g Completed"
-
-#: ../mail/em-folder-view.c:1365
-msgid "Cl_ear Flag"
-msgstr "Cl_ear Flag"
-
-#: ../mail/em-folder-view.c:1368
-msgid "Crea_te Rule From Message"
-msgstr "Crea_te Rule From Message"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Subject"
-msgstr "Search Folder based on _Subject"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Se_nder"
-msgstr "Search Folder based on Se_nder"
-
-#: ../mail/em-folder-view.c:1372
-msgid "Search Folder based on _Recipients"
-msgstr "Search Folder based on _Recipients"
-
-#: ../mail/em-folder-view.c:1373
-msgid "Search Folder based on Mailing _List"
-msgstr "Search Folder based on Mailing _List"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Sub_ject"
-msgstr "Filter based on Sub_ject"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on Sen_der"
-msgstr "Filter based on Sen_der"
-
-#: ../mail/em-folder-view.c:1380
-msgid "Filter based on Re_cipients"
-msgstr "Filter based on Re_cipients"
-
-#: ../mail/em-folder-view.c:1381
-msgid "Filter based on _Mailing List"
-msgstr "Filter based on _Mailing List"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:511
-#: ../plugins/google-account-setup/google-source.c:709
-msgid "Default"
-msgstr "Default"
-
-#: ../mail/em-folder-view.c:2518
-msgid "Unable to retrieve message"
-msgstr "Unable to retrieve message"
-
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "Retrieving Message..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "C_all To..."
-
-#: ../mail/em-folder-view.c:2759
-msgid "Create _Search Folder"
-msgstr "Create _Search Folder"
-
-#: ../mail/em-folder-view.c:2760
-msgid "_From this Address"
-msgstr "_From this Address"
-
-#: ../mail/em-folder-view.c:2761
-msgid "_To this Address"
-msgstr "_To this Address"
-
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-utils.c:774
 #, c-format
-msgid "Click to mail %s"
-msgstr "Click to mail %s"
-
-#: ../mail/em-folder-view.c:3266
-#, c-format
-msgid "Click to call %s"
-msgstr "Click to call %s"
-
-#: ../mail/em-folder-view.c:3271
-msgid "Click to hide/unhide addresses"
-msgstr "Click to hide/unhide addresses"
-
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "Matches: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "Fin_d:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "_Previous"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "_Next"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "M_atch case"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Unsubscribing from folder \"%s\""
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1453
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:108
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12672,11 +10435,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:109 ../mail/em-format-html.c:1454
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:109
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12684,11 +10447,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:110 ../mail/em-format-html.c:1455
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:110
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12696,11 +10459,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:111 ../mail/em-format-html.c:1456
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:111
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12708,11 +10471,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:112 ../mail/em-format-html.c:1457
 msgid "Signature exists, but need public key"
 msgstr "Signature exists, but need public key"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:112
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12720,11 +10483,11 @@ msgstr ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:119 ../mail/em-format-html.c:1463
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:119
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12732,11 +10495,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:120 ../mail/em-format-html.c:1464
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:120
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12746,11 +10509,11 @@ msgstr ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:121 ../mail/em-format-html.c:1465
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:121
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12758,11 +10521,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:122 ../mail/em-format-html.c:1466
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:122
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12772,528 +10535,240 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:274
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Completed on %d %B, %Y, %l:%M %p"
+#: ../mail/em-format-html-display.c:525
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution cannot render this e-mail as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+
+#: ../mail/em-format-html-display.c:795
+msgid "Completed on"
+msgstr "Completed on"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:803
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "by %d %B, %Y, %l:%M %p"
-
-#: ../mail/em-format-html-display.c:1499
-msgid "_View Inline"
-msgstr "_View Inline"
-
-#: ../mail/em-format-html-display.c:1500
-msgid "_Hide"
-msgstr "_Hide"
-
-#: ../mail/em-format-html-display.c:1501
-msgid "_Fit to Width"
-msgstr "_Fit to Width"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:807
+msgid "by"
+msgstr "by"
 
-#: ../mail/em-format-html-display.c:1502
-msgid "Show _Original Size"
-msgstr "Show _Original Size"
-
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "Save attachment as"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "Select folder to save all attachments"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "_Save Selected..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d at_tachment"
-msgstr[1] "%d at_tachments"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "S_ave"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "S_ave All"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "No Attachment"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1204 ../mail/em-format-html-display.c:1243
 msgid "View _Unformatted"
 msgstr "View _Unformatted"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1206
 msgid "Hide _Unformatted"
 msgstr "Hide _Unformatted"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1263
 msgid "O_pen With"
 msgstr "O_pen With"
 
-#: ../mail/em-format-html-display.c:2668
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution cannot render this e-mail as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#: ../mail/em-format-html.c:342
+msgid "Formatting Message..."
+msgstr "Formatting Message…"
+
+#: ../mail/em-format-html.c:1304 ../mail/em-format-html.c:1313
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Retrieving `%s'"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:1759
 msgid "Unknown external-body part."
 msgstr "Unknown external-body part."
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:1767
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:1797
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:1808
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointer to local file (%s) valid at site \"%s\""
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:1810
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1831
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1842
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: ../mail/em-format-html.c:1241
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#: ../mail/em-format-html.c:1415
-msgid "Formatting Message..."
-msgstr "Formatting Message..."
-
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1459
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr " (%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:2483
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "From"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
-msgid "Date"
-msgstr "Date"
-
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Face"
-
-#: ../mail/em-format.c:1160
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: ../mail/em-format.c:1199
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: ../mail/em-format.c:1344
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: ../mail/em-format.c:1354
-msgid "Could not parse PGP/MIME message"
-msgstr "Could not parse PGP/MIME message"
-
-#: ../mail/em-format.c:1354
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Could not parse PGP/MIME message: Unknown error"
-
-#: ../mail/em-format.c:1511
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: ../mail/em-format.c:1664
-msgid "Could not parse PGP message"
-msgstr "Could not parse PGP message"
-
-#: ../mail/em-format.c:1664
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Could not parse PGP message: Unknown error"
-
-#: ../mail/em-mailer-prefs.c:94
-msgid "Every time"
-msgstr "Every time"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Once per day"
-msgstr "Once per day"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per week"
-msgstr "Once per week"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per month"
-msgstr "Once per month"
-
-#: ../mail/em-mailer-prefs.c:333
-msgid "Add Custom Junk Header"
-msgstr "Add Custom Junk Header"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Name:"
-msgstr "Header Name:"
-
-#: ../mail/em-mailer-prefs.c:338
-msgid "Header Value Contains:"
-msgstr "Header Value Contains:"
-
-#: ../mail/em-mailer-prefs.c:444
-msgid "Contains Value"
-msgstr "Contains Value"
-
-#: ../mail/em-mailer-prefs.c:467
-msgid "Color"
-msgstr "Colour"
-
-#: ../mail/em-mailer-prefs.c:470
-msgid "Tag"
-msgstr "Tag"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1141
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s plugin is available and the binary is installed."
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1095 ../mail/em-mailer-prefs.c:1150
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"%s plugin is not available. Please check whether the package is installed."
-
-#: ../mail/em-mailer-prefs.c:1116
-msgid "No Junk plugin available"
-msgstr "No Junk plugin available"
-
-#. green
-#: ../mail/em-migrate.c:1059
-msgid "To Do"
-msgstr "To Do"
-
-#. blue
-#: ../mail/em-migrate.c:1060
-msgid "Later"
-msgstr "Later"
-
-#: ../mail/em-migrate.c:1228
-msgid "Migration"
-msgstr "Migration"
-
-#: ../mail/em-migrate.c:1673
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Unable to create new folder `%s': %s"
-
-#: ../mail/em-migrate.c:1699
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Unable to copy folder `%s' to `%s': %s"
-
-#: ../mail/em-migrate.c:1884
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Unable to scan for existing mailboxes at `%s': %s"
-
-#: ../mail/em-migrate.c:1889
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-
-#: ../mail/em-migrate.c:2090
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Unable to open old POP keep-on-server data `%s': %s"
-
-#: ../mail/em-migrate.c:2104
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
-
-#: ../mail/em-migrate.c:2133
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
-
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Failed to create local mail storage `%s': %s"
-
-#: ../mail/em-migrate.c:2974
-msgid "Migrating Folders"
-msgstr "Migrating Folders"
-
-#: ../mail/em-migrate.c:2974
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-
-#: ../mail/em-migrate.c:3056
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Unable to create local mail folders at `%s': %s"
-
-#: ../mail/em-migrate.c:3075
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
-msgid "_Reply to sender"
-msgstr "_Reply to sender"
-
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Reply to _List"
-msgstr "Reply to _List"
-
-#. make it first item
-#: ../mail/em-popup.c:623 ../mail/em-popup.c:848
-msgid "_Add to Address Book"
-msgstr "_Add to Address Book"
-
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-subscribe-editor.c:607
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:640
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:644
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:844
+#: ../mail/em-subscribe-editor.c:860
 msgid "Please select a server."
 msgstr "Please select a server."
 
-#: ../mail/em-subscribe-editor.c:865
+#: ../mail/em-subscribe-editor.c:896
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
-msgid "_Do not show this message again."
-msgstr "_Do not show this message again."
-
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:305
 msgid "Message Filters"
 msgstr "Message Filters"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:357
 msgid "message"
 msgstr "message"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:645
 msgid "Save Message..."
-msgstr "Save Message..."
-
-#: ../mail/em-utils.c:705
-msgid "Add address"
-msgstr "Add address"
+msgstr "Save Message…"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1108
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:596
 msgid "Search Folder source"
 msgstr "Search Folder source"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Filter Editor\" window height"
+msgstr "Default window height"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+#, fuzzy
+msgid "\"Filter Editor\" window maximize state"
+msgstr "\"Send and Receive Mail\" window maximise state"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Filter Editor\" window width"
+msgstr "Default window width"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+msgid "\"Search Folder Editor\" window height"
+msgstr "Default window height"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "\"Send and Receive Mail\" window maximise state"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+msgid "\"Search Folder Editor\" window width"
+msgstr "Search Folder based on Mailing _List"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"Send and Receive Mail\" window height"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"Send and Receive Mail\" window maximise state"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Send and Receive Mail\" window width"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "Allows Evolution to display text part of limited size"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Always request read receipt"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "Automatic emoticon recognition"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "Citation highlight colour"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "Citation highlight colour."
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "Composer Window default height"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "Composer Window default width"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "Composer load/attach directory"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compress display of addresses in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -13301,7 +10776,7 @@ msgstr ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -13309,11 +10784,11 @@ msgstr ""
 "Controls how frequently local changes are synchronised with the remote mail "
 "server. The interval must be at least 30 seconds."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "Custom headers to use while checking for junk."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -13321,59 +10796,66 @@ msgstr ""
 "Custom headers to use while checking for junk. The list elements are strings "
 "in the format \"headername=value\"."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "Default height of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "Default height of the message window."
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+msgid "Default height of the mail browser window."
+msgstr "Default height of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "Default height of the subscribe dialogue."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+#, fuzzy
+msgid "Default maximized state of the mail browser window."
+msgstr "Default width of the Composer Window."
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "Default width of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "Default width of the message window."
+#: ../mail/evolution-mail.schemas.in.h:38
+#, fuzzy
+msgid "Default width of the mail browser window."
+msgstr "Default width of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "Default width of the subscribe dialogue."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -13381,11 +10863,11 @@ msgstr ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Determines whether to lookup in address book for sender e-mail"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -13397,11 +10879,11 @@ msgstr ""
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -13411,7 +10893,7 @@ msgstr ""
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -13419,71 +10901,79 @@ msgstr ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory for loading/attaching files to composer."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Disable or enable ellipsizing of folder names in side bar"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Trash folders on exit"
 msgstr "Empty Wastebasket folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Wastebasket folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Enable or disable the prompt whilst marking multiple messages."
+
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable search folders"
 msgstr "Enable search folders"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders on startup."
 msgstr "Enable search folders on startup."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13491,41 +10981,43 @@ msgstr ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable to render message text part of limited size."
 msgstr "Enable to render message text part of limited size."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:65 ../mail/mail-config.glade.h:74
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Encode file names in an Outlook/GMail way"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
-"Encode file names in the mail headers the same as Outlook or GMail does, to "
-"let them understand localised file names sent by Evolution, because they do "
-"not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13533,15 +11025,7 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13552,7 +11036,25 @@ msgstr ""
 "component viewer in GNOME's MIME type database may be used for displaying "
 "content."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:72
+#, fuzzy
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+
+#: ../mail/evolution-mail.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13560,7 +11062,35 @@ msgstr ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:75
+#, fuzzy
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"Initial maximise state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximises or unmaximises the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximised. This key exists only as an implementation "
+"detail."
+
+#: ../mail/evolution-mail.schemas.in.h:76
+#, fuzzy
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"Initial maximise state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximises or unmaximises the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximised. This key exists only as an implementation "
+"detail."
+
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13574,19 +11104,33 @@ msgstr ""
 "\" window cannot be maximised. This key exists only as an implementation "
 "detail."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
+#, fuzzy
 msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
+
+#: ../mail/evolution-mail.schemas.in.h:79
+#, fuzzy
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Enable or disable the prompt while marking multiple messages."
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13594,7 +11138,7 @@ msgstr ""
 "It disables/enables the repeated prompts to ask if offline synchronisation "
 "is required before going into offline mode."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13604,31 +11148,36 @@ msgstr ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "Last time empty junk was run"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "Last time empty wastebasket was run"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+msgid "Layout style"
+msgstr "Lay_out"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "List of MIME types to check for Bonobo component viewers"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "List of accepted licences"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13636,15 +11185,15 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr "List of dictionary language codes used for spell checking."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13652,123 +11201,129 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "List of protocol names whose licence has been accepted."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "Load images for HTML messages over HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" — "
+"Never load images off the net. \"1\" — Load images in messages from "
+"contacts. \"2\" — Always load images off the net."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+msgid "Mail browser height"
+msgstr "Uniform row height"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+#, fuzzy
+msgid "Mail browser width"
+msgstr "E-mail begins with"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid "Message Window default height"
-msgstr "Message Window default height"
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default width"
-msgstr "Message Window default width"
-
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum number of days between emptying the wastebasket on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the wastebasket on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Prompt to check if the user wants to go offline immediately"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13776,75 +11331,177 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Put personalized signatures at the top of replies"
+msgstr "Put personalised signatures at the top of replies"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Put the cursor at the bottom of replies"
+msgstr "Put the cursor at the bottom of replies"
+
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recognise emoticons in text and replace them with images."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "Recognise links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Search for the sender photo in local address books"
 msgstr "Search for the sender photo in local address books"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "Sender e-mail address column in the message list"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Show \"Bcc\" field when sending a mail message"
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Show \"Cc\" field when sending a mail message"
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Show \"From\" field when posting to a newsgroup"
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Show \"From\" field when sending a mail message"
+msgstr "Show \"From\" field when sending a mail message"
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Show \"Reply To\" field when posting to a newsgroup"
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Show \"Reply To\" field when sending a mail message"
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+msgid "Show all message headers"
+msgstr "Collapse all message threads"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+#, fuzzy
+msgid "Show all the headers when viewing a messages."
+msgstr "Show \"Reply To\" field when sending a mail message"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Show image animations"
+msgstr "Show image animations"
+
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Show the \"Preview\" pane"
+msgstr "Show the \"Preview\" pane"
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Show the \"Preview\" pane."
+msgstr "Show the \"Preview\" pane."
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -13852,59 +11509,67 @@ msgstr ""
 "Show the e-mail address of the sender in a separate column in the message "
 "list."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "Spell checking colour"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "Subscribe dialogue default height"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "Subscribe dialogue default width"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "Text message part limit"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "The last time empty junk was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "The last time empty wastebasket was run, in days since the epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13912,7 +11577,7 @@ msgstr ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -13920,7 +11585,7 @@ msgstr ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13930,7 +11595,7 @@ msgstr ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13938,7 +11603,7 @@ msgstr ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13947,10 +11612,10 @@ msgid ""
 msgstr ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
+"header enabled&gt; — set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -13960,19 +11625,19 @@ msgstr ""
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "This option would help in improving the speed of fetching."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
 "This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
+"beyond which a '…' is shown."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13980,7 +11645,7 @@ msgstr ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:184
 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 "
@@ -13990,116 +11655,92 @@ msgstr ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message list."
 msgstr "Thread the message list."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Thread the message-list"
 msgstr "Thread the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Timeout for marking message as seen"
 msgstr "Timeout for marking message as seen"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Timeout for marking message as seen."
 msgstr "Timeout for marking message as seen."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Underline colour for misspelt words when using inline spelling."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "Use side-by-side or wide layout"
-msgstr "Use side-by-side or wide layout"
+#: ../mail/evolution-mail.schemas.in.h:198
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "View/Bcc menu item is checked"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "View/Bcc menu item is checked."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "View/Cc menu item is checked"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "View/Cc menu item is checked."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "View/From menu item is checked"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "View/From menu item is checked."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "View/PostTo menu item is checked"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "View/PostTo menu item is checked."
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "View/ReplyTo menu item is checked"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "View/ReplyTo menu item is checked."
-
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Whether a read receipt request gets added to every message by default."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Whether to disable ellipsizing feature of folder names in the side bar."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14107,15 +11748,15 @@ msgstr ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
@@ -14123,6 +11764,12 @@ msgstr "Width of the message-list pane."
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../modules/mail/e-mail-shell-view.c:481
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Mail"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
@@ -14131,37 +11778,42 @@ msgstr "Evolution Elm importer"
 msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../plugins/pst-import/pst-importer.c:310
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../mail/importers/evolution-mbox-importer.c:87
+#: ../plugins/pst-import/pst-importer.c:303
+msgid "Select folder"
+msgstr "Select folder"
+
+#: ../mail/importers/evolution-mbox-importer.c:87
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:131
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:215
+#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:526
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:358
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
@@ -14170,6 +11822,11 @@ msgstr "Scanning %s"
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
+#: ../mail/importers/pine-importer.c:383
+#: ../modules/addressbook/addressbook-config.c:1016
+msgid "Address Book"
+msgstr "Address Book"
+
 #: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
@@ -14178,118 +11835,33 @@ msgstr "Evolution Pine importer"
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:257
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:292
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: ../mail/mail-component.c:550
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d selected, "
-msgstr[1] "%d selected, "
-
-#: ../mail/mail-component.c:554
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d deleted"
-msgstr[1] "%d deleted"
-
-#: ../mail/mail-component.c:561
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d junk"
-msgstr[1] "%d junk"
-
-#: ../mail/mail-component.c:564
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d draft"
-msgstr[1] "%d drafts"
-
-#: ../mail/mail-component.c:566
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d sent"
-msgstr[1] "%d sent"
-
-#: ../mail/mail-component.c:568
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d unsent"
-msgstr[1] "%d unsent"
-
-#: ../mail/mail-component.c:574
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d unread, "
-msgstr[1] "%d unread, "
-
-#: ../mail/mail-component.c:575
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d total"
-msgstr[1] "%d total"
-
-#: ../mail/mail-component.c:927
-msgid "New Mail Message"
-msgstr "New Mail Message"
-
-#: ../mail/mail-component.c:928
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Mail Message"
-
-#: ../mail/mail-component.c:929
-msgid "Compose a new mail message"
-msgstr "Compose a new mail message"
-
-#: ../mail/mail-component.c:935
-msgid "New Mail Folder"
-msgstr "New Mail Folder"
-
-#: ../mail/mail-component.c:936
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Mail _Folder"
-
-#: ../mail/mail-component.c:937
-msgid "Create a new mail folder"
-msgstr "Create a new mail folder"
-
-#: ../mail/mail-component.c:1084
-msgid "Failed upgrading Mail settings or folders."
-msgstr "Failed upgrading Mail settings or folders."
-
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
+#, fuzzy
+msgid " Ch_eck for Supported Types"
 msgstr " Ch_eck for Supported Types "
 
 #: ../mail/mail-config.glade.h:2
@@ -14332,338 +11904,299 @@ msgstr "<span weight=\"bold\">Composing Messages</span>"
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuration</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Default Behaviour</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Delete Mail</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">Displayed Message _Headers</span>"
 
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels</span>"
 msgstr "<span weight=\"bold\">Labels</span>"
 
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Loading Images</span>"
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Message Display</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Message Fonts</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Message Receipts</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Optional Information</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Options</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Printed Fonts</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Proxy Settings</span>"
 msgstr "<span weight=\"bold\">Proxy Settings</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Required Information</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Security</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Server Configuration</span>"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">_Authentication Type</span>"
 
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "Account Management"
-
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
-msgstr "Add Ne_w Signature..."
+msgstr "Add Ne_w Signature…"
 
 #: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "Add _Script"
-
-#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Al_ways sign outgoing messages when using this account"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Also encrypt to sel_f when sending encrypted messages"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Alway_s carbon-copy (cc) to:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Always encrypt to _myself when sending encrypted messages"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
 msgid "Always request rea_d receipt"
 msgstr "Always request rea_d receipt"
 
-#: ../mail/mail-config.glade.h:46
-msgid "Automatically insert _emoticon images"
-msgstr "Automatically insert _emoticon images"
+#: ../mail/mail-config.glade.h:44
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
 
 #: ../mail/mail-config.glade.h:47
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltic (ISO-8859-13)"
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
 
-#: ../mail/mail-config.glade.h:48
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltic (ISO-8859-4)"
+#: ../mail/mail-config.glade.h:51
+msgid "Automatically insert _emoticon images"
+msgstr "Automatically insert _emoticon images"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:52
 msgid "C_haracter set:"
 msgstr "C_haracter set:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr "Ch_eck for Supported Types "
+#: ../mail/mail-config.glade.h:53
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
+msgstr "Ch_eck for Supported Types"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:54
 msgid "Check cu_stom headers for junk"
 msgstr "Check cu_stom headers for junk"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:55
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Checks incoming mail messages to be Junk"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:58
 msgid "Cle_ar"
 msgstr "Cle_ar"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:59
 msgid "Clea_r"
 msgstr "Clea_r"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:60
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelt words:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:61
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: ../mail/mail-config.glade.h:59
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive e-mail \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-
-#: ../mail/mail-config.glade.h:65
-msgid "De_fault"
-msgstr "De_fault"
-
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:62
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:64
 msgid "Delete junk messages on e_xit"
 msgstr "Delete junk messages on e_xit"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:66
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitally sign o_utgoing messages (by default)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:67
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Do not format messages when text si_ze exceeds"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:68
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Do not mar_k messages as junk if sender is in my address book"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "Do not quote"
-
-#: ../mail/mail-config.glade.h:74
-msgid "Done"
-msgstr "Done"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:69
 msgid "Drafts _Folder:"
 msgstr "Drafts _Folder:"
 
-#: ../mail/mail-config.glade.h:76
-msgid "Email Accounts"
-msgstr "E-mail Accounts"
-
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:70
 msgid "Email _Address:"
 msgstr "E-mail _Address:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:71
 msgid "Empty trash folders on e_xit"
 msgstr "Empty wastebasket folders on e_xit"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:72
 msgid "Enable Magic S_pacebar"
 msgstr "Enable Magic S_pacebar"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:73
 msgid "Enable Sea_rch Folders"
 msgstr "Enable Sea_rch Folders"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:75
 msgid "Encry_ption certificate:"
 msgstr "Encry_ption certificate:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:76
 msgid "Encrypt out_going messages (by default)"
 msgstr "Encrypt out_going messages (by default)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:77
 msgid "Fi_xed-width:"
 msgstr "Fi_xed-width:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:78
 msgid "Fix_ed width Font:"
 msgstr "Fix_ed width Font:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:79
 msgid "Font Properties"
 msgstr "Font Properties"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:80
 msgid "Format messages in _HTML"
 msgstr "Format messages in _HTML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:81
 msgid "Full Nam_e:"
 msgstr "Full Nam_e:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:83
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:84
 msgid "H_TTP Proxy:"
 msgstr "H_TTP Proxy:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:85
 msgid "Headers"
 msgstr "Headers"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:86
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "Inline"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "Inline (Outlook style)"
-
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:89
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:90 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Labels"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:91
 msgid "Languages Table"
 msgstr "Languages Table"
 
-#: ../mail/mail-config.glade.h:102
-msgid "Mail Configuration"
-msgstr "Mail Configuration"
-
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:92
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:93 ../modules/mail/e-mail-shell-backend.c:213
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: ../mail/mail-config.glade.h:94
 msgid "Mailbox location"
 msgstr "Mailbox location"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:95
 msgid "Message Composer"
 msgstr "Message Composer"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:96
 msgid "No _Proxy for:"
 msgstr "No _Proxy for:"
 
-#: ../mail/mail-config.glade.h:108
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:97
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14671,165 +12204,115 @@ msgstr ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:98
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "Option is ignored if a match for custom junk headers is found."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:99
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:100
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:101
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../mail/mail-config.glade.h:115
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-
-#: ../mail/mail-config.glade.h:117
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-
-#: ../mail/mail-config.glade.h:118
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Please enter your name and e-mail address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in e-mail you send."
-
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "Please select among the following options"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:103
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:104
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "Quoted"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:105
 msgid "Re_member password"
 msgstr "Re_member password"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:106
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:108
 msgid "Remember _password"
 msgstr "Remember _password"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "S_OCKS Host:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:109
 msgid "S_earch for sender photograph only in local address books"
 msgstr "S_earch for sender photograph only in local address books"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:110
 msgid "S_elect..."
-msgstr "S_elect..."
+msgstr "S_elect…"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:111
 msgid "S_end message receipts:"
 msgstr "S_end message receipts:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:112
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "Select Drafts Folder"
-
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:114
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "Select HTML fixed width font for printing"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:116
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "Select Sent Folder"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:118
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:119
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:120
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
-msgstr "Server _Type: "
+#: ../mail/mail-config.glade.h:121
+msgid "Server _Type:"
+msgstr "Server _Type:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:122
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:123
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:124
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:147
-msgid "Signatures Table"
-msgstr "Signatures Table"
-
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:125
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:126
 msgid "Start _typing at the bottom on replying"
 msgstr "Start _typing at the bottom on replying"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
-msgstr "T_ype: "
+#: ../mail/mail-config.glade.h:127
+msgid "T_ype:"
+msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:128
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14837,17 +12320,17 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:129
+#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:132
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14855,156 +12338,152 @@ msgstr ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:134
 msgid "Us_ername:"
 msgstr "Us_ername:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:135
 msgid "Use Authe_ntication"
 msgstr "Use Authe_ntication"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:616
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:349
+#: ../mail/mail-config.glade.h:136 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-source.c:700
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:137
 msgid "V_ariable-width:"
 msgstr "V_ariable-width:"
 
-#: ../mail/mail-config.glade.h:161
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-msgstr ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:138
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:139
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "_Automatic proxy configuration URL:"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:140
 msgid "_Default junk plugin:"
 msgstr "_Default junk plugin:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:141
 msgid "_Direct connection to the Internet"
 msgstr "_Direct connection to the Internet"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:142
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:143
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:144
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Keep Signature above the original message on replying"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:145
 msgid "_Load images in messages from contacts"
 msgstr "_Load images in messages from contacts"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:146
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:147
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:148
 msgid "_Manual proxy configuration:"
 msgstr "_Manual proxy configuration:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:149
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:151
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:152
 msgid "_Path:"
 msgstr "_Path:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:153
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Prompt on sending HTML mail to contacts that do not want them"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:154
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Prompt when sending messages with an empty subject line"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:155
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:156
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:157
 msgid "_Secure HTTP Proxy:"
 msgstr "_Secure HTTP Proxy:"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:158
 msgid "_Select..."
-msgstr "_Select..."
+msgstr "_Select…"
+
+#: ../mail/mail-config.glade.h:159
+#: ../modules/addressbook/ldap-config.glade.h:39
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Server:"
+msgstr "_Server:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:161
 msgid "_Show image animations"
 msgstr "_Show image animations"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:162
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Show the photograph of sender in the message preview"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:163
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Shrink To / Cc / Bcc headers to "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:164
 msgid "_Use Secure Connection:"
 msgstr "_Use Secure Connection:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:165
 msgid "_Use system defaults"
 msgstr "_Use system defaults"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:166
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:169
 msgid "addresses"
 msgstr "addresses"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:170
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:171
 msgid "description"
 msgstr "description"
 
+#: ../mail/mail-config.glade.h:172
+msgid "seconds"
+msgstr "seconds"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -15034,50 +12513,34 @@ msgid "All local folders"
 msgstr "All local folders"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "Case _sensitive"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "F_ind:"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "Find in Message"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "None Selected"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "Specific folders"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15085,42 +12548,42 @@ msgstr ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "_Tick this to accept the licence agreement"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:872
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:110
 msgid "Filtering Selected Messages"
 msgstr "Filtering Selected Messages"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:269
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:566
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:605
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15129,123 +12592,123 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:622
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:730 ../mail/mail-ops.c:811
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:740
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:767
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:769 ../mail/mail-send-recv.c:717
 msgid "Canceled."
 msgstr "Cancelled."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:771 ../mail/mail-send-recv.c:719
 msgid "Complete."
 msgstr "Complete."
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:883
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:960
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:960
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1177
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1218
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Retrieving quota information for folder %s"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1356
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1427
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1545
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1608
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1663
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1703 ../mail/mail-ops.c:1753
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1750
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying wastebasket in '%s'"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1751
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1832
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d messages"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2026
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2106
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15254,11 +12717,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2178
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2196 ../mail/mail-ops.c:2204
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15267,51 +12730,51 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2364
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2364
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2460
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparing account '%s' for offline"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2546
 msgid "Checking Service"
 msgstr "Checking Service"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:186
 msgid "Canceling..."
-msgstr "Cancelling..."
+msgstr "Cancelling…"
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:392
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:405
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:514
 msgid "Updating..."
-msgstr "Updating..."
+msgstr "Updating…"
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:514 ../mail/mail-send-recv.c:591
 msgid "Waiting..."
-msgstr "Waiting..."
+msgstr "Waiting…"
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:830
 #, c-format
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
@@ -15326,7 +12789,7 @@ msgid "Enter Passphrase"
 msgstr "Enter Passphrase"
 
 #: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
@@ -15339,62 +12802,50 @@ msgstr "Enter Password"
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
-#: ../mail/mail-signature-editor.c:201
-msgid "_Save and Close"
-msgstr "_Save and Close"
-
-#: ../mail/mail-signature-editor.c:355
-msgid "Edit Signature"
-msgstr "Edit Signature"
-
-#: ../mail/mail-signature-editor.c:370
-msgid "_Signature Name:"
-msgstr "_Signature Name:"
-
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:122
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Could not create spool directory `%s': %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:152
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Trying to movemail a non-mbox source `%s'"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:258
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "Forwarded message - %s"
+msgstr "Forwarded message — %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:260
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:300
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Invalid folder: `%s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setting up Search Folder: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:237
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Updating Search Folders for '%s:%s'"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:244
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Updating Search Folders for '%s'"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1085
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1183
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
@@ -15712,6 +13163,10 @@ msgstr "Ignore"
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
 
+#: ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr "Mail Deletion Failed"
+
 #: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
@@ -15961,6 +13416,10 @@ msgstr ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 
+#: ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "You do not have sufficient permissions to delete this mail."
+
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
@@ -16007,6 +13466,10 @@ msgstr "_Discard changes"
 msgid "_Do not Synchronize"
 msgstr "_Do not Synchronise"
 
+#: ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
+msgstr "_Empty Wastebasket"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Expunge"
@@ -16015,79 +13478,82 @@ msgstr "_Expunge"
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1064
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1065
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1066
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1067
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1068
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1069
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1073
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1074
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1078
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1079
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1688 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:71
+#: ../mail/message-list.c:1695 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1704
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1716
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1724
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1726
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
+#: ../mail/message-list.c:2466 ../shell/e-shell-view.c:534
+msgid "Shell Backend"
+msgstr ""
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4456
+#: ../mail/message-list.c:4054 ../mail/message-list.c:4528
 msgid "Generating message list"
 msgstr "Generating message list"
 
-#: ../mail/message-list.c:4295
+#: ../mail/message-list.c:4365
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16095,7 +13561,15 @@ msgstr ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 
-#: ../mail/message-list.c:4297
+#: ../mail/message-list.c:4367
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+
+#: ../mail/message-list.c:4369
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -16125,84 +13599,2346 @@ msgstr "Sent Messages"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Size"
 
 #: ../mail/message-list.etspec.h:19
 msgid "Subject - Trimmed"
-msgstr "Subject - Trimmed"
+msgstr "Subject — Trimmed"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Call"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58
 msgid "Forward"
 msgstr "Forward"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
-msgid "Reply"
-msgstr "Reply"
-
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63
 msgid "Reply to All"
 msgstr "Reply to All"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Review"
 
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1460
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Subject contains"
 msgstr "Subject contains"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
-msgstr "Subject or Recipients contains"
+msgid "Subject or Addresses contains"
+msgstr "Subject or Addresses contains"
+
+#: ../modules/addressbook/addressbook-config.c:212
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+
+#: ../modules/addressbook/addressbook-config.c:214
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+
+#: ../modules/addressbook/addressbook-config.c:216
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+
+#: ../modules/addressbook/addressbook-config.c:341
+msgid "Base"
+msgstr "Base"
+
+#: ../modules/addressbook/addressbook-config.c:643
+msgid "Copy _book content locally for offline operation"
+msgstr "Copy _book content locally for offline operation"
+
+#: ../modules/addressbook/addressbook-config.c:754
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+
+#: ../modules/addressbook/addressbook-config.c:832
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"E-mail Address\" requires anonymous access to your LDAP "
+"server."
+
+#: ../modules/addressbook/addressbook-config.c:911
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+
+#: ../modules/addressbook/addressbook-config.c:1020
+msgid "Server Information"
+msgstr "Server Information"
+
+#: ../modules/addressbook/addressbook-config.c:1022
+msgid "Authentication"
+msgstr "Authentication"
+
+#: ../modules/addressbook/addressbook-config.c:1025
+#: ../modules/addressbook/ldap-config.glade.h:15
+#: ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "Details"
+
+#: ../modules/addressbook/addressbook-config.c:1026
+msgid "Searching"
+msgstr "Searching"
+
+#: ../modules/addressbook/addressbook-config.c:1028
+msgid "Downloading"
+msgstr "Downloading"
+
+#: ../modules/addressbook/addressbook-config.c:1238
+#: ../modules/addressbook/ldap-config.glade.h:9
+msgid "Address Book Properties"
+msgstr "Address Book Properties"
+
+#: ../modules/addressbook/addressbook-config.c:1240
+msgid "New Address Book"
+msgstr "New Address Book"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Autocomplete length"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#, fuzzy
+msgid "Contact layout style"
+msgstr "Contact Print Test"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+#, fuzzy
+msgid "Contact preview pane position (vertical)"
+msgstr "Month view vertical pane position"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "EFolderList XML for the list of completion URIs"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "EFolderList XML for the list of completion URIs."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "Show autocompleted name with an address"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "Show preview pane"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "URI for the folder last used in the select names dialogue"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI for the folder last used in the select names dialogue."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Whether to force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "Whether to show the preview pane."
+
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "Date/Time Format"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/mail/em-mailer-prefs.c:1141
+msgid "Table column:"
+msgstr "Table column:"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "Autocompletion"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "Always _show address of the autocompleted contact"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "On LDAP Servers"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contact"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
+msgid "Create a new contact"
+msgstr "Create a new contact"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+#, fuzzy
+msgid "Contact _List"
+msgstr "Contact _List"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
+msgid "Create a new contact list"
+msgstr "Create a new contact list"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Address _Book"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:619
+msgid "Create a new address book"
+msgstr "Create a new address book"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../modules/addressbook/e-book-shell-backend.c:595
+#: ../modules/calendar/e-cal-shell-backend.c:758
+#: ../modules/calendar/e-memo-shell-backend.c:582
+#: ../modules/calendar/e-task-shell-backend.c:592
+#, fuzzy
+msgid "Source List"
+msgstr "Source"
+
+#: ../modules/addressbook/e-book-shell-backend.c:596
+#, fuzzy
+msgid "The registry of address books"
+msgstr "Couldn't get list of address books"
+
+#: ../modules/addressbook/e-book-shell-content.c:313
+#, fuzzy
+msgid "Current View"
+msgstr "_Current View"
+
+#: ../modules/addressbook/e-book-shell-content.c:314
+msgid "The currently selected address book view"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-content.c:323
+#, fuzzy
+msgid "Previewed Contact"
+msgstr "New Contact"
+
+#: ../modules/addressbook/e-book-shell-content.c:324
+#, fuzzy
+msgid "The contact being shown in the preview pane"
+msgstr "Whether to show the preview pane."
+
+#: ../modules/addressbook/e-book-shell-content.c:333
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:630
+#: ../modules/mail/e-mail-shell-content.c:697
+#, fuzzy
+msgid "Preview is Visible"
+msgstr "Sidebar is visible"
+
+#: ../modules/addressbook/e-book-shell-content.c:334
+#: ../modules/calendar/e-memo-shell-content.c:608
+#: ../modules/calendar/e-task-shell-content.c:631
+#: ../modules/mail/e-mail-shell-content.c:698
+#, fuzzy
+msgid "Whether the preview pane is visible"
+msgstr "Whether to show the preview pane."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../modules/mail/e-mail-shell-migrate.c:1105
+msgid "Migrating..."
+msgstr "Migrating…"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../modules/mail/e-mail-shell-migrate.c:1178
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrating '%s':"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:645
+msgid "LDAP Servers"
+msgstr "LDAP Servers"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:765
+msgid "Autocompletion Settings"
+msgstr "Autocompletion Settings"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1152
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders…"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1166
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders…"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1175
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders…"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1185
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data…"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:173
+#: ../modules/calendar/e-cal-shell-sidebar.c:561
+#: ../modules/calendar/e-memo-shell-sidebar.c:528
+#: ../modules/calendar/e-task-shell-sidebar.c:526
+#, fuzzy
+msgid "Source Selector Widget"
+msgstr "Memo Source Selector"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:174
+#, fuzzy
+msgid "This widget displays groups of address books"
+msgstr "Couldn't get list of address books"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:596
+msgid "Co_py All Contacts To..."
+msgstr "Co_py All Contacts To…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:598
+#, fuzzy
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Copy the contacts of the selected folder into another folder"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:603
+msgid "Del_ete Address Book"
+msgstr "Del_ete Address Book"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:605
+#, fuzzy
+msgid "Delete the selected address book"
+msgstr "Delete the selected folder"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:610
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ve All Contacts To…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:612
+#, fuzzy
+msgid "Move the contacts of the selected address book to another"
+msgstr "Move the contacts of the selected folder into another folder"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:617
+msgid "_New Address Book"
+msgstr "_New Address Book"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:624
+msgid "Address _Book Properties"
+msgstr "Address _Book Properties"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:626
+#, fuzzy
+msgid "Show properties of the selected address book"
+msgstr "Change the properties of the selected folder"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-task-shell-view-actions.c:756
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
+msgid "_Rename..."
+msgstr "_Rename…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:633
+#, fuzzy
+msgid "Rename the selected address book"
+msgstr "Rename the selected folder"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:638
+#, fuzzy
+msgid "S_ave Address Book as vCard"
+msgstr "S_ave Address Book As vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:640
+#, fuzzy
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Save the contacts of the selected folder as vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:647
+#, fuzzy
+msgid "Stop loading"
+msgstr "Stop Loading"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+msgid "Copy the selection"
+msgstr "Copy the selection"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+msgid "Cut the selection"
+msgstr "Cut the selection"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Paste the clipboard"
+msgstr "Paste the clipboard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#, fuzzy
+msgid "_Copy Contact To..."
+msgstr "_Copy Contact to…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:675
+#, fuzzy
+msgid "Copy selected contacts to another address book"
+msgstr "Copy selected contacts to another folder"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
+msgid "_Delete Contact"
+msgstr "_Delete Contact"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
+msgid "Delete selected contacts"
+msgstr "Delete selected contacts"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
+msgid "_Forward Contact..."
+msgstr "_Forward Contact…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
+msgid "Send selected contacts to another person"
+msgstr "Send selected contacts to another person"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#, fuzzy
+msgid "_Move Contact To..."
+msgstr "_Move Contact to…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#, fuzzy
+msgid "Move selected contacts to another address book"
+msgstr "Move selected contacts to another folder"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
+msgid "_New Contact..."
+msgstr "_New Contact…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
+msgid "New Contact _List..."
+msgstr "New Contact _List…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+msgid "_Open"
+msgstr "_Open"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
+msgid "View the current contact"
+msgstr "View the current contact"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
+#, fuzzy
+msgid "Save selected contacts as a vCard"
+msgstr "Save selected contacts as a vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
+msgid "Select all contacts"
+msgstr "Select all contacts"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
+msgid "_Send Message to Contact..."
+msgstr "_Send Message to Contact…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
+msgid "Send a message to the selected contacts"
+msgstr "Send a message to the selected contacts"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-task-shell-view-actions.c:821
+msgid "_Actions"
+msgstr "_Actions"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:675
+#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
+msgid "_Preview"
+msgstr "_Preview"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:761
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+msgid "_Delete"
+msgstr "_Delete"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:765
+msgid "_Properties"
+msgstr "_Properties"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
+msgid "_Save as vCard..."
+msgstr "_Save as vCard…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
+msgid "Contact _Preview"
+msgstr "Contact _Preview"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:823
+msgid "Show contact preview window"
+msgstr "Show contact preview window"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:1363
+msgid "_Classic View"
+msgstr "_Classic View"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#, fuzzy
+msgid "Show contact preview below the contact list"
+msgstr "Show message preview below the message list"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/mail/e-mail-shell-view-actions.c:1370
+msgid "_Vertical View"
+msgstr "_Vertical View"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#, fuzzy
+msgid "Show contact preview alongside the contact list"
+msgstr "Show contact preview window"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:950
+msgid "Any Category"
+msgstr "Any Category"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-memo-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:985
+msgid "Unmatched"
+msgstr "Unmatched"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+msgid "Print selected contacts"
+msgstr "Print selected contacts"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#, fuzzy
+msgid "Preview the contacts to be printed"
+msgstr "Previews the contacts to be printed"
+
+#: ../modules/addressbook/e-book-shell-view.c:322
+msgid "_Forward Contacts"
+msgstr "_Forward Contacts"
+
+#: ../modules/addressbook/e-book-shell-view.c:324
+msgid "_Forward Contact"
+msgstr "_Forward Contact"
+
+#: ../modules/addressbook/e-book-shell-view.c:355
+#, fuzzy
+msgid "_Send Message to Contacts"
+msgstr "Send _Message to Contacts"
+
+#: ../modules/addressbook/e-book-shell-view.c:357
+#, fuzzy
+msgid "_Send Message to List"
+msgstr "Send _Message to List"
+
+#: ../modules/addressbook/e-book-shell-view.c:359
+#, fuzzy
+msgid "_Send Message to Contact"
+msgstr "Send _Message to Contact"
+
+#: ../modules/addressbook/eab-composer-util.c:139
+msgid "Multiple vCards"
+msgstr "Multiple vCards"
+
+#: ../modules/addressbook/eab-composer-util.c:147
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard for %s"
+
+#: ../modules/addressbook/eab-composer-util.c:159
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information"
+msgstr "Contact information"
+
+#: ../modules/addressbook/eab-composer-util.c:188
+#, c-format
+msgid "Contact information for %s"
+msgstr "Contact information for %s"
+
+#: ../modules/addressbook/ldap-config.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../modules/addressbook/ldap-config.glade.h:2
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
+
+#: ../modules/addressbook/ldap-config.glade.h:5
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.glade.h:6
+msgid "<b>Authentication</b>"
+msgstr "<b>Authentication</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:7
+msgid "<b>Downloading</b>"
+msgstr "<b>Downloading</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:8
+msgid "<b>Searching</b>"
+msgstr "<b>Searching</b>"
+
+#: ../modules/addressbook/ldap-config.glade.h:10
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"Anonymously\n"
+"Using e-mail address\n"
+"Using distinguished name (DN)"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.glade.h:14
+msgid "B_rowse this book until limit reached"
+msgstr "B_rowse this book until limit reached"
+
+#: ../modules/addressbook/ldap-config.glade.h:16
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution will use this e-mail address to authenticate you with the server."
+
+#: ../modules/addressbook/ldap-config.glade.h:18
+msgid "Lo_gin:"
+msgstr "Lo_gin:"
+
+#: ../modules/addressbook/ldap-config.glade.h:19
+msgid ""
+"One\n"
+"Sub"
+msgstr ""
+"One\n"
+"Sub"
+
+#: ../modules/addressbook/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+
+#: ../modules/addressbook/ldap-config.glade.h:24
+msgid "Search Filter"
+msgstr "Search Filter"
+
+#: ../modules/addressbook/ldap-config.glade.h:25
+msgid "Search _base:"
+msgstr "Search _base:"
+
+#: ../modules/addressbook/ldap-config.glade.h:26
+msgid "Search _filter:"
+msgstr "Search _filter:"
+
+#: ../modules/addressbook/ldap-config.glade.h:27
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+
+#: ../modules/addressbook/ldap-config.glade.h:28
+msgid "Supported Search Bases"
+msgstr "Supported Search Bases"
+
+#: ../modules/addressbook/ldap-config.glade.h:29
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+
+#: ../modules/addressbook/ldap-config.glade.h:30
+msgid ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+
+#: ../modules/addressbook/ldap-config.glade.h:31
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+
+#: ../modules/addressbook/ldap-config.glade.h:32
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+
+#: ../modules/addressbook/ldap-config.glade.h:33
+msgid "_Download limit:"
+msgstr "_Download limit:"
+
+#: ../modules/addressbook/ldap-config.glade.h:34
+msgid "_Find Possible Search Bases"
+msgstr "_Find Possible Search Bases"
+
+#: ../modules/addressbook/ldap-config.glade.h:35
+msgid "_Login method:"
+msgstr "_Login method:"
+
+#: ../modules/addressbook/ldap-config.glade.h:37
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../modules/addressbook/ldap-config.glade.h:38
+msgid "_Search scope:"
+msgstr "_Search scope:"
+
+#: ../modules/addressbook/ldap-config.glade.h:40
+msgid "_Timeout:"
+msgstr "_Timeout:"
+
+#: ../modules/addressbook/ldap-config.glade.h:41
+msgid "_Use secure connection:"
+msgstr "_Use secure connection:"
+
+#: ../modules/addressbook/ldap-config.glade.h:42
+msgid "cards"
+msgstr "cards"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "I_mport"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "Select a Calendar"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "Select a Task List"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "I_mport to Calendar"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "I_mport to Tasks"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "On The Web"
+
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "Weather"
+
+#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "Birthdays & Anniversaries"
+
+#: ../modules/calendar/e-cal-shell-backend.c:424
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Appointment"
+
+#: ../modules/calendar/e-cal-shell-backend.c:426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+msgid "Create a new appointment"
+msgstr "Create a new appointment"
+
+#: ../modules/calendar/e-cal-shell-backend.c:431
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "All Day A_ppointment"
+
+#: ../modules/calendar/e-cal-shell-backend.c:433
+msgid "Create a new all-day appointment"
+msgstr "Create a new all-day appointment"
+
+#: ../modules/calendar/e-cal-shell-backend.c:438
+msgctxt "New"
+msgid "M_eeting"
+msgstr "M_eeting"
+
+#: ../modules/calendar/e-cal-shell-backend.c:440
+msgid "Create a new meeting request"
+msgstr "Create a new meeting request"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Cale_ndar"
+
+#: ../modules/calendar/e-cal-shell-backend.c:450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+msgid "Create a new calendar"
+msgstr "Create a new calendar"
+
+#: ../modules/calendar/e-cal-shell-backend.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:2558
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: ../modules/calendar/e-cal-shell-backend.c:759
+#, fuzzy
+msgid "The registry of calendars"
+msgstr "Primary calendar"
+
+#: ../modules/calendar/e-cal-shell-migrate.c:131
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders…"
+
+#. FIXME: set proper domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:664
+#: ../modules/calendar/e-task-shell-migrate.c:591
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr "Unable to migrate old settings from evolution/config.xmldb"
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:693
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Unable to migrate calendar `%s'"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:152
+#: ../modules/calendar/e-memo-shell-sidebar.c:149
+#: ../modules/calendar/e-task-shell-sidebar.c:147
+#, fuzzy, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Error on %s:\n"
+" %s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:188
+#, fuzzy
+msgid "Loading calendars"
+msgstr "Loading Calendar"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:428
+#, fuzzy
+msgid "Calendar Selector"
+msgstr "Calendar Source Selector"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:551
+msgid "Date Navigator Widget"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:552
+msgid "This widget displays a miniature calendar"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:562
+msgid "This widget displays groups of calendars"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:723
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Opening calendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:214
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "Print"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:304
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:321
+msgid "Purge events older than"
+msgstr "Purge events older than"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:334
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../widgets/misc/e-send-options.glade.h:39
+msgid "days"
+msgstr "days"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:551
+#, fuzzy
+msgid "Copying Items"
+msgstr "Copying items"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:801
+#, fuzzy
+msgid "Moving Items"
+msgstr "Moving items"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1091
+msgid "Save As..."
+msgstr "Save As…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1173
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+msgid "_Copy..."
+msgstr "_Copy…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1189
+#, fuzzy
+msgid "Go Back"
+msgstr "Go back"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1196
+#, fuzzy
+msgid "Go Forward"
+msgstr "Go forward"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1201
+msgid "Select _Today"
+msgstr "Select _Today"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1203
+msgid "Select today"
+msgstr "Select today"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1208
+msgid "Select _Date"
+msgstr "Select _Date"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+msgid "Select a specific date"
+msgstr "Select a specific date"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+msgid "_New Calendar"
+msgstr "_New Calendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../modules/calendar/e-task-shell-view-actions.c:805
+msgid "Purg_e"
+msgstr "Purg_e"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
+msgid "Purge old appointments and meetings"
+msgstr "Purge old appointments and meetings"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
+#, fuzzy
+msgid "Rename the selected calendar"
+msgstr "Rename the selected folder"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+#, fuzzy
+msgid "Show _Only This Calendar"
+msgstr "Show _only this Calendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+msgid "Cop_y to Calendar..."
+msgstr "Cop_y to Calendar…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "_Delegate Meeting..."
+msgstr "_Delegate Meeting…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+msgid "Delete the appointment"
+msgstr "Delete the appointment"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#, fuzzy
+msgid "Delete This _Occurrence"
+msgstr "Delete this _Occurrence"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Delete this occurrence"
+msgstr "Delete this occurrence"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+msgid "Delete _All Occurrences"
+msgstr "Delete _All Occurrences"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+msgid "Delete all occurrences"
+msgstr "Delete all occurrences"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#, fuzzy
+msgid "New All Day _Event..."
+msgstr "New All Day _Event"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+#, fuzzy
+msgid "Create a new all day event"
+msgstr "Create a new all-day appointment"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-memopad.c:301
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:375
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "_Forward as iCalendar..."
+msgstr "_Forward as iCalendar…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#, fuzzy
+msgid "New _Meeting..."
+msgstr "New _Meeting"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#, fuzzy
+msgid "Create a new meeting"
+msgstr "Create a new meeting request"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ve to Calendar…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+msgid "New _Appointment..."
+msgstr "New _Appointment…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+msgid "Make this Occurrence _Movable"
+msgstr "Make this Occurrence _Movable"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+msgid "_Open Appointment"
+msgstr "_Open Appointment"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+msgid "View the current appointment"
+msgstr "View the current appointment"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+msgid "_Reply"
+msgstr "_Reply"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+msgid "_Schedule Meeting..."
+msgstr "_Schedule Meeting…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+msgid "Day"
+msgstr "Day"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+msgid "Show one day"
+msgstr "Show one day"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+msgid "List"
+msgstr "List"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+msgid "Show as list"
+msgstr "Show as list"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+msgid "Month"
+msgstr "Month"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+msgid "Show one month"
+msgstr "Show one month"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+msgid "Week"
+msgstr "Week"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1527
+msgid "Show one week"
+msgstr "Show one week"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+msgid "Work Week"
+msgstr "Work Week"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#, fuzzy
+msgid "Show one work week"
+msgstr "Show one week"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
+#, fuzzy
+msgid "Active Appointements"
+msgstr "Active Appointments"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+msgid "Next 7 Days' Appointments"
+msgstr "Next 7 Days' Appointments"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
+msgid "Description contains"
+msgstr "Description contains"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-memo-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:1009
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1599
+msgid "Print this calendar"
+msgstr "Print this calendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1606
+#, fuzzy
+msgid "Preview the calendar to be printed"
+msgstr "Previews the calendar to be printed"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+msgid "Go To"
+msgstr "Go To"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:76
+#: ../modules/calendar/e-memo-shell-view-actions.c:96
+#, fuzzy
+msgid "Deleting selected memos..."
+msgstr "Deleting selected objects…"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Sender contains"
-msgstr "Subject or Sender contains"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
+msgid "Copy selected memo"
+msgstr "Copy selected memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:282
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+msgid "Cut selected memo"
+msgstr "Cut selected memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:289
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "Paste memo from the clipboard"
+msgstr "Paste memo from the clipboard"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#, fuzzy
+msgid "_Delete Memo"
+msgstr "_Delete Message"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "Delete selected memos"
+msgstr "Delete selected memos"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:308
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#, fuzzy
+msgid "New _Memo"
+msgstr "New memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:310
+#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+msgid "Create a new memo"
+msgstr "Create a new memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:315
+#: ../modules/calendar/e-memo-shell-view-actions.c:652
+msgid "_Open Memo"
+msgstr "_Open Memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+msgid "View the selected memo"
+msgstr "View the selected memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:322
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:798
+msgid "Open _Web Page"
+msgstr "Open _Web Page"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:341
+#: ../modules/calendar/e-memo-shell-view-actions.c:835
+#, fuzzy
+msgid "Print the selected memo"
+msgstr "View the selected memo"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:423
+#: ../modules/calendar/e-memo-shell-view.c:223
+#, fuzzy
+msgid "Delete Memo"
+msgid_plural "Delete Memos"
+msgstr[0] "Delegate To"
+msgstr[1] "Delegate To"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
+#: ../modules/calendar/e-task-shell-view-actions.c:127
+#, fuzzy
+msgid "Deleting selected tasks..."
+msgstr "Deleting selected objects…"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-view-actions.c:686
+msgid "_Assign Task"
+msgstr "_Assign Task"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
+#: ../modules/calendar/e-task-shell-view-actions.c:695
+msgid "Copy selected tasks"
+msgstr "Copy selected tasks"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:702
+msgid "Cut selected tasks"
+msgstr "Cut selected tasks"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:709
+msgid "Paste tasks from the clipboard"
+msgstr "Paste tasks from the clipboard"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:714
+#, fuzzy
+msgid "_Delete Task"
+msgstr "_Delete all"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../modules/calendar/e-task-shell-view-actions.c:716
+msgid "Delete selected tasks"
+msgstr "Delete selected tasks"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-task-shell-view-actions.c:770
+msgid "_Mark as Complete"
+msgstr "_Mark as Complete"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:772
+msgid "Mark selected tasks as complete"
+msgstr "Mark selected tasks as complete"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
+#, fuzzy
+msgid "_Mar_k as Incomplete"
+msgstr "_Mark as Incomplete"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
+#: ../modules/calendar/e-task-shell-view-actions.c:779
+#, fuzzy
+msgid "Mark selected tasks as incomplete"
+msgstr "Mark selected tasks as complete"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
+#: ../modules/calendar/e-task-shell-view-actions.c:784
+msgid "New _Task"
+msgstr "New _Task"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:398
+#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-view-actions.c:786
+msgid "Create a new task"
+msgstr "Create a new task"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
+#: ../modules/calendar/e-task-shell-view-actions.c:791
+msgid "_Open Task"
+msgstr "_Open Task"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:793
+msgid "View the selected task"
+msgstr "View the selected task"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-task-shell-view-actions.c:812
+#, fuzzy
+msgid "_Save as iCalendar..."
+msgstr "_Forward as iCalendar…"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:429
+#: ../modules/calendar/e-task-shell-view-actions.c:1035
+#, fuzzy
+msgid "Print the selected task"
+msgstr "View the selected task"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:534
+#: ../modules/calendar/e-task-shell-view.c:350
+#, fuzzy
+msgid "Delete Task"
+msgid_plural "Delete Tasks"
+msgstr[0] "Delegate To"
+msgstr[1] "Delegate To"
+
+#: ../modules/calendar/e-memo-shell-backend.c:316
+msgctxt "New"
+msgid "Mem_o"
+msgstr "Mem_o"
+
+#: ../modules/calendar/e-memo-shell-backend.c:323
+#, fuzzy
+msgid "_Shared Memo"
+msgstr "_Shared memo"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+#, fuzzy
+msgid "Create a new shared memo"
+msgstr "Create a shared new memo"
+
+#: ../modules/calendar/e-memo-shell-backend.c:333
+#, fuzzy
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Memo List"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+msgid "Create a new memo list"
+msgstr "Create a new memo list"
+
+#: ../modules/calendar/e-memo-shell-backend.c:583
+#, fuzzy
+msgid "The registry of memo lists"
+msgstr "Primary memo list"
+
+#: ../modules/calendar/e-memo-shell-content.c:598
+#, fuzzy
+msgid "The memo table model"
+msgstr "Table model"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:185
+msgid "Loading memos"
+msgstr "Loading memos"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:399
+#, fuzzy
+msgid "Memo List Selector"
+msgstr "Memo Source Selector"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:529
+msgid "This widget displays groups of memo lists"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Opening memos at %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:270
+msgid "Print Memos"
+msgstr "Print Memos"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
+msgid "_New Memo List"
+msgstr "_New Memo List"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#, fuzzy
+msgid "Rename the selected memo list"
+msgstr "Rename the selected folder"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#, fuzzy
+msgid "Show _Only This Memo List"
+msgstr "Show _only this Memo List"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#, fuzzy
+msgid "Memo _Preview"
+msgstr "_Preview"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#, fuzzy
+msgid "Show memo preview pane"
+msgstr "Show preview pane"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:763
+#, fuzzy
+msgid "Show memo preview below the memo list"
+msgstr "Show message preview below the message list"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:770
+#, fuzzy
+msgid "Show memo preview alongside the memo list"
+msgstr "Show message preview below the message list"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+msgid "Print the list of memos"
+msgstr "Print the list of memos"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#, fuzzy
+msgid "Preview the list of memos to be printed"
+msgstr "Previews the list of memos to be printed"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:412
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d memo"
+msgstr[1] "%d memos"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-task-shell-view-private.c:510
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr ", %d selected"
+
+#: ../modules/calendar/e-memo-shell-view.c:221
+#, fuzzy
+msgid "Delete Memos"
+msgstr "_Delete Message"
+
+#: ../modules/calendar/e-task-shell-backend.c:320
+msgctxt "New"
+msgid "_Task"
+msgstr "_Task"
+
+#: ../modules/calendar/e-task-shell-backend.c:327
+#, fuzzy
+msgid "Assigne_d Task"
+msgstr "Assigne_d Task"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgid "Create a new assigned task"
+msgstr "Create a new assigned task"
+
+#: ../modules/calendar/e-task-shell-backend.c:337
+#, fuzzy
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Task List"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+msgid "Create a new task list"
+msgstr "Create a new task list"
+
+#: ../modules/calendar/e-task-shell-backend.c:593
+#, fuzzy
+msgid "The registry of task lists"
+msgstr "Primary task list"
+
+#: ../modules/calendar/e-task-shell-content.c:621
+#, fuzzy
+msgid "The task table model"
+msgstr "Table model"
+
+#: ../modules/calendar/e-task-shell-migrate.c:98
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders…"
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-task-shell-migrate.c:620
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Unable to migrate tasks `%s'"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:183
+msgid "Loading tasks"
+msgstr "Loading tasks"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:397
+#, fuzzy
+msgid "Task List Selector"
+msgstr "Task Source Selector"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:527
+msgid "This widget displays groups of task lists"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-sidebar.c:680
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Opening tasks at %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:301
+msgid "Print Tasks"
+msgstr "Print Tasks"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:570
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:728
+#, fuzzy
+msgid "Copy..."
+msgstr "_Copy…"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:742
+msgid "_New Task List"
+msgstr "_New Task List"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:758
+#, fuzzy
+msgid "Rename the selected task list"
+msgstr "Rename the selected folder"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:763
+#, fuzzy
+msgid "Show _Only This Task List"
+msgstr "Show _only this Task List"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:777
+#, fuzzy
+msgid "Mar_k as Incomplete"
+msgstr "_Mark as Incomplete"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:807
+msgid "Delete completed tasks"
+msgstr "Delete completed tasks"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:905
+msgid "Task _Preview"
+msgstr "Task _Preview"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:907
+#, fuzzy
+msgid "Show task preview pane"
+msgstr "Show preview pane"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:928
+#, fuzzy
+msgid "Show task preview below the task list"
+msgstr "Show message preview below the message list"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:935
+#, fuzzy
+msgid "Show task preview alongside the task list"
+msgstr "Show message preview below the message list"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:943
+msgid "Active Tasks"
+msgstr "Active Tasks"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+msgid "Completed Tasks"
+msgstr "Completed Tasks"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:964
+msgid "Next 7 Days' Tasks"
+msgstr "Next 7 Days' Tasks"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+msgid "Overdue Tasks"
+msgstr "Overdue Tasks"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:978
+msgid "Tasks with Attachments"
+msgstr "Tasks with Attachments"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
+msgid "Print the list of tasks"
+msgstr "Print the list of tasks"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
+#, fuzzy
+msgid "Preview the list of tasks to be printed"
+msgstr "Previews the list of tasks to be printed"
+
+#: ../modules/calendar/e-task-shell-view-private.c:506
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d task"
+msgstr[1] "%d tasks"
+
+#: ../modules/calendar/e-task-shell-view.c:348
+#, fuzzy
+msgid "Delete Tasks"
+msgstr "Completed Tasks"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d attached messages"
+
+#: ../modules/mail/e-mail-shell-backend.c:174
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Mail Message"
+
+#: ../modules/mail/e-mail-shell-backend.c:176
+msgid "Compose a new mail message"
+msgstr "Compose a new mail message"
+
+#: ../modules/mail/e-mail-shell-backend.c:184
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "Mail _Folder"
+
+#: ../modules/mail/e-mail-shell-backend.c:186
+msgid "Create a new mail folder"
+msgstr "Create a new mail folder"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: ../modules/mail/e-mail-shell-backend.c:221
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
+
+#: ../modules/mail/e-mail-shell-backend.c:229
+msgid "Network Preferences"
+msgstr "Network Preferences"
+
+#. green
+#: ../modules/mail/e-mail-shell-migrate.c:958
+msgid "To Do"
+msgstr "To Do"
+
+#. blue
+#: ../modules/mail/e-mail-shell-migrate.c:959
+msgid "Later"
+msgstr "Later"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1138
+msgid "Migration"
+msgstr "Migration"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1588
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Unable to create new folder `%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1616
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Unable to copy folder `%s' to `%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1811
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Unable to scan for existing mailboxes at `%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1817
+#: ../modules/mail/e-mail-shell-migrate.c:2914
+msgid "Migrating Folders"
+msgstr "Migrating Folders"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1818
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders…"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2021
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Unable to open old POP keep-on-server data `%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2037
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2069
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2540
+#: ../modules/mail/e-mail-shell-migrate.c:2554
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Failed to create local mail storage `%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2915
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders…"
+
+#: ../modules/mail/e-mail-shell-migrate.c:3012
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Unable to create local mail folders at `%s': %s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:3030
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1035
+#: ../modules/mail/e-mail-shell-view.c:418
+#, fuzzy
+msgid "_Disable Account"
+msgstr "Disable Account"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
+#, fuzzy
+msgid "Disable this account"
+msgstr "Disable Account"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "C_reate Search Folder From Search..."
+msgstr "C_reate Search Folder From Search…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
+msgid "_Download Messages for Offline Usage"
+msgstr "_Download Messages for Offline Usage"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1051
+#, fuzzy
+msgid "Download messages of accounts and folders marked for offline"
+msgstr "Download messages of accounts/folders marked for offline"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
+msgid "Empty _Trash"
+msgstr "Empty Wastebaske_t"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1058
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "Permanently remove all deleted messages from all folders"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1063
+msgid "Fl_ush Outbox"
+msgstr "Fl_ush Outbox"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
+msgid "_Copy Folder To..."
+msgstr "_Copy Folder To…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1072
+msgid "Copy the selected folder into another folder"
+msgstr "Copy the selected folder into another folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1079
+msgid "Permanently remove this folder"
+msgstr "Permanently remove this folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1084
+msgid "E_xpunge"
+msgstr "E_xpunge"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1086
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Permanently remove all deleted messages from this folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
+msgid "Mar_k All Messages as Read"
+msgstr "Mar_k All Messages as Read"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Mark all messages in the folder as read"
+msgstr "Mark all messages in the folder as read"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
+msgid "_Move Folder To..."
+msgstr "_Move Folder To…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1100
+msgid "Move the selected folder into another folder"
+msgstr "Move the selected folder into another folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
+msgid "_New..."
+msgstr "_New…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
+msgid "Create a new folder for storing mail"
+msgstr "Create a new folder for storing mail"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
+msgid "Change the properties of this folder"
+msgstr "Change the properties of this folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
+msgid "Refresh the folder"
+msgstr "Refresh the folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
+msgid "Change the name of this folder"
+msgstr "Change the name of this folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
+msgid "Select _All Messages"
+msgstr "Select _All Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
+msgid "Select all visible messages"
+msgstr "Select all visible messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
+msgid "Select Message _Thread"
+msgstr "Select Message _Thread"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Select all messages in the same thread as the selected message"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+msgid "Select Message S_ubthread"
+msgstr "Select Message S_ubthread"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
+msgid "Select all replies to the currently selected message"
+msgstr "Select all replies to the currently selected message"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#, fuzzy
+msgid "Unsubscribe from the selected folder"
+msgstr "Rename the selected folder"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "_New Label"
+msgstr "_New Label"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#, fuzzy
+msgid "N_one"
+msgstr "None"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
+msgid "Hide _Read Messages"
+msgstr "Hide _Read Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Temporarily hide all messages that have already been read"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
+msgid "Hide S_elected Messages"
+msgstr "Hide S_elected Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
+msgid "Temporarily hide the selected messages"
+msgstr "Temporarily hide the selected messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
+msgid "Show Hidde_n Messages"
+msgstr "Show Hidde_n Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
+msgid "Show messages that have been temporarily hidden"
+msgstr "Show messages that have been temporarily hidden"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Cancel the current mail operation"
+msgstr "Cancel the current mail operation"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
+msgid "Collapse All _Threads"
+msgstr "Collapse All _Threads"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
+msgid "Collapse all message threads"
+msgstr "Collapse all message threads"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+msgid "E_xpand All Threads"
+msgstr "E_xpand All Threads"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
+msgid "Expand all message threads"
+msgstr "Expand all message threads"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
+msgid "_Message Filters"
+msgstr "_Message Filters"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
+msgid "Create or edit rules for filtering new mail"
+msgstr "Create or edit rules for filtering new mail"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
+msgid "Search F_olders"
+msgstr "Search F_olders"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "Create or edit Search Folder definitions"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
+msgid "_Subscriptions..."
+msgstr "_Subscriptions…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Subscribe or unsubscribe to folders on remote servers"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
+msgid "F_older"
+msgstr "F_older"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
+msgid "_Label"
+msgstr "_Label"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
+msgid "_New Folder..."
+msgstr "_New Folder…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
+msgid "Hide _Deleted Messages"
+msgstr "Hide _Deleted Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Hide deleted messages rather than displaying them with a line through them"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
+msgid "Show Message _Preview"
+msgstr "Show Message _Preview"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#, fuzzy
+msgid "Show message preview pane"
+msgstr "Show message preview window"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1342
+msgid "_Group By Threads"
+msgstr "_Group By Threads"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#, fuzzy
+msgid "Threaded message list"
+msgstr "Threaded Message list"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1365
+msgid "Show message preview below the message list"
+msgstr "Show message preview below the message list"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#, fuzzy
+msgid "Show message preview alongside the message list"
+msgstr "Show message preview below the message list"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
+msgid "All Messages"
+msgstr "All Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
+msgid "Important Messages"
+msgstr "Important Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
+msgid "Last 5 Days' Messages"
+msgstr "Last 5 Days' Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
+msgid "Messages Not Junk"
+msgstr "Messages Not Junk"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
+msgid "Messages with Attachments"
+msgstr "Messages with Attachments"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
+msgid "No Label"
+msgstr "No Label"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
+msgid "Read Messages"
+msgstr "Read Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
+msgid "Recent Messages"
+msgstr "Recent Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
+msgid "Unread Messages"
+msgstr "Unread Messages"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#, fuzzy
+msgid "Subject or Addresses contain"
+msgstr "Subject or Addresses contains"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
+msgid "All Accounts"
+msgstr "All Accounts"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
+msgid "Current Account"
+msgstr "Current Account"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
+msgid "Current Folder"
+msgstr "Current Folder"
+
+#: ../modules/mail/e-mail-shell-view-private.c:691
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d selected, "
+msgstr[1] "%d selected, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:702
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d deleted"
+msgstr[1] "%d deleted"
+
+#: ../modules/mail/e-mail-shell-view-private.c:708
+#: ../modules/mail/e-mail-shell-view-private.c:715
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d junk"
+msgstr[1] "%d junk"
+
+#: ../modules/mail/e-mail-shell-view-private.c:721
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d draft"
+msgstr[1] "%d drafts"
+
+#: ../modules/mail/e-mail-shell-view-private.c:727
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d unsent"
+msgstr[1] "%d unsent"
+
+#: ../modules/mail/e-mail-shell-view-private.c:733
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d sent"
+msgstr[1] "%d sent"
+
+#: ../modules/mail/e-mail-shell-view-private.c:745
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d unread, "
+msgstr[1] "%d unread, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:748
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
+
+#: ../modules/mail/e-mail-shell-view.c:416
+msgid "Proxy _Logout"
+msgstr "Proxy _Logout"
+
+#: ../modules/mail/em-composer-prefs.c:478
+msgid "Language(s)"
+msgstr "Language(s)"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "Every time"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "Once per day"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "Once per week"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "Once per month"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "Add Custom Junk Header"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "Header Name:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+msgid "Header Value Contains:"
+msgstr "Header Value Contains:"
+
+#: ../modules/mail/em-mailer-prefs.c:326
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Header"
+
+#: ../modules/mail/em-mailer-prefs.c:330
+msgid "Contains Value"
+msgstr "Contains Value"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:777
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s plugin is available and the binary is installed."
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:786
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+"%s plugin is not available. Please check whether the package is installed."
+
+#: ../modules/mail/em-mailer-prefs.c:752
+msgid "No Junk plugin available"
+msgstr "No Junk plugin available"
+
+#: ../modules/mail/em-mailer-prefs.c:1140
+msgid "Date header:"
+msgstr "Date header:"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python Plugin Loader tests"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python Test Plugin"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Test Plugin for Python EPlugin loader."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Local Address Books"
+msgid "Add local address books to Evolution."
+msgstr "Add local address books to Evolution."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Provides core functionality for local address books."
+msgid "Local Address Books"
+msgstr "Local Address Books"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16220,24 +15956,16 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:378
 msgid "Keywords"
 msgstr "Keywords"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
 msgstr "Attachment Reminder"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
@@ -16250,173 +15978,198 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Message has no attachments"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_Add attachment…"
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Edit Message"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "Reminds you when you forgot to add an attachment to a mail message."
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
+#, fuzzy
+msgid "Inline Audio"
+msgstr "Inline"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Audio inline plugin"
+#, fuzzy
+msgid "Play audio attachments directly in mail messages."
+msgstr "Play audio attachments directly from Evolution."
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:143
 msgid "Select name of the Evolution backup file"
 msgstr "Select name of the Evolution backup file"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:168
 msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:198
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Select name of the Evolution backup file to restore"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after restore"
 msgstr "_Restart Evolution after restore"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "Restore from backup"
-
-#: ../plugins/backup-restore/backup-restore.c:289
+#: ../plugins/backup-restore/backup-restore.c:293
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:300
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restore Evolution from the backup file"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Please select an Evolution Archive to restore:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:310
 msgid "Choose a file to restore"
 msgstr "Choose a file to restore"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup-restore.c:318
+msgid "Restore from backup"
+msgstr "Restore from backup"
+
+#: ../plugins/backup-restore/backup-restore.c:354
+msgid "_Backup Settings..."
+msgstr "_Backup Settings…"
+
+#: ../plugins/backup-restore/backup-restore.c:356
+#, fuzzy
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "Backup and restore Evolution data and settings"
+
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "R_estore Settings..."
+msgstr "R_estore Settings…"
+
+#: ../plugins/backup-restore/backup-restore.c:363
+#, fuzzy
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Backup and restore Evolution data and settings"
+
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Backup Evolution directory"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Restore Evolution directory"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "Check Evolution Backup"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "Restart Evolution"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "With Graphical User Interface"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Shutting down Evolution"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "Backing Evolution accounts and settings"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Backup complete"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Restarting Evolution"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "Backup current Evolution data"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Extracting files from backup"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "Loading Evolution settings"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "Removing temporary backup files"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Ensuring local sources"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Backing up to the folder %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restoring from the folder %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution Backup"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Please wait while Evolution backs up your data."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "This may take a while depending on the amount of data in your account."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "A plugin for backing up and restore Evolution data and settings."
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and Restore"
+msgstr "Backup and Restore"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "Backup and restore plugin"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "Backup and restore your Evolution data and settings."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16470,86 +16223,78 @@ msgstr ""
 "you proceed. If you want Evolution to restart automatically restart after "
 "restore, please enable the toggle button."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "Backup and restore Evolution data and settings"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "R_estore Settings..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "_Backup Settings..."
-
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "_Auto-create address book entries when replying to messages"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
+msgstr "Create _address book entries when sending mails"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Synchronise contact info and images from Pidgin buddy list"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"Automatically fills your address book with names and e-mail addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Error occurred while spawning %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr "Bogofilter child process does not respond, killing..."
+msgstr "Bogofilter child process does not respond, killing…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "Wait for Bogofilter child process interrupted, terminating…"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Pipe to Bogofilter failed, error code: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "Convert message text to _Unicode"
 
@@ -16566,146 +16311,170 @@ msgstr ""
 "different character sets."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter Options"
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter Junk Filter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter junk plugin"
+msgid "Bogofilter Options"
+msgstr "Bogofilter Options"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
-msgstr "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
+msgstr "Filter junk messages using Bogofilter."
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:609
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Use _SSL"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:633
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:499
+#: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:717
 msgid "Re_fresh:"
 msgstr "Re_fresh:"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:517
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:742
+msgid "weeks"
+msgstr "weeks"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV Calendar sources"
+msgid "Add CalDAV support to Evolution."
+msgstr "Add CalDAV support to Evolution."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV sources"
+msgid "CalDAV Support"
+msgstr "CalDAV Support"
+
+#: ../plugins/calendar-file/calendar-file.c:208
+msgid "_Customize options"
+msgstr "_Customise options"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+msgid "File _name:"
+msgstr "File _name:"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+msgid "Choose calendar file"
+msgstr "Choose calendar file"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+msgid "On open"
+msgstr "On open"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr "On file change"
+
+#: ../plugins/calendar-file/calendar-file.c:281
+msgid "Periodically"
+msgstr "Periodically"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr "Force read _only"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Local Calendars"
+msgid "Add local calendars to Evolution."
+msgstr "Add local calendars to Evolution."
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "Provides core functionality for local calendars."
+msgid "Local Calendars"
+msgstr "Local Calendars"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "_Secure connection"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "Userna_me:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP Calendars"
+msgid "Add web calendars to Evolution."
+msgstr "Add web calendars to Evolution."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Provides core functionality for webcal and http calendars."
+msgid "Web Calendars"
+msgstr "Web Calendars"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "Weather: Fog"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "Weather: Cloudy"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "Weather: Cloudy Night"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "Weather: Overcast"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "Weather: Showers"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "Weather: Snow"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "Weather: Sunny"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "Weather: Clear Night"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "Select a location"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:597
 msgid "_Units:"
 msgstr "_Units:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:604
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metric (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:605
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, inches, etc)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Provides core functionality for weather calendars."
+msgid "Add weather calendars to Evolution."
+msgstr "Add weather calendars to Evolution."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Weather Calendars"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"A test plugin which demonstrates a context menu plugin which lets you copy "
-"things to the clipboard."
-
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "Copy tool"
-
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Check whether Evolution is the default mailer"
@@ -16717,35 +16486,30 @@ msgstr ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "Check whether Evolution is the default mail client on startup."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
-msgstr "Default Mail Client "
+msgid "Default Mail Client"
+msgstr "Default Mail Client"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Do you want to make Evolution your default e-mail client?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "Mark as _default address book"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "Mark as _default calendar"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "Mark as _default task list"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "Mark as _default memo list"
 
@@ -16754,43 +16518,53 @@ msgid "Default Sources"
 msgstr "Default Sources"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr "Mark your preferred address book and calendar as default."
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "List of Custom Headers"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:332
 msgid "Security:"
 msgstr "Security:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Protected"
 msgstr "Protected"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Secret"
 msgstr "Secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Top secret"
 msgstr "Top secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:583
 msgid "_Custom Header"
 msgstr "_Custom Header"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/email-custom-header/email-custom-header.c:905
 msgid "Key"
 msgstr "Key"
 
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:916
+#: ../plugins/templates/templates.c:384
 msgid "Values"
 msgstr "Values"
 
@@ -16803,32 +16577,18 @@ msgstr ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "E-mail Custom Header"
-
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
-msgstr "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
+msgstr "Add custom headers to outgoing mail messages."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
 msgstr "Custom Header"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "List of Custom Headers"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr "E-mail Custom Header"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16872,11 +16632,11 @@ msgstr ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Out Of Office"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16884,90 +16644,93 @@ msgstr ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "I am out of the office"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "I am in the office"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "Change the password for Exchange account"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Change Password"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Manage the delegate settings for Exchange account"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "Delegation Assistant"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Miscelleneous"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "View the size of all Exchange folders"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "Folders Size"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange Settings"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "A_uthenticate"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "S_pecify the mailbox name"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "Mailbox name is _different than user name"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "_Mailbox:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "_Authentication Type"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "Ch_eck for Supported Types"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Size:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -17008,38 +16771,35 @@ msgstr "New Password:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Your current password has expired. Please change your password now."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Your password will expire in the next %d days"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Custom"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "Editor (read, create, edit)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "Author (read, create)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "Reviewer (read-only)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "Delegate Permissions"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permissions for %s"
@@ -17047,7 +16807,7 @@ msgstr "Permissions for %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -17057,84 +16817,96 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "You have been given the following permissions on my folders:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "You are also permitted to see my private items."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "However you are not permitted to see my private items."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "You have been designated as a delegate for %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Delegate To"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Remove the delegate %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Could not access Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Could not find self in Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Could not find delegate %s in Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Could not remove delegate %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Could not update list of delegates."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Could not add delegate %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "Error reading delegates list."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "C_alendar:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "Co_ntacts:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "Delegates"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "Permissions for"
 
@@ -17161,13 +16933,14 @@ msgstr "_Summarise permissions"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
 #: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
-msgstr "Permissions..."
+msgstr "Permissions…"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
@@ -17178,11 +16951,11 @@ msgid "Folder Size"
 msgstr "Folder Size"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "User"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Subscribe to Other User's Folder"
@@ -17191,20 +16964,20 @@ msgstr "Subscribe to Other User's Folder"
 msgid "Exchange Folder Tree"
 msgstr "Exchange Folder Tree"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
-msgstr "Unsubscribe Folder..."
+msgstr "Unsubscribe Folder…"
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Really unsubscribe from folder \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Unsubscribe from \"%s\""
@@ -17259,28 +17032,28 @@ msgstr "Yes, Change Status"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
-msgstr "Password Expiry Warning..."
+msgstr "Password Expiry Warning…"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "Your password will expire in 7 days..."
+msgstr "Your password will expire in 7 days…"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
 msgstr "_Change Password"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Permission denied.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Add User:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Add User"
 
@@ -17350,7 +17123,7 @@ msgstr "<b>Tracking Options</b>"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:3
 msgid "Exchange - Send Options"
-msgstr "Exchange - Send Options"
+msgstr "Exchange — Send Options"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:4
 msgid "I_mportance: "
@@ -17398,13 +17171,13 @@ msgstr "_Sensitivity: "
 msgid "_User"
 msgstr "_User"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:131
 msgid "Select User"
 msgstr "Select User"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:169
 msgid "Address Book..."
-msgstr "Address Book..."
+msgstr "Address Book…"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
@@ -17415,12 +17188,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Subscribe to Other User's Calendar"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr ""
-"A plugin that manages a collection of Exchange account-specific operations "
-"and features."
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "Activates the Evolution-Exchange extension package."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17565,7 +17334,6 @@ msgid "Folder offline"
 msgstr "Folder offline"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Generic error"
 
@@ -17685,7 +17453,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Unknown error looking up {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:843
 msgid "Unknown error."
 msgstr "Unknown error."
 
@@ -17770,35 +17540,56 @@ msgid "Check folder permissions"
 msgstr "Check folder permissions"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "Automatically launch editor when key is pressed in the mail composer"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:119
+msgid "Automatically launch when a new mail is edited"
+msgstr "Automatically launch when a new mail is edited"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "Default External Editor"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "The default command that must be used as the editor."
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "Command to be executed to launch the editor: "
+
+#: ../plugins/external-editor/external-editor.c:109
 msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
 msgstr ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
 
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#: ../plugins/external-editor/external-editor.c:353
+#: ../plugins/external-editor/external-editor.c:355
+msgid "Compose in External Editor"
+msgstr "Compose in External Editor"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "External Editor"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Use an external editor to compose plain-text mail messages."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "Cannot create Temporary File"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "Editor not launchable"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -17806,7 +17597,19 @@ msgstr ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "External editor still running"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -17814,71 +17617,48 @@ msgstr ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "Compose in _External Editor"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "Compose messages using an external editor"
-
-#: ../plugins/external-editor/external-editor.c:114
-msgid "Command to be executed to launch the editor: "
-msgstr "Command to be executed to launch the editor: "
-
-#: ../plugins/external-editor/external-editor.c:115
-msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
-msgstr ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
-
-#: ../plugins/face/face.c:59
+#: ../plugins/face/face.c:58
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Select a (48*48) png of size < 700bytes"
 
-#: ../plugins/face/face.c:69
+#: ../plugins/face/face.c:68
 msgid "PNG files"
 msgstr "PNG files"
 
-#: ../plugins/face/face.c:126
+#: ../plugins/face/face.c:125
 msgid "_Face"
 msgstr "_Face"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
-
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Unsubscribing from folder \"%s\""
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "Allows unsubscribing of mail folders in the side bar context menu."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe Folders"
-msgstr "Unsubscribe Folders"
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+msgid "<b>Server</b>"
+msgstr "<b>Server</b>"
 
-#: ../plugins/google-account-setup/google-source.c:422
+#: ../plugins/google-account-setup/google-source.c:517
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Enter password for user %s to access list of subscribed calendars."
 
-#: ../plugins/google-account-setup/google-source.c:522
+#: ../plugins/google-account-setup/google-source.c:623
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17887,46 +17667,41 @@ msgstr ""
 "Cannot read data from Google server.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:684
+#: ../plugins/google-account-setup/google-source.c:758
 msgid "Cal_endar:"
 msgstr "Cal_endar:"
 
-#: ../plugins/google-account-setup/google-source.c:719
+#: ../plugins/google-account-setup/google-source.c:793
 msgid "Retrieve _list"
 msgstr "Retrieve _list"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:326
-msgid "<b>Server</b>"
-msgstr "<b>Server</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "A plugin to setup Google Calendar and Contacts."
+msgid "Add Google Calendars to Evolution."
+msgstr "Add Google Calendars to Evolution."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Google sources"
+msgid "Google Calendars"
+msgstr "Google Calendars"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "Checklist"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "A plugin to setup GroupWise calendar and contacts sources."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "Add Novell GroupWise support to Evolution."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "GroupWise Account Setup"
 
-#: ../plugins/groupwise-features/install-shared.c:220
-#, c-format
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:386
+msgid "Create folder"
+msgstr "Create folder"
+
+#: ../plugins/groupwise-features/install-shared.c:218
+#, fuzzy, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17936,7 +17711,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "The user '%s' has shared a folder with you\n"
@@ -17950,11 +17725,11 @@ msgstr ""
 "Click 'Forward' to install the shared folder\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:230
 msgid "Install the shared folder"
 msgstr "Install the shared folder"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:234
 msgid "Shared Folder Installation"
 msgstr "Shared Folder Installation"
 
@@ -17969,7 +17744,7 @@ msgstr "Junk Mail Settings"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
-msgstr "Junk Mail Settings..."
+msgstr "Junk Mail Settings…"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
@@ -17980,7 +17755,6 @@ msgid "Email:"
 msgstr "E-mail:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Disable"
 
@@ -17992,11 +17766,17 @@ msgstr "_Enable"
 msgid "_Junk List"
 msgstr "_Junk List"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Remove"
+
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "Message Retract"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -18004,11 +17784,11 @@ msgstr ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "Message retracted successfully"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Retract Mail"
 
@@ -18017,89 +17797,121 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "Add Send Options to GroupWise messages"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "A plugin for the features in GroupWise accounts."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "Fine-tune your GroupWise accounts."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "GroupWise Features"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "Message retract failed"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "The server did not allow the selected message to be retracted."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "Account &quot;{0}&quot; already exists. Please check your folder tree."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "Account Already Exists"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "Invalid user"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your e-mail "
+"address and try again."
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Proxy access cannot be given to user &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "Specify User"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "You have already given proxy permissions to this user."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "You have to specify a valid user name to give proxy rights."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "You cannot share folder with the specified user &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "Account Already Exists"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "You have to specify a user name which you want to add to the list"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your e-mail "
-"address and try again."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+msgid "Do you want to resend the meeting ?"
+msgstr "Do you want to resend the meeting ?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Do you want to resend the recurring meeting ?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+msgid "Do you want to retract the original item ?"
+msgstr "Do you want to retract the original item ?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "The original will be removed from the recipient's mailbox."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "This is a recurring meeting"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr "This will create a new meeting using the existing meeting details."
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "Would you like to accept it?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "Would you like to decline it?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "You cannot share folder with the specified user &quot;{0}&quot;"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "You have to specify a user name which you want to add to the list"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "Accept Tentatively"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+msgid "Rese_nd Meeting..."
+msgstr "Rese_nd Meeting…"
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Users:</b>"
@@ -18110,10 +17922,10 @@ msgstr "C_ustomise notification message"
 
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Con_tacts..."
-msgstr "Con_tacts..."
+msgstr "Con_tacts…"
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "Message"
 
@@ -18131,7 +17943,7 @@ msgstr "_Not Shared"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Shared With..."
-msgstr "_Shared With..."
+msgstr "_Shared With…"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
@@ -18149,6 +17961,10 @@ msgstr "Access Rights"
 msgid "Add/Edit"
 msgstr "Add/Edit"
 
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+msgid "Appointments"
+msgstr "Appointments"
+
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
 msgid "Con_tacts"
 msgstr "Con_tacts"
@@ -18196,10 +18012,10 @@ msgstr "<b>Account Name</b>"
 msgid "Proxy Login"
 msgstr "Proxy Login"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEnter password for %s (user %s)"
@@ -18207,17 +18023,17 @@ msgstr "%sEnter password for %s (user %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:513
 msgid "_Proxy Login..."
-msgstr "_Proxy Login..."
+msgstr "_Proxy Login…"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "The Proxy tab will be available only when the account is online."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "The Proxy tab will be available only when the account is enabled."
 
@@ -18225,101 +18041,101 @@ msgstr "The Proxy tab will be available only when the account is enabled."
 msgid "Advanced send options"
 msgstr "Advanced send options"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Users"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "Enter the users and set permissions"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
-msgstr "New _Shared Folder..."
+msgstr "New _Shared Folder…"
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:448
 msgid "Sharing"
 msgstr "Sharing"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "Custom Notification"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Add   "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Modify"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "Message Status"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Subject:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "From:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "Creation date:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Delivered: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Opened: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "Accepted: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Deleted: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Declined: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Completed: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "Undelivered: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
-msgstr "Track Message Status..."
+msgstr "Track Message Status…"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "A plugin to setup hula calendar sources."
+msgid "Add Hula support to Evolution."
+msgstr "Add Hula support to Evolution."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Hula Account Setup"
+msgid "Hula Support"
+msgstr "Hula Support"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:331
 msgid "Custom Headers"
 msgstr "Custom Headers"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:344
 msgid "IMAP Headers"
 msgstr "IMAP Headers"
 
@@ -18336,10 +18152,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Basic and _Mailing List Headers (Default)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "Fetch A_ll Headers"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18349,7 +18161,7 @@ msgstr ""
 "standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18357,61 +18169,31 @@ msgstr ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers — (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+msgid "_Fetch All Headers"
+msgstr "_Fetch All Headers"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "A plugin for the features in the IMAP accounts."
+msgid "Fine-tune your IMAP accounts."
+msgstr "Fine-tune your IMAP accounts."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP Features"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "_Import to Calendar"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "_Import to Tasks"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "Import ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "Select Task List"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "Select Calendar"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "_Import"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Import to Calendar"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "Imports ICS attachments to calendar."
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Hardware Abstraction Layer not loaded"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18419,7 +18201,7 @@ msgstr ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "Search for an iPod failed"
 
@@ -18432,146 +18214,148 @@ msgstr ""
 "connected to the system or it is not powered on."
 
 #: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar format (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr ""
-"Synchronise the selected task/memo/calendar/address book with an Apple iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "Synchronise to iPod"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "Synchronise your data with your Apple iPod."
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod Synchronisation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Failed to load the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "An appointment in the calendar '%s' conflicts with this meeting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Found the appointment in the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:762
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:769
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:773
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:777
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:848
+msgid "Opening the calendar. Please wait.."
+msgstr "Opening the calendar. Please wait.."
+
+#: ../plugins/itip-formatter/itip-formatter.c:851
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1033
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1120
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1136
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1141
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1146
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1247
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1357
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1386
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1390
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1416
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1419
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1434
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1437
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Unable to send memo information, the memo does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1505
+#: ../plugins/itip-formatter/itip-formatter.c:1516
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1506
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18579,15 +18363,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1585
+#: ../plugins/itip-formatter/itip-formatter.c:1677
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1558
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1678
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18595,11 +18379,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18607,40 +18391,34 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2344
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2347
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2350
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2583
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2593
+#: ../plugins/itip-formatter/itip-formatter.c:2626
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2608
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "Today"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18659,11 +18437,6 @@ msgstr "Today %H:%M:%S"
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "Tomorrow"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -19011,111 +18784,107 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> has cancelled the following shared memo:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Open Calendar"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "_Decline"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "_Decline"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "_Accept"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "_Accept all"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "_Send Information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "_Update"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Start time:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "End time:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "Comment:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "Send _reply to sender"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "_Tasks :"
-
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "Memos :"
+msgid "_Memos:"
+msgstr "_Memos:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Display \"text/calendar\" MIME parts in mail messages."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -19139,18 +18908,6 @@ msgid ""
 msgstr ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "Proxy _Logout"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Allows disabling of accounts."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable Account"
-msgstr "Disable Account"
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Beep or play sound file."
@@ -19188,51 +18945,57 @@ msgid "Play sound when new messages arrive."
 msgstr "Play sound when new messages arrive."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "Sound file to be played when new messages arrive, if not in beep mode."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "Popup message together with the icon."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Show new mail icon in notification area when new messages arrive."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "Sound file name to be played."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "Sound file to be played when new messages arrive, if not in beep mode."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#, fuzzy
+msgid "Use sound theme"
+msgstr "Use underline"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Whether play sound or beep when new messages arrive."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "Whether show message over the icon when new messages arrive."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "Whether the icon should blink or not."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Whether to notify new messages in Inbox folder only."
 
-#: ../plugins/mail-notification/mail-notification.c:260
-msgid "Generate a _D-Bus message"
-msgstr "Generate a _D-Bus message"
-
-#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:292
 msgid "Evolution's Mail Notification"
 msgstr "Evolution's Mail Notification"
 
-#: ../plugins/mail-notification/mail-notification.c:404
+#: ../plugins/mail-notification/mail-notification.c:313
 msgid "Mail Notification Properties"
 msgstr "Mail Notification Properties"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:483
+#: ../plugins/mail-notification/mail-notification.c:422
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19247,92 +19010,188 @@ msgstr[1] ""
 "You have received %d new messages\n"
 "in %s."
 
-#: ../plugins/mail-notification/mail-notification.c:488
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "You have received %d new message."
 msgstr[1] "You have received %d new messages."
 
-#: ../plugins/mail-notification/mail-notification.c:505
-#: ../plugins/mail-notification/mail-notification.c:510
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:449
 msgid "New email"
 msgstr "New e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "Show icon in _notification area"
 msgstr "Show icon in _notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:573
+#: ../plugins/mail-notification/mail-notification.c:534
 msgid "B_link icon in notification area"
 msgstr "B_link icon in notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:575
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Popup _message together with the icon"
 msgstr "Popup _message together with the icon"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "_Play sound when new messages arrive"
 msgstr "_Play sound when new messages arrive"
 
-#: ../plugins/mail-notification/mail-notification.c:762
+#: ../plugins/mail-notification/mail-notification.c:752
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:763
-msgid "Play _sound file"
-msgstr "Play _sound file"
+#: ../plugins/mail-notification/mail-notification.c:765
+#, fuzzy
+msgid "Use sound _theme"
+msgstr "Use underline"
 
-#: ../plugins/mail-notification/mail-notification.c:774
-msgid "Specify _filename:"
-msgstr "Specify _filename:"
+#: ../plugins/mail-notification/mail-notification.c:784
+#, fuzzy
+msgid "Play _file:"
+msgstr "Play _sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:775
+#: ../plugins/mail-notification/mail-notification.c:795
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:776
-msgid "Pl_ay"
-msgstr "Pl_ay"
-
-#: ../plugins/mail-notification/mail-notification.c:833
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
+#: ../plugins/mail-notification/mail-notification.c:862
+msgid "Generate a _D-Bus message"
+msgstr "Generate a _D-Bus message"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Mail Notification"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "Notifies you when new mail messages arrive."
+
+#: ../plugins/mail-to-task/mail-to-task.c:394
+#, c-format
 msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "Mail Notification"
+#: ../plugins/mail-to-task/mail-to-task.c:397
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:400
+#, c-format
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "Con_vert to Meeting"
+#: ../plugins/mail-to-task/mail-to-task.c:417
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:420
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:441
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgstr[1] ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "Mail to meeting"
+#: ../plugins/mail-to-task/mail-to-task.c:447
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgstr[1] ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:295
+#: ../plugins/mail-to-task/mail-to-task.c:453
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgstr[1] ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:512
+msgid "[No Summary]"
+msgstr "[No Summary]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:523
+msgid "Invalid object returned from a server"
+msgstr "Invalid object returned from a server"
+
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "An error occurred during processing: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:300
+#: ../plugins/mail-to-task/mail-to-task.c:630
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+
+#: ../plugins/mail-to-task/mail-to-task.c:633
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19340,65 +19199,115 @@ msgstr ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Con_vert to Task"
+#: ../plugins/mail-to-task/mail-to-task.c:843
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "Cannot get source list. %s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "Mail to task"
+#: ../plugins/mail-to-task/mail-to-task.c:962
+msgid "Create an _Event"
+msgstr "Create an _Event"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Convert the selected message to a new task"
+#: ../plugins/mail-to-task/mail-to-task.c:964
+msgid "Create a new event from the selected message"
+msgstr "Create a new event from the selected message"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "Contact list _owner"
+#: ../plugins/mail-to-task/mail-to-task.c:969
+msgid "Create a Mem_o"
+msgstr "Create a Mem_o"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
-msgstr "Get list _archive"
+#: ../plugins/mail-to-task/mail-to-task.c:971
+msgid "Create a new memo from the selected message"
+msgstr "Create a new memo from the selected message"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
-msgstr "Get list _usage information"
+#: ../plugins/mail-to-task/mail-to-task.c:976
+msgid "Create a _Task"
+msgstr "Create a _Task"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "Mailing List Actions"
+#: ../plugins/mail-to-task/mail-to-task.c:978
+msgid "Create a new task from the selected message"
+msgstr "Create a new task from the selected message"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "Mailing _List"
+#: ../plugins/mail-to-task/mail-to-task.c:986
+msgid "Create a _Meeting"
+msgstr "Create a _Meeting"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+#: ../plugins/mail-to-task/mail-to-task.c:988
+msgid "Create a new meeting from the selected message"
+msgstr "Create a new meeting from the selected message"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Convert a mail message to a task."
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:276
+msgid "Get List _Archive"
+msgstr "Get List _Archive"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:278
+msgid "Get an archive of the list this message belongs to"
+msgstr "Get an archive of the list this message belongs to"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Usage Information"
+msgstr "Get List _Usage Information"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Get information about the usage of the list this message belongs to"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
-msgstr "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Contact List _Owner"
+msgstr "Contact List _Owner"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Contact the owner of the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
-msgstr "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "_Post Message to List"
+msgstr "_Post Message to List"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
-msgstr "_Un-subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Post a message to the mailing list this message belongs to"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Subscribe to List"
+msgstr "_Subscribe to List"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Subscribe to the mailing list this message belongs to"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Unsubscribe from List"
+msgstr "_Unsubscribe from List"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#, fuzzy
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "Unsubscribe to the mailing list this message belongs to"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+msgid "Mailing _List"
+msgstr "Mailing _List"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Mailing List Actions"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -19480,59 +19389,11 @@ msgstr "_Edit message"
 msgid "_Send message"
 msgstr "_Send message"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Contact List _Owner"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "Contact the owner of the mailing list this message belongs to"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Get List _Archive"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Get List _Usage Information"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "Get an archive of the list this message belongs to"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "Get information about the usage of the list this message belongs to"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "Post a message to the mailing list this message belongs to"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Subscribe to the mailing list this message belongs to"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Unsubscribe to the mailing list this message belongs to"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Post Message to List"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Subscribe to List"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "_Unsubscribe from List"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid "Also mark messages in subfolders?"
 msgstr "Also mark messages in subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:45
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19540,53 +19401,36 @@ msgstr ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "Current Folder and _Subfolders"
+#: ../plugins/mark-all-read/mark-all-read.c:172
+msgid "In Current Folder and _Subfolders"
+msgstr "In Current Folder and _Subfolders"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "Current _Folder Only"
+#: ../plugins/mark-all-read/mark-all-read.c:186
+msgid "In Current _Folder Only"
+msgstr "In Current _Folder Only"
+
+#: ../plugins/mark-all-read/mark-all-read.c:297
+msgid "Mark Me_ssages as Read"
+msgstr "Mark Me_ssages as Read"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Mark All Read"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "Mark Me_ssages as Read"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "Used for marking all the messages under a folder as read"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "A plugin which implements mono plugins."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Mono Loader"
-msgstr "Mono Loader"
+msgid "Mark all messages in a folder as read."
+msgstr "Mark all messages in a folder as read."
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "A plugin for managing which plugins are enabled or disabled."
+msgid "Manage your Evolution plugins."
+msgstr "Manage your Evolution plugins."
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "Plugin Manager"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "Enable and disable plugins"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "_Plugins"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "Author(s)"
 
@@ -19594,39 +19438,39 @@ msgstr "Author(s)"
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note: Some changes will not take effect until restart"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "Overview"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "_Plugins"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "Enable and disable plugins"
 
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Plain Text Mode"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
-msgstr "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
+msgstr "Prefer Plain Text"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "View mail messages as plain text, even if they contain HTML content."
 
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
@@ -19649,8 +19493,8 @@ msgid "Evolution Profiler"
 msgstr "Evolution Profiler"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Writes a log of profiling data events."
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "Profile data events in Evolution (for developers only)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19664,45 +19508,84 @@ msgstr "Outlook PST import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personal folders (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:298
+msgid "_Mail"
+msgstr "_Mail"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "_Address Book"
 msgstr "_Address Book"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:335
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "Importing Outlook data"
 msgstr "Importing Outlook data"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Allows calendars to be published to the web"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "Calendar Publishing"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Locations"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "_Publish Calendar Information"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "Publish calendars to the web."
+
+#: ../plugins/publish-calendar/publish-calendar.c:94
+#: ../plugins/publish-calendar/publish-calendar.c:336
+#, c-format
+msgid "Could not open %s:"
+msgstr "Could not open %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:96
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Could not open %s: Unknown error"
+
+#: ../plugins/publish-calendar/publish-calendar.c:116
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "There was an error while publishing to %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:118
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "Publishing to %s finished successfully"
+
+#: ../plugins/publish-calendar/publish-calendar.c:163
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Mount of %s failed:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:623
 msgid "Are you sure you want to remove this location?"
 msgstr "Are you sure you want to remove this location?"
 
+#: ../plugins/publish-calendar/publish-calendar.c:937
+msgid "Could not create publish thread."
+msgstr "Could not create publish thread."
+
+#: ../plugins/publish-calendar/publish-calendar.c:944
+msgid "_Publish Calendar Information"
+msgstr "_Publish Calendar Information"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Location</span>"
@@ -19759,27 +19642,41 @@ msgstr ""
 msgid "Service _type:"
 msgstr "Service _type:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "Time _duration:"
+msgstr "Time _duration:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_File:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "_Publish as:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"days\n"
+"weeks\n"
+"months"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19787,209 +19684,149 @@ msgstr ""
 "iCal\n"
 "Free/Busy"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "Could not publish calendar: Calendar backend no longer exists"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "Edit Location"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hello Python"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Python Plugin Loader tests"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python Test Plugin"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Test Plugin for Python EPlugin loader."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "A plugin which loads other plugins written using Python."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Python Loader"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (built-in)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin not found, code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Failed to create pipe: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Error after fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "SpamAssassin child process does not respond, killing..."
+msgstr "SpamAssassin child process does not respond, killing…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr "Wait for SpamAssassin child process interrupted, terminating…"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Pipe to SpamAssassin failed, error code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin is not available."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "This will make SpamAssassin more reliable, but slower"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "Filter junk messages using SpamAssassin."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin Options"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin Junk Filter"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin junk plugin"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "A plugin for saving all attachments or parts of a message at once."
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "Save attachments"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "Save Attachments..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "Save all attachments"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "Select save base name"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME Type"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "Save"
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin Options"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:159
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Description List"
 msgstr "Description List"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Categories List"
 msgstr "Categories List"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Comment List"
 msgstr "Comment List"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "Created"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "End"
 msgstr "End"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "percent Done"
 msgstr "percent Done"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Attendees List"
 msgstr "Attendees List"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Modified"
 msgstr "Modified"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "Advanced options for the CSV format"
+#: ../plugins/save-calendar/csv-format.c:522
+msgid "A_dvanced options for the CSV format"
+msgstr "A_dvanced options for the CSV format"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "Prepend a header"
+#: ../plugins/save-calendar/csv-format.c:529
+msgid "Prepend a _header"
+msgstr "Prepend a _header"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "Value delimiter:"
+#: ../plugins/save-calendar/csv-format.c:538
+msgid "_Value delimiter:"
+msgstr "_Value delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "Record delimiter:"
+#: ../plugins/save-calendar/csv-format.c:545
+msgid "_Record delimiter:"
+msgstr "_Record delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "Encapsulate values with:"
+#: ../plugins/save-calendar/csv-format.c:552
+msgid "_Encapsulate values with:"
+msgstr "_Encapsulate values with:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:574
 msgid "Comma separated value format (.csv)"
 msgstr "Comma separated value format (.csv)"
 
@@ -19998,50 +19835,44 @@ msgid "Save Selected"
 msgstr "Save Selected"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "Saves selected calendar or tasks list to disk."
-
-#  calendar:prompt-save-task title
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "_Save to Disk"
+msgid "Save a calendar or task list to disk."
+msgstr "Save a calendar or task list to disk."
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:371
 msgid "RDF format (.rdf)"
 msgstr "RDF format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:111
+msgid "_Format:"
+msgstr "_Format:"
+
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "Select destination file"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Select one source"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Selects a single calendar or task source for viewing."
+#: ../plugins/save-calendar/save-calendar.c:323
+#, fuzzy
+msgid "Save the selected calendar to disk"
+msgstr "Save the selected messages as a text file"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "Show _only this Calendar"
+#: ../plugins/save-calendar/save-calendar.c:358
+#, fuzzy
+msgid "Save the selected memo list to disk"
+msgstr "Save the selected messages as a text file"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "Show _only this Memo List"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "Show _only this Task List"
+#: ../plugins/save-calendar/save-calendar.c:393
+#, fuzzy
+msgid "Save the selected task list to disk"
+msgstr "Save a calendar or task list to disk."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -20051,15 +19882,15 @@ msgstr "Guides you through your initial account setup."
 msgid "Setup Assistant"
 msgstr "Setup Assistant"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:97
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -20072,34 +19903,34 @@ msgstr ""
 "Please click the \"Forward\" button to continue. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-msgid "Importing files"
-msgstr "Importing files"
-
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:129
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:396
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:167
+msgid "Importing files"
+msgstr "Importing files"
+
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:519
 #, c-format
 msgid "Importing data."
 msgstr "Importing data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:538
 msgid "Please wait"
 msgstr "Please wait"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Indicates if threading of messages should fall back to subject."
+msgid "Sort mail message threads by subject."
+msgstr "Sort mail message threads by subject."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -20122,67 +19953,83 @@ msgstr ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 
-#: ../plugins/templates/templates.c:603
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "Drafts-based template plugin"
+
+#: ../plugins/templates/templates.c:634
+#, fuzzy
+msgid "No Title"
 msgstr "No title"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:705
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:707
 msgid "Save as Template"
 msgstr "Save as Template"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Drafts-based template plugin"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF Attachment decoder"
+msgid "TNEF Decoder"
+msgstr "TNEF Decoder"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "Inline vCards"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "Show vCards directly in mail messages."
+
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
+msgid "Show Full vCard"
+msgstr "Show Full vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:163
+msgid "Show Compact vCard"
+msgstr "Show Compact vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:224
+msgid "There is one other contact."
+msgstr "There is one other contact."
+
+#: ../plugins/vcard-inline/vcard-inline.c:233
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "There is %d other contact."
+msgstr[1] "There are %d other contacts."
+
+#: ../plugins/vcard-inline/vcard-inline.c:254
+msgid "Save in Address Book"
+msgstr "Save in Address Book"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "A plugin to set up WebDAV contacts."
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Add WebDAV contacts to Evolution."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV contacts"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:337
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution Shell Config factory"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "Authenticate proxy server connections"
@@ -20200,44 +20047,54 @@ msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+msgid "Default window X coordinate"
+msgstr "Default window state"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+msgid "Default window Y coordinate"
+msgstr "Default window state"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "Default window height"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "Default window state"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "Default window width"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
 msgstr "HTTP proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
 msgstr "HTTP proxy password"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
 msgstr "HTTP proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
 msgstr "HTTP proxy username"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID or alias of the component to be shown by default at start-up."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -20249,45 +20106,65 @@ msgstr ""
 "authentication_user\" GConf key, and the password is retrieved from either "
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial attachment view"
+msgstr "Initial attachment view"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Initial file chooser folder"
+msgstr "Initial file chooser folder"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Initial folder for GtkFileChooser dialogues."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "Last upgraded configuration version"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 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"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "Non-proxy hosts"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Password to pass as authentication when doing HTTP proxying."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "Proxy configuration mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "SOCKS proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "SOCKS proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "Secure HTTP proxy host name"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "Secure HTTP proxy port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20299,23 +20176,23 @@ msgstr ""
 "configuration\" and \"use proxy configuration provided in the autoconfig URL"
 "\" respectively."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "Sidebar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialogue"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:327
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "Statusbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20323,19 +20200,29 @@ msgstr ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+#, fuzzy
+msgid "The default X coordinate for the main window."
+msgstr "The default width for the main window, in pixels."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+#, fuzzy
+msgid "The default Y coordinate for the main window."
+msgstr "The default width for the main window, in pixels."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "The default height for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "The default width for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20343,19 +20230,19 @@ msgstr ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "The machine name to proxy HTTP through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "The machine name to proxy secure HTTP through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "The machine name to proxy socks through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20363,7 +20250,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20371,7 +20258,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20379,7 +20266,7 @@ msgstr ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20389,7 +20276,7 @@ msgstr ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20401,78 +20288,102 @@ msgstr ""
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "URL that provides proxy configuration values."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "Use HTTP proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "Username to pass as authentication when doing HTTP proxying."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 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."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "Whether or not the window should be maximised."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "Whether the sidebar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "Whether the status bar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Whether the warning dialogue in development versions of Evolution is skipped."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "Whether the window buttons should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "Window button style"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Active Connections</b>"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-content.c:867
+#, fuzzy
+msgid "Sho_w:"
+msgstr "Sho_w: "
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Active Connections"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:892
+#, fuzzy
+msgid "Sear_ch:"
+msgstr "Sear_ch: "
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Click OK to close these connections and go offline"
+#. Scope Combo Widgets
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:934
+#, fuzzy
+msgid "i_n"
+msgstr " i_n "
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-content.c:1357
+msgid "Advanced Search"
+msgstr "Advanced Search"
+
+#: ../shell/e-shell-content.c:1414 ../shell/e-shell-content.c:1415
+msgid "Searches"
+msgstr "Searches"
+
+#: ../shell/e-shell-content.c:1460
+msgid "Save Search"
+msgstr "Save Search"
+
+#: ../shell/e-shell-importer.c:119
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:122
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -20480,11 +20391,11 @@ msgstr ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:126
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:132
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20496,58 +20407,164 @@ msgstr ""
 "settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:263
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:268
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:277
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:329
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:332
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: ../shell/e-shell-settings-dialog.c:313
-msgid "Evolution Preferences"
-msgstr "Evolution Preferences"
+#: ../shell/e-shell-importer.c:692 ../shell/e-shell-importer.c:706
+msgid "Evolution Import Assistant"
+msgstr "Evolution Import Assistant"
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-importer.c:701
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
+
+#: ../shell/e-shell-importer.c:720
+msgid "Importer Type"
+msgstr "Importer Type"
+
+#: ../shell/e-shell-importer.c:733
+msgid "Select Information to Import"
+msgstr "Select Information to Import"
+
+#: ../shell/e-shell-importer.c:745
+msgid "Select a File"
+msgstr "Select a File"
+
+#: ../shell/e-shell-importer.c:754
+msgid "Import Location"
+msgstr "Import Location"
 
-#: ../shell/e-shell-window-commands.c:75
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "The GNOME Pilot tools do not appear to be installed on this system."
+#: ../shell/e-shell-importer.c:760
+#, fuzzy
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Click \"Import\" to begin importing the file into Evolution. "
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-importer.c:764
+msgid "Import File"
+msgstr "Import File"
+
+#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
 #, c-format
-msgid "Error executing %s."
-msgstr "Error executing %s."
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell-switcher.c:446
+#, fuzzy
+msgid "Toolbar Style"
+msgstr "Tool_bar Style"
+
+#: ../shell/e-shell-switcher.c:447
+msgid "The switcher's toolbar style"
+msgstr ""
+
+#: ../shell/e-shell-switcher.c:463
+#, fuzzy
+msgid "Toolbar Visible"
+msgstr "Toolbar is visible"
+
+#: ../shell/e-shell-switcher.c:464
+#, fuzzy
+msgid "Whether the switcher is visible"
+msgstr "Whether the sidebar should be visible."
+
+#: ../shell/e-shell-view.c:485
+#, fuzzy
+msgid "Switcher Action"
+msgstr "Switch to %s"
+
+#: ../shell/e-shell-view.c:486
+msgid "The switcher action for this shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:501
+#, fuzzy
+msgid "Page Number"
+msgstr "Serial Number"
+
+#: ../shell/e-shell-view.c:502
+msgid "The notebook page number of the shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:520
+msgid "The title of the shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:535
+msgid "The EShellBackend for this shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:550
+msgid "Shell Content Widget"
+msgstr ""
+
+#: ../shell/e-shell-view.c:551
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:139
-msgid "Bug buddy is not installed."
-msgstr "Bug buddy is not installed."
+#: ../shell/e-shell-view.c:567
+#, fuzzy
+msgid "Shell Sidebar Widget"
+msgstr "Default sidebar width"
+
+#: ../shell/e-shell-view.c:568
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
+
+#: ../shell/e-shell-view.c:583
+msgid "Shell Taskbar Widget"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:142
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy could not be run."
+#: ../shell/e-shell-view.c:584
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
+
+#: ../shell/e-shell-view.c:599
+#, fuzzy
+msgid "Shell Window"
+msgstr "New _Window"
+
+#: ../shell/e-shell-view.c:600
+msgid "The window to which the shell view belongs"
+msgstr ""
+
+#: ../shell/e-shell-view.c:615
+#, fuzzy
+msgid "Current View ID"
+msgstr "_Current View"
+
+#: ../shell/e-shell-view.c:616
+#, fuzzy
+msgid "The current GAL view ID"
+msgstr "the current time"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-actions.c:644
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72@yahoo.com>\n"
@@ -20555,131 +20572,393 @@ msgstr ""
 "Philip Withnall <philip@tecnocode.co.uk>\n"
 "Bruce Cowan <bcowan@fastmail.co.uk>"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-actions.c:655
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-commands.c:1170
-msgid "_Work Online"
-msgstr "_Work Online"
+#: ../shell/e-shell-window-actions.c:1252
+#, fuzzy
+msgid "Bug Buddy is not installed."
+msgstr "Bug Buddy is not installed."
+
+#: ../shell/e-shell-window-actions.c:1254
+#, fuzzy
+msgid "Bug Buddy could not be run."
+msgstr "Bug Buddy could not be run."
+
+#: ../shell/e-shell-window-actions.c:1356
+#, fuzzy
+msgid "GNOME Pilot is not installed."
+msgstr "Bug Buddy is not installed."
+
+#: ../shell/e-shell-window-actions.c:1358
+#, fuzzy
+msgid "GNOME Pilot could not be run."
+msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1452
+msgid "Show information about Evolution"
+msgstr "Show information about Evolution"
+
+#: ../shell/e-shell-window-actions.c:1457
+msgid "_Close Window"
+msgstr "_Close Window"
+
+#: ../shell/e-shell-window-actions.c:1464
+#, fuzzy
+msgid "_Contents"
+msgstr "A_ppointments"
+
+#: ../shell/e-shell-window-actions.c:1466
+#, fuzzy
+msgid "Open the Evolution User Guide"
+msgstr "The Evolution Groupware Suite"
+
+#: ../shell/e-shell-window-actions.c:1471
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../shell/e-shell-window-actions.c:1473
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Open the Frequently Asked Questions webpage"
+
+#: ../shell/e-shell-window-actions.c:1478
+msgid "_Forget Passwords"
+msgstr "_Forget Passwords"
+
+#: ../shell/e-shell-window-actions.c:1480
+#, fuzzy
+msgid "Forget all remembered passwords"
+msgstr "Are you sure you want to forget all remembered passwords?"
+
+#: ../shell/e-shell-window-actions.c:1485
+msgid "I_mport..."
+msgstr "I_mport…"
+
+#: ../shell/e-shell-window-actions.c:1487
+msgid "Import data from other programs"
+msgstr "Import data from other programs"
+
+#: ../shell/e-shell-window-actions.c:1492
+msgid "New _Window"
+msgstr "New _Window"
+
+#: ../shell/e-shell-window-actions.c:1494
+#, fuzzy
+msgid "Create a new window displaying this view"
+msgstr "Create a new window displaying this folder"
+
+#: ../shell/e-shell-window-actions.c:1501
+#, fuzzy
+msgid "Configure Evolution"
+msgstr "Configuration"
+
+#: ../shell/e-shell-window-actions.c:1506
+msgid "_Quick Reference"
+msgstr "_Quick Reference"
+
+#: ../shell/e-shell-window-actions.c:1508
+#, fuzzy
+msgid "Show Evolution's shortcut keys"
+msgstr "Change Evolution's settings"
+
+#: ../shell/e-shell-window-actions.c:1515
+msgid "Exit the program"
+msgstr "Exit the program"
+
+#: ../shell/e-shell-window-actions.c:1520
+msgid "_Advanced Search..."
+msgstr "_Advanced Search…"
+
+#: ../shell/e-shell-window-actions.c:1522
+msgid "Construct a more advanced search"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1529
+#, fuzzy
+msgid "Clear the current search parameters"
+msgstr "Clear the search"
+
+#: ../shell/e-shell-window-actions.c:1534
+msgid "_Edit Saved Searches..."
+msgstr "_Edit Saved Searches…"
+
+#: ../shell/e-shell-window-actions.c:1536
+#, fuzzy
+msgid "Manage your saved searches"
+msgstr "Manage your e-mail, contacts and schedule"
+
+#: ../shell/e-shell-window-actions.c:1543
+msgid "Click here to change the search type"
+msgstr "Click here to change the search type"
+
+#: ../shell/e-shell-window-actions.c:1548
+msgid "_Find Now"
+msgstr "_Find Now"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1550
+#, fuzzy
+msgid "Execute the current search parameters"
+msgstr "Cancel the current mail operation"
+
+#: ../shell/e-shell-window-actions.c:1555
+msgid "_Save Search..."
+msgstr "_Save Search…"
+
+#: ../shell/e-shell-window-actions.c:1557
+#, fuzzy
+msgid "Save the current search parameters"
+msgstr "Save the current file"
+
+#: ../shell/e-shell-window-actions.c:1562
+msgid "Send / _Receive"
+msgstr "Send / _Receive"
+
+#: ../shell/e-shell-window-actions.c:1564
+msgid "Send queued items and retrieve new items"
+msgstr "Send queued items and retrieve new items"
+
+#: ../shell/e-shell-window-actions.c:1569
+#, fuzzy
+msgid "Submit _Bug Report..."
+msgstr "Submit _Bug Report"
+
+#: ../shell/e-shell-window-actions.c:1571
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Submit a bug report using Bug Buddy"
+
+#: ../shell/e-shell-window-actions.c:1576
+msgid "_Synchronization Options..."
+msgstr "_Synchronisation Options…"
+
+#: ../shell/e-shell-window-actions.c:1578
+msgid "Set up Pilot configuration"
+msgstr "Set up Pilot configuration"
+
+#: ../shell/e-shell-window-actions.c:1583
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-commands.c:1196
-msgid "Work Offline"
-msgstr "Work Offline"
+#: ../shell/e-shell-window-actions.c:1585
+#, fuzzy
+msgid "Put Evolution into offline mode"
+msgstr "Start in offline mode"
 
-#: ../shell/e-shell-window.c:377
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
+#: ../shell/e-shell-window-actions.c:1590
+msgid "_Work Online"
+msgstr "_Work Online"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in the process of going offline."
+#: ../shell/e-shell-window-actions.c:1592
+#, fuzzy
+msgid "Put Evolution into online mode"
+msgstr "Start in online mode"
 
-#: ../shell/e-shell-window.c:391
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
+#: ../shell/e-shell-window-actions.c:1620
+msgid "Lay_out"
+msgstr "Lay_out"
 
-#: ../shell/e-shell-window.c:785
-#, c-format
-msgid "Switch to %s"
-msgstr "Switch to %s"
+#: ../shell/e-shell-window-actions.c:1627
+msgid "_New"
+msgstr "_New"
 
-#: ../shell/e-shell.c:640
-msgid "Unknown system error."
-msgstr "Unknown system error."
+#: ../shell/e-shell-window-actions.c:1634
+msgid "_Search"
+msgstr "_Search"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: ../shell/e-shell-window-actions.c:1641
+msgid "_Switcher Appearance"
+msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
-msgid "OK"
-msgstr "OK"
+#: ../shell/e-shell-window-actions.c:1655
+msgid "_Window"
+msgstr "_Window"
 
-#: ../shell/e-shell.c:1263
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
+#: ../shell/e-shell-window-actions.c:1665
+msgid "Show Side _Bar"
+msgstr "Show Side _Bar"
+
+#: ../shell/e-shell-window-actions.c:1667
+#, fuzzy
+msgid "Show the side bar"
+msgstr "Show Side _Bar"
+
+#: ../shell/e-shell-window-actions.c:1673
+msgid "Show _Status Bar"
+msgstr "Show _Status Bar"
+
+#: ../shell/e-shell-window-actions.c:1675
+#, fuzzy
+msgid "Show the status bar"
+msgstr "Show _Status Bar"
+
+#: ../shell/e-shell-window-actions.c:1681
+#, fuzzy
+msgid "Show _Buttons"
+msgstr "Show Animations"
 
-#: ../shell/e-shell.c:1265
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
+#: ../shell/e-shell-window-actions.c:1683
+#, fuzzy
+msgid "Show the switcher buttons"
+msgstr "Show the second time zone"
 
-#: ../shell/e-shell.c:1267
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
+#: ../shell/e-shell-window-actions.c:1689
+#, fuzzy
+msgid "Show _Tool Bar"
+msgstr "Show _Toolbar"
+
+#: ../shell/e-shell-window-actions.c:1691
+#, fuzzy
+msgid "Show the toolbar"
+msgstr "Show _Toolbar"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-shell-window-actions.c:1713
+msgid "_Icons Only"
+msgstr "_Icons Only"
+
+#: ../shell/e-shell-window-actions.c:1715
+msgid "Display window buttons with icons only"
+msgstr "Display window buttons with icons only"
+
+#: ../shell/e-shell-window-actions.c:1720
+msgid "_Text Only"
+msgstr "_Text Only"
+
+#: ../shell/e-shell-window-actions.c:1722
+msgid "Display window buttons with text only"
+msgstr "Display window buttons with text only"
+
+#: ../shell/e-shell-window-actions.c:1727
+msgid "Icons _and Text"
+msgstr "Icons _and Text"
+
+#: ../shell/e-shell-window-actions.c:1729
+msgid "Display window buttons with icons and text"
+msgstr "Display window buttons with icons and text"
+
+#: ../shell/e-shell-window-actions.c:1734
+msgid "Tool_bar Style"
+msgstr "Tool_bar Style"
+
+#: ../shell/e-shell-window-actions.c:1736
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "Display window buttons using the desktop toolbar setting"
+
+#: ../shell/e-shell-window-actions.c:1744
+msgid "Define Views..."
+msgstr "Define Views…"
+
+#: ../shell/e-shell-window-actions.c:1746
+msgid "Create or edit views"
+msgstr "Create or edit views"
+
+#: ../shell/e-shell-window-actions.c:1751
+msgid "Save Custom View..."
+msgstr "Save Custom View…"
+
+#: ../shell/e-shell-window-actions.c:1753
+msgid "Save current custom view"
+msgstr "Save current custom view"
+
+#: ../shell/e-shell-window-actions.c:1760
+msgid "C_urrent View"
+msgstr "C_urrent View"
+
+#: ../shell/e-shell-window-actions.c:1770
+msgid "Custom View"
+msgstr "Custom View"
+
+#: ../shell/e-shell-window-actions.c:1772
+msgid "Current view is a customized view"
+msgstr "Current view is a customised view"
+
+#: ../shell/e-shell-window-actions.c:1782
+#, fuzzy
+msgid "Change the page settings for your current printer"
+msgstr "Set up the page settings for your current printer"
+
+#: ../shell/e-shell-window-actions.c:2054
+#, c-format
+msgid "Switch to %s"
+msgstr "Switch to %s"
+
+#: ../shell/e-shell-window-actions.c:2257
+msgid "Execute these search parameters"
+msgstr ""
+
+#: ../shell/e-shell-window-private.c:252
 msgid "New"
 msgstr "New"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "New Test"
-msgstr "New Test"
-
-#: ../shell/test/evolution-test-component.c:106
-msgctxt "New"
-msgid "_Test"
-msgstr "_Test"
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:569
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s — Evolution"
 
-#: ../shell/test/evolution-test-component.c:107
-msgid "Create a new test item"
-msgstr "Create a new test item"
+#: ../shell/e-shell-window.c:292
+msgid "Active Shell View"
+msgstr ""
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Click \"Import\" to begin importing the file into Evolution. "
+#: ../shell/e-shell-window.c:293
+#, fuzzy
+msgid "Name of the active shell view"
+msgstr "Name of new view:"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Evolution Import Assistant"
+#: ../shell/e-shell-window.c:307
+#, fuzzy
+msgid "Safe Mode"
+msgstr "_Caret Mode"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "Import File"
+#: ../shell/e-shell-window.c:308
+#, fuzzy
+msgid "Whether the shell window is in safe mode"
+msgstr "Whether the plugin is enabled"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "Import Location"
+#: ../shell/e-shell-window.c:339
+#, fuzzy
+msgid "UI Manager"
+msgstr "Manager"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "Importer Type"
+#: ../shell/e-shell-window.c:340
+msgid "The shell window's GtkUIManager"
+msgstr ""
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "Select Information to Import"
+#: ../shell/e-shell.c:207
+#, fuzzy
+msgid "Preparing to go offline..."
+msgstr "Preparing account '%s' for offline"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "Select a File"
+#: ../shell/e-shell.c:261
+#, fuzzy
+msgid "Preparing to go online..."
+msgstr "Preparing account '%s' for offline"
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
+#: ../shell/e-shell.c:324
+msgid "Preparing to quit..."
 msgstr ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
+
+#: ../shell/e-shell.c:688
+#, fuzzy
+msgid "Network Available"
+msgstr "No store available"
+
+#: ../shell/e-shell.c:689
+#, fuzzy
+msgid "Whether the network is available"
+msgstr "Whether the plugin is enabled"
+
+#: ../shell/e-shell.c:704 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "Online"
+
+#: ../shell/e-shell.c:705
+#, fuzzy
+msgid "Whether the shell is online"
+msgstr "Whether the plugin is enabled"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:176
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20714,7 +20993,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:200
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20722,43 +21001,43 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:207
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:325
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:329
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:332
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forcibly shut down all Evolution components"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:336
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:339
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:341
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:343
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:494
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:518
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20772,24 +21051,16 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Are you sure you want to forget all remembered passwords?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "Cannot start Evolution"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Continue"
 
 #  shell:upgrade-remove-1-4 title
 #  shell:upgrade-remove-1-4 primary
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "Delete old data from version {0}?"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution can not start."
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20797,18 +21068,18 @@ msgstr ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "Insufficient disk space for upgrade."
 
 #  shell:upgrade-remove-1-4-confirm title
 #  shell:upgrade-remove-1-4-confirm primary
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "Really delete old data?"
 
 #  shell:upgrade-remove-1-4-confirm secondary
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20831,7 +21102,7 @@ msgstr ""
 "without manual intervention.\n"
 
 #  shell:upgrade-remove-1-4 secondary
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20847,11 +21118,12 @@ msgstr ""
 "this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
+#: ../shell/shell.error.xml.h:18
+#, fuzzy
+msgid "Upgrade from previous version failed:"
 msgstr "Upgrade from previous version failed: {0}"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:19
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20865,45 +21137,22 @@ msgstr ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "_Forget"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "_Keep Data"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "_Remind Me Later"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
+#, fuzzy
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
@@ -20913,6 +21162,94 @@ msgstr ""
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 
+#: ../shell/test/e-test-shell-backend.c:60
+#, fuzzy
+msgctxt "New"
+msgid "_Test Item"
+msgstr "_Test"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "Create a new test item"
+
+#: ../shell/test/e-test-shell-backend.c:70
+#, fuzzy
+msgctxt "New"
+msgid "Test _Source"
+msgstr "Resource"
+
+#: ../shell/test/e-test-shell-backend.c:72
+#, fuzzy
+msgid "Create a new test source"
+msgstr "Create a new test item"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:958
+#, fuzzy, c-format
+msgid "Starting %s"
+msgstr "Settings"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1394
+#, fuzzy, c-format
+msgid "Not a launchable item"
+msgstr "Editor not launchable"
+
+#: ../smclient/eggsmclient.c:225
+#, fuzzy
+msgid "Disable connection to session manager"
+msgstr "_Direct connection to the Internet"
+
+#: ../smclient/eggsmclient.c:228
+#, fuzzy
+msgid "Specify file containing saved configuration"
+msgstr "Set up Pilot configuration"
+
+#: ../smclient/eggsmclient.c:228
+msgid "FILE"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:231
+#, fuzzy
+msgid "ID"
+msgstr "UID"
+
+#: ../smclient/eggsmclient.c:252
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:253
+#, fuzzy
+msgid "Show session management options"
+msgstr "Show image animations"
+
 #: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
@@ -20924,7 +21261,7 @@ msgstr ""
 "\n"
 "Edit trust settings:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20934,7 +21271,7 @@ msgstr ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20944,54 +21281,58 @@ msgstr ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:384
+#: ../smime/gui/certificate-manager.c:612
 msgid "Select a certificate to import..."
-msgstr "Select a certificate to import..."
+msgstr "Select a certificate to import…"
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:146
 msgid "All PKCS12 files"
 msgstr "All PKCS12 files"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:152
+#: ../smime/gui/certificate-manager.c:399
+#: ../smime/gui/certificate-manager.c:626
 msgid "All files"
 msgstr "All files"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:714
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:285
+#: ../smime/gui/certificate-manager.c:507
 msgid "Purposes"
 msgstr "Purposes"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:294 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:302
 msgid "Expires"
 msgstr "Expires"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:393
 msgid "All email certificate files"
 msgstr "All e-mail certificate files"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:498
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:621
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
+#: ../smime/gui/certificate-manager.c:1052
+msgid "Certificates"
+msgstr "Certificates"
+
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -21090,7 +21431,7 @@ msgstr ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "Certificate"
 
@@ -21166,11 +21507,11 @@ msgstr "Organisational Unit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL Client Certificate"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL Server Certificate"
 
@@ -21217,7 +21558,7 @@ msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
@@ -21226,161 +21567,161 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Sign"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Version"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Version 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Version 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Encryption"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Certificate Key Usage"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape Certificate Type"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificate Authority Key Identifier"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Identifier (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Algorithm Identifier"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Algorithm Parameters"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Subject Public Key Info"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Public Key Algorithm"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Object Signer"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL Certificate Authority"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "E-mail Certificate Authority"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Signing"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "Key Encipherment"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "Data Encipherment"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "Certificate Signer"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL Signer"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Critical"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Not Critical"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Issuer"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "Issuer Unique ID"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "Subject Unique ID"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
@@ -21409,1314 +21750,6 @@ msgstr "Could not execute '%s': %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "Shutting down %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "Address _Book Properties"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "Change the properties of the selected folder"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "Co_py All Contacts To..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "Contact _Preview"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copy"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "Copy selected contacts to another folder"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Copy the contacts of the selected folder into another folder"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Copy the selection"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "Copy to Folder..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "Create a new address book folder"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cut"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Cut the selection"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "Del_ete Address Book"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "Delete selected contacts"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "Delete the selected folder"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "Forward Contact"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "Mo_ve All Contacts To..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "Move selected contacts to another folder"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "Move the contacts of the selected folder into another folder"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "Move to Folder..."
-
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Paste"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Paste the clipboard"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "Previews the contacts to be printed"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "Print selected contacts"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "Rename the selected folder"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "S_ave Address Book As VCard"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Save as VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "Save selected contacts as a VCard"
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "Save the contacts of the selected folder as VCard"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2725
-msgid "Select All"
-msgstr "Select All"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "Select _All"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "Select all contacts"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "Send a message to the selected contacts"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "Send message to contact"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "Send selected contacts to another person"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "Show contact preview window"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "St_op"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "Stop"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "Stop Loading"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "View the current contact"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "_Actions"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "_Copy Contact to..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "_Copy Folder Contacts To"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "_Delete Contact"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "_Forward Contact..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "_Move Contact to..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "_Move Folder Contacts To"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "_New"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "_Rename"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "_Save Contact as VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "_Save Folder Contacts As VCard"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "_Send Message to Contact..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "Day"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "Delete _all Occurrences"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "Delete all occurrences"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "Delete the appointment"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "Delete this occurrence"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "Go To"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "Go back"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "Go forward"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "List"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Month"
-
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
-msgid "Next"
-msgstr "Next"
-
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "Previews the calendar to be printed"
-
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
-msgid "Previous"
-msgstr "Previous"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "Print this calendar"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "Purg_e"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "Purge old appointments and meetings"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "Select _Date"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Select _Today"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "Select a specific date"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "Select today"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "Show as list"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "Show one day"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "Show one month"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "Show one week"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "Show the working week"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "View the current appointment"
-
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "View the debug console for log messages"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "Week"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "Work Week"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "_Debug Logs"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "_Open Appointment"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "Cancel the current mail operation"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "Copy the selected folder into another folder"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "Create a new folder for storing mail"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "Create or edit Search Folder definitions"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "Create or edit rules for filtering new mail"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages of accounts/folders marked for offline"
-msgstr "Download messages of accounts/folders marked for offline"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "Empty Wastebaske_t"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "F_older"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "Move the selected folder into another folder"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Permanently remove all deleted messages from all folders"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "Search F_olders"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "Show Message _Preview"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "Show message preview below the message list"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "Show message preview side-by-side with the message list"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "Show message preview window"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Subscribe or unsubscribe to folders on remote servers"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "_Classic View"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "_Copy Folder To..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "_Download Messages for Offline Usage"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "_Message Filters"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "_Move Folder To..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "_New..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "_Preview"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "_Subscriptions..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "_Vertical View"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "Change the name of this folder"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "Change the properties of this folder"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "Collapse All _Threads"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "Collapse all message threads"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Copy selected message(s) to the clipboard"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Cut selected message(s) to the clipboard"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "E_xpand All Threads"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "E_xpunge"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "Expand all message threads"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "Hide S_elected Messages"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "Hide _Deleted Messages"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "Hide _Read Messages"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Hide deleted messages rather than displaying them with a line through them"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "Mar_k All Messages as Read"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "Mark all messages in the folder as read"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "Paste message(s) from the clipboard"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Permanently remove all deleted messages from this folder"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "Permanently remove this folder"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "Refresh the folder"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "Select Message S_ubthread"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "Select Message _Thread"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "Select _All Messages"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Select all and only the messages that are not currently selected"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "Select all messages in the same thread as the selected message"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "Select all replies to the currently selected message"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "Select all visible messages"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "Show Hidde_n Messages"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "Show messages that have been temporarily hidden"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Temporarily hide all messages that have already been read"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "Temporarily hide the selected messages"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "Threaded Message list"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "_Group By Threads"
-
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "_Message"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "A_dd Sender to Address Book"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "A_pply Filters"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "Add Sender to Address Book"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "All Message _Headers"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "Apply filter rules to the selected messages"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "Check for _Junk"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "Compose _New Message"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Compose a reply to all of the recipients of the selected message"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Compose a reply to the mailing list of the selected message"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Compose a reply to the sender of the selected message"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "Copy selected messages to another folder"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "Copy selected messages to the clipboard"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "Create R_ule"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "Create a Search Folder for these recipients"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "Create a Search Folder for this mailing list"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "Create a Search Folder for this sender"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "Create a Search Folder for this subject"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "Create a rule to filter messages from this sender"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Create a rule to filter messages to these recipients"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Create a rule to filter messages to this mailing list"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "Create a rule to filter messages with this subject"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "Cut selected messages to the clipboard"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "Decrease the text size"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "Display the next important message"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "Display the next message"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "Display the next thread"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "Display the next unread message"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "Display the previous important message"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "Display the previous message"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "Display the previous unread message"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "F_orward As..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "Filter on Mailing _List..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "Filter on Se_nder..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "Filter on _Recipients..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "Filter on _Subject..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "Filter the selected messages for junk status"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "Flag selected messages for follow-up"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "Follow _Up..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "Force images in HTML mail to be loaded"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "Forward the selected message in the body of a new message"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "Forward the selected message quoted like a reply"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "Forward the selected message to someone"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Forward the selected message to someone as an attachment"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "Increase the text size"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "Mar_k as"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "Mark the selected messages as having been read"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "Mark the selected messages as important"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "Mark the selected messages as junk"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "Mark the selected messages as not being junk"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "Mark the selected messages as not having been read"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "Mark the selected messages as unimportant"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "Mark the selected messages for deletion"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "Move selected messages to another folder"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "Next _Important Message"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "Next _Thread"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "Next _Unread Message"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "Not Junk"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "Open a window for composing a mail message"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "Open the selected messages in a new window"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "Open the selected messages in the composer for editing"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "P_revious Unread Message"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "Paste messages from the clipboard"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "Pos_t New Message to Folder"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Post a Repl_y"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Post a message to a Public folder"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Post a reply to a message in a Public folder"
-
-#: ../ui/evolution-mail-message.xml.h:72
-msgid "Pr_evious Important Message"
-msgstr "Pr_evious Important Message"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Preview the message to be printed"
-msgstr "Preview the message to be printed"
-
-#: ../ui/evolution-mail-message.xml.h:77
-msgid "Print this message"
-msgstr "Print this message"
-
-#: ../ui/evolution-mail-message.xml.h:78
-msgid "Re_direct"
-msgstr "Re_direct"
-
-#: ../ui/evolution-mail-message.xml.h:79
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Redirect (bounce) the selected message to someone"
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Reset the text to its original size"
-msgstr "Reset the text to its original size"
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the selected messages as a text file"
-msgstr "Save the selected messages as a text file"
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search Folder from Mailing _List..."
-msgstr "Search Folder from Mailing _List..."
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipien_ts..."
-msgstr "Search Folder from Recipien_ts..."
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Search Folder from S_ubject..."
-msgstr "Search Folder from S_ubject..."
-
-#: ../ui/evolution-mail-message.xml.h:89
-msgid "Search Folder from Sen_der..."
-msgstr "Search Folder from Sen_der..."
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Search for text in the body of the displayed message"
-msgstr "Search for text in the body of the displayed message"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Select _All Text"
-msgstr "Select _All Text"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Select all the text in a message"
-msgstr "Select all the text in a message"
-
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "Set up the page settings for your current printer"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Show a blinking cursor in the body of displayed messages"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages with all email headers"
-msgstr "Show messages with all e-mail headers"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show the raw email source of the message"
-msgstr "Show the raw e-mail source of the message"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Undelete the selected messages"
-msgstr "Undelete the selected messages"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "Uni_mportant"
-msgstr "Uni_mportant"
-
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Zoom _Out"
-msgstr "Zoom _Out"
-
-#: ../ui/evolution-mail-message.xml.h:100
-msgid "_Attached"
-msgstr "_Attached"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Caret Mode"
-msgstr "_Caret Mode"
-
-#: ../ui/evolution-mail-message.xml.h:102
-msgid "_Clear Flag"
-msgstr "_Clear Flag"
-
-#: ../ui/evolution-mail-message.xml.h:105
-msgid "_Delete Message"
-msgstr "_Delete Message"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Find in Message..."
-msgstr "_Find in Message..."
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Flag Completed"
-msgstr "_Flag Completed"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Go To"
-msgstr "_Go To"
-
-#: ../ui/evolution-mail-message.xml.h:111
-msgid "_Important"
-msgstr "_Important"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "_Inline"
-
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Junk"
-msgstr "_Junk"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Load Images"
-msgstr "_Load Images"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Message Source"
-msgstr "_Message Source"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Next Message"
-msgstr "_Next Message"
-
-#: ../ui/evolution-mail-message.xml.h:119
-msgid "_Normal Size"
-msgstr "_Normal Size"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Not Junk"
-msgstr "_Not Junk"
-
-#: ../ui/evolution-mail-message.xml.h:121
-msgid "_Open in New Window"
-msgstr "_Open in New Window"
-
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Previous Message"
-msgstr "_Previous Message"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Quoted"
-msgstr "_Quoted"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_Read"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Save Message..."
-msgstr "_Save Message..."
-
-#: ../ui/evolution-mail-message.xml.h:129
-msgid "_Undelete Message"
-msgstr "_Undelete Message"
-
-#: ../ui/evolution-mail-message.xml.h:130
-msgid "_Unread"
-msgstr "_Unread"
-
-#: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../ui/evolution-mail-message.xml.h:132
-msgid "_Zoom In"
-msgstr "_Zoom In"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Close"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "Main toolbar"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Copy selected memo"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Cut selected memo"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Delete selected memos"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Paste memo from the clipboard"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Previews the list of memos to be printed"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Print the list of memos"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "View the selected memo"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Open Memo"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "Copy selected tasks"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "Cut selected tasks"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "Delete completed tasks"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "Delete selected tasks"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "Mar_k as Complete"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "Mark selected tasks as complete"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "Paste tasks from the clipboard"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "Previews the list of tasks to be printed"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "Print the list of tasks"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Show task preview window"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "Task _Preview"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "View the selected task"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "_Open Task"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "About Evolution..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "Change Evolution's settings"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "Change the visibility of the toolbar"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "Create a new window displaying this folder"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Display window buttons using the desktop toolbar setting"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "Display window buttons with icons and text"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "Display window buttons with icons only"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "Display window buttons with text only"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "Exit the program"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Forget remembered passwords so you will be prompted for them again"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "Hide window buttons"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "I_mport..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "Icons _and Text"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "Import data from other programs"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "Lay_out"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "New _Window"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Open the Frequently Asked Questions webpage"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "Page Set_up..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "Prefere_nces"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "Send / Receive"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "Send / _Receive"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "Send queued items and retrieve new items"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "Set up Pilot configuration"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "Show Side _Bar"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "Show _Status Bar"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "Show _Toolbar"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "Show information about Evolution"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "Submit Bug Report"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "Submit _Bug Report"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Submit a bug report using Bug Buddy"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "Toggle whether we are working offline."
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "Tool_bar Style"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "View/Hide the Side Bar"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "View/Hide the Status Bar"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "Work _Offline"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "_About"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "_Close Window"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "_Forget Passwords"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "_Frequently Asked Questions"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "_Hide Buttons"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "_Icons Only"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "_Quick Reference"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "_Quit"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "_Switcher Appearance"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "_Synchronisation Options..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "_Text Only"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "_Window"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "By _Company"
@@ -22790,11 +21823,11 @@ msgid "With _Status"
 msgstr "With _Status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -22824,19 +21857,19 @@ msgstr ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Collection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Define Views for %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "Define Views"
 
@@ -22846,17 +21879,16 @@ msgid "Define Views for \"%s\""
 msgstr "Define Views for \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Table"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "Instance"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "Save Current View"
 
@@ -22868,51 +21900,11 @@ msgstr "_Create new view"
 msgid "_Replace existing view"
 msgstr "_Replace existing view"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
-msgid "Custom View"
-msgstr "Custom View"
-
-#: ../widgets/menus/gal-view-instance.c:582
-msgid "Save Custom View"
-msgstr "Save Custom View"
-
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
-msgid "Define Views..."
-msgstr "Define Views..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "C_urrent View"
-
-#: ../widgets/menus/gal-view-menus.c:328
-#, c-format
-msgid "Select View: %s"
-msgstr "Select View: %s"
-
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Current view is a customized view"
-msgstr "Current view is a customised view"
-
-#: ../widgets/menus/gal-view-menus.c:377
-msgid "Save Custom View..."
-msgstr "Save Custom View..."
-
-#: ../widgets/menus/gal-view-menus.c:382
-msgid "Save current custom view"
-msgstr "Save current custom view"
-
-#: ../widgets/menus/gal-view-menus.c:396
-msgid "Create or edit views"
-msgstr "Create or edit views"
-
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "Factory"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Define New View"
 
@@ -22928,64 +21920,224 @@ msgstr "Type of View"
 msgid "Type of view:"
 msgstr "Type of view:"
 
-#: ../widgets/misc/e-attachment-bar.c:1138
-msgid "Attachment Bar"
-msgstr "Attachment Bar"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "De_fault"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Cannot attach file %s: %s"
+#: ../widgets/misc/e-account-tree-view.c:224
+#, fuzzy
+msgid "Account Name"
+msgstr "Account name"
+
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "Protocol"
+
+#: ../widgets/misc/e-action-combo-box.c:388
+#, fuzzy
+msgid "Action"
+msgstr "_Actions"
+
+#: ../widgets/misc/e-action-combo-box.c:389
+msgid "A GtkRadioAction"
+msgstr ""
+
+#. Translators: This is a cancelled activity.
+#: ../widgets/misc/e-activity.c:224
+#, fuzzy, c-format
+msgid "%s (cancelled)"
+msgstr "Cancelled"
+
+#. Translators: This is a completed activity.
+#: ../widgets/misc/e-activity.c:227
+#, fuzzy, c-format
+msgid "%s (completed)"
+msgstr "%s (%d%% complete)"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../widgets/misc/e-activity.c:231
+#, fuzzy, c-format
+msgid "%s..."
+msgstr "%s (…)"
+
+#: ../widgets/misc/e-activity.c:236
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Cannot attach file %s: not a regular file"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% complete)"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "File name:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "_Filename:"
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
+msgstr "MIME Type:"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "Could not set as background"
+
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Set as _Background"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Could not send attachment"
+msgstr[1] "Could not send attachments"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "_Send To…"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "Send the selected attachments somewhere"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "Loading"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "Saving"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "Hide _Attachment Bar"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "Show _Attachment Bar"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME type:"
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "Add Attachment"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Suggest automatic display of attachment"
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "A_ttach"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Save Attachment"
+msgstr[1] "Save Attachments"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:636
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "S_ave All"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "A_dd Attachment…"
+
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "_Hide"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "_View Inline"
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "Open with \"%s\""
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Open this attachment in %s"
+
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "Attached message"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "A load operation is already in progress"
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "A save operation is already in progress"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Could not load '%s'"
+
+#: ../widgets/misc/e-attachment.c:1926
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Could not load the attachment"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Could not open '%s'"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Could not open the attachment"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "Attachment contents not loaded"
+
+#: ../widgets/misc/e-attachment.c:2712
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Could not save '%s'"
+
+#: ../widgets/misc/e-attachment.c:2715
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Could not save the attachment"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3645
-#: ../widgets/text/e-text.c:3646
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "Fill colour"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3652
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK fill colour"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Fill stipple"
 
@@ -23009,273 +22161,79 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Minimum width"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Minimum Width"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Spacing"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
-msgid "Now"
-msgstr "Now"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "The time must be in the format: %s"
-
-#: ../widgets/misc/e-cell-percent.c:77
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "The percent value must be between 0 and 100, inclusive"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "Arabic"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "Baltic"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "Central European"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "Chinese"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "Cyrillic"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "Greek"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "Hebrew"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "Japanese"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "Korean"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "Thai"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "Turkish"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "Western European"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "Western European, New"
-
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "Traditional"
-
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "Simplified"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "Ukrainian"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "Visual"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Unknown character set: %s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Character Encoding"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
-msgstr "Other..."
+msgstr "Other…"
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "Ch_aracter Encoding"
-
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:408
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:428
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:450
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:492
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:568
 msgid "No_w"
 msgstr "No_w"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:574
 msgid "_Today"
 msgstr "_Today"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:582
+msgid "_None"
+msgstr "_None"
+
+#: ../widgets/misc/e-dateedit.c:1675
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../widgets/misc/e-dateedit.c:1666
+#: ../widgets/misc/e-dateedit.c:1705
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "Expanded"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "Whether or not the expander is expanded"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "Text of the expander's label"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "Use underline"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "Space to put between the label and the child"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "Label widget"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "A widget to display in place of the usual expander label"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "Expander Size"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "Size of the expander arrow"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "Indicator Spacing"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "Spacing around expander arrow"
-
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
-msgid "Advanced Search"
-msgstr "Advanced Search"
-
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
-msgid "Save Search"
-msgstr "Save Search"
-
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "_Searches"
-msgstr "_Searches"
-
-#: ../widgets/misc/e-filter-bar.c:270
-msgid "Searches"
-msgstr "Searches"
-
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
-msgid "_Save Search..."
-msgstr "_Save Search..."
-
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
-msgid "_Edit Saved Searches..."
-msgstr "_Edit Saved Searches..."
-
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
-msgid "_Advanced Search..."
-msgstr "_Advanced Search..."
-
-#: ../widgets/misc/e-filter-bar.h:107
-msgid "All Accounts"
-msgstr "All Accounts"
-
-#: ../widgets/misc/e-filter-bar.h:108
-msgid "Current Account"
-msgstr "Current Account"
-
-#: ../widgets/misc/e-filter-bar.h:109
-msgid "Current Folder"
-msgstr "Current Folder"
-
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "Current Message"
-
-#: ../widgets/misc/e-image-chooser.c:169
-msgid "Choose Image"
-msgstr "Choose Image"
-
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "World Map"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23283,110 +22241,98 @@ msgstr ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "Online"
+#: ../widgets/misc/e-online-button.c:27
+#, fuzzy
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:30
+#, fuzzy
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+
+#: ../widgets/misc/e-online-button.c:33
+#, fuzzy
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "The button state is online"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-paned.c:180
+#, fuzzy
+msgid "Horizontal Position"
+msgstr "Horizontal pane position"
+
+#: ../widgets/misc/e-paned.c:181
+msgid "Pane position when oriented horizontally"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:192
+#, fuzzy
+msgid "Vertical Position"
+msgstr "Vertical pane position"
+
+#: ../widgets/misc/e-paned.c:193
+msgid "Pane position when oriented vertically"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "Sync with:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "Sync Private Records:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Sync Categories:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
-msgid "Empty message"
-msgstr "Empty message"
-
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
-msgid "Reflow model"
-msgstr "Reflow model"
-
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
-msgid "Column width"
-msgstr "Column width"
-
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
-msgid "Search"
-msgstr "Search"
-
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
-msgid "Click here to change the search type"
-msgstr "Click here to change the search type"
-
-#: ../widgets/misc/e-search-bar.c:603
-msgid "_Search"
-msgstr "_Search"
-
-#: ../widgets/misc/e-search-bar.c:609
-msgid "_Find Now"
-msgstr "_Find Now"
-
-#: ../widgets/misc/e-search-bar.c:610
-msgid "_Clear"
-msgstr "_Clear"
-
-#: ../widgets/misc/e-search-bar.c:865
-msgid "Item ID"
-msgstr "Item ID"
-
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3567
-#: ../widgets/text/e-text.c:3568
-msgid "Text"
-msgstr "Text"
-
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
-msgid "Sho_w: "
-msgstr "Sho_w: "
+#: ../widgets/misc/e-popup-action.c:173
+#, fuzzy
+msgid "Source Action"
+msgstr "Source Account"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
-msgid "Sear_ch: "
-msgstr "Sear_ch: "
+#: ../widgets/misc/e-popup-action.c:174
+#, fuzzy
+msgid "The source action to proxy"
+msgstr "The orientation of the tray."
 
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
-msgid " i_n "
-msgstr " i_n "
+#: ../widgets/misc/e-preferences-window.c:216
+msgid "Evolution Preferences"
+msgstr "Evolution Preferences"
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "Cursor Row"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "Cursor Column"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "Sorter"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Selection Mode"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Cursor Mode"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "When de_leted:"
 
@@ -23410,19 +22356,19 @@ msgstr "<b>Status Tracking</b>"
 msgid "A_uto-delete sent item"
 msgstr "A_uto-delete sent item"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "Creat_e a sent item to track information"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "Deli_vered and opened"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "Gene_ral Options"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23430,7 +22376,7 @@ msgstr ""
 "None\n"
 "Mail Receipt"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23446,15 +22392,15 @@ msgstr ""
 "Top Secret\n"
 "For Your Eyes Only"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "R_eply requested"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "Sta_tus Tracking"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23466,30 +22412,34 @@ msgstr ""
 "Standard\n"
 "Low"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "When acce_pted:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "When co_mpleted:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "When decli_ned:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "Wi_thin"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "_After:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_All information"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "_Classification:"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23515,46 +22465,142 @@ msgstr "_When convenient"
 msgid "_When opened:"
 msgstr "_When opened:"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:130
+#: ../widgets/misc/e-signature-editor.c:489
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "Unnamed"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% complete)"
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Save and Close"
+msgstr "_Save and Close"
+
+#: ../widgets/misc/e-signature-editor.c:361
+msgid "Edit Signature"
+msgstr "Edit Signature"
+
+#: ../widgets/misc/e-signature-editor.c:376
+msgid "_Signature Name:"
+msgstr "_Signature Name:"
+
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+msgid "Add Signature Script"
+msgstr "Add signature script"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+msgid "Edit Signature Script"
+msgstr "Edit Signature"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "Add _Script"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+#, fuzzy
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used for display purposes only."
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+msgid "S_cript:"
+msgstr "_Script:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+msgid "Script file must be executable."
+msgstr "The script file must exist and be executable."
+
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "Click here to go to URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Edit Master Category List..."
+#: ../widgets/misc/e-web-view.c:305
+#, fuzzy
+msgid "Copy the link to the clipboard"
+msgstr "Copy things to the clipboard."
+
+#: ../widgets/misc/e-web-view.c:315
+#, fuzzy
+msgid "Open the link in a web browser"
+msgstr "_Open Link in Browser"
+
+#: ../widgets/misc/e-web-view.c:323
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "Copy _E-mail Address"
+
+#: ../widgets/misc/e-web-view.c:325
+#, fuzzy
+msgid "Copy the email address to the clipboard"
+msgstr "Copy things to the clipboard."
 
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "Item(s) belong to these _categories:"
+#: ../widgets/misc/e-web-view.c:332
+#, fuzzy
+msgid "Send a mail message to this address"
+msgstr "Convert a mail message to a task."
+
+#: ../widgets/misc/e-web-view.c:574
+#, c-format
+msgid "Click to mail %s"
+msgstr "Click to mail %s"
+
+#: ../widgets/misc/e-web-view.c:576 ../widgets/misc/e-web-view.c:578
+#: ../widgets/misc/e-web-view.c:580
+#, c-format
+msgid "Click to call %s"
+msgstr "Click to call %s"
+
+#: ../widgets/misc/e-web-view.c:582
+msgid "Click to hide/unhide addresses"
+msgstr "Click to hide/unhide addresses"
+
+#: ../widgets/misc/e-web-view.c:584
+#, c-format
+msgid "Click to open %s"
+msgstr "Click to open %s"
+
+#: ../widgets/misc/ea-calendar-item.c:295
+#: ../widgets/misc/ea-calendar-item.c:301
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
 
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "_Available Categories:"
+#: ../widgets/misc/ea-calendar-item.c:303
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendar: from %s to %s"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "categories"
+#: ../widgets/misc/ea-calendar-item.c:338
+msgid "evolution calendar item"
+msgstr "evolution calendar item"
 
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "popup list"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%H:%M"
+#: ../widgets/table/e-cell-date-edit.c:296
+msgid "Now"
+msgstr "Now"
+
+#: ../widgets/table/e-cell-date-edit.c:320
+msgid "OK"
+msgstr "OK"
+
+#: ../widgets/table/e-cell-date-edit.c:846
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "The time must be in the format: %s"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "The percent value must be between 0 and 100, inclusive"
 
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
@@ -23568,26 +22614,32 @@ msgstr "Focused Column"
 msgid "Unselected Column"
 msgstr "Unselected Column"
 
-#: ../widgets/table/e-cell-text.c:1799
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Strikeout Column"
 
-#: ../widgets/table/e-cell-text.c:1806
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Underline Column"
 
-#: ../widgets/table/e-cell-text.c:1813
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "Bold Column"
 
-#: ../widgets/table/e-cell-text.c:1820
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "Colour Column"
 
-#: ../widgets/table/e-cell-text.c:1834
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "BG Colour Column"
 
+#: ../widgets/table/e-table-click-to-add.c:578
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "click to add"
+
 #: ../widgets/table/e-table-config.c:152
 msgid "State"
 msgstr "State"
@@ -23608,12 +22660,12 @@ msgstr "Not sorted"
 msgid "No grouping"
 msgstr "No grouping"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Show Fields"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Available Fields"
 
@@ -23677,11 +22729,11 @@ msgstr "Then By"
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
-msgstr "_Fields Shown..."
+msgstr "_Fields Shown…"
 
 #: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
-msgstr "_Group By..."
+msgstr "_Group By…"
 
 #: ../widgets/table/e-table-config.glade.h:22
 msgid "_Show field in View"
@@ -23693,25 +22745,11 @@ msgstr "_Show these fields in order:"
 
 #: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
-msgstr "_Sort..."
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "DnD code"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "Full Header"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+msgstr "_Sort…"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
-msgstr "Add a column..."
+msgstr "Add a column…"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
@@ -23725,93 +22763,93 @@ msgstr ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d item)"
 msgstr[1] "%s : %s (%d items)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d items)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Alternating Row Colours"
 
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Horizontal Draw Grid"
 
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Vertical Draw Grid"
 
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Draw focus"
 
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Cursor mode"
 
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Selection model"
 
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Length Threshold"
 
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Uniform row height"
 
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
@@ -23847,7 +22885,7 @@ msgstr "Remove This _Column"
 
 #: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
-msgstr "Add a C_olumn..."
+msgstr "Add a C_olumn…"
 
 #: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
@@ -23859,11 +22897,11 @@ msgstr "B_est Fit"
 
 #: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
-msgstr "Format Column_s..."
+msgstr "Format Column_s…"
 
 #: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
-msgstr "Custo_mise Current View..."
+msgstr "Custo_mise Current View…"
 
 #: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
@@ -23874,159 +22912,2612 @@ msgstr "_Sort By"
 msgid "_Custom"
 msgstr "_Custom"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "Font Description"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "Sort Info"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Tree"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Table header"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Table model"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Cursor row"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Sort Info"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Always search"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Use click to add"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Tree"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree table adapter"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "Retro Look"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Draw lines and +/- expanders."
 
-#: ../widgets/text/e-text.c:2737
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "Expander Size"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "Size of the expander arrow"
+
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "popup"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "pop up a child"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr "edit"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "begin editing this cell"
+
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "toggle"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "toggle the cell"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr "expand"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+msgid "expands the row in the ETree containing this cell"
+msgstr "expands the row in the ETree containing this cell"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "collapse"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+msgid "collapses the row in the ETree containing this cell"
+msgstr "collapses the row in the ETree containing this cell"
+
+#: ../widgets/table/gal-a11y-e-cell.c:120
+msgid "Table Cell"
+msgstr "Table Cell"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "click"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "sort"
+
+#: ../widgets/text/e-text.c:2719
+msgid "Select All"
+msgstr "Select All"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Input Methods"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Event Processor"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+msgid "Text"
+msgstr "Text"
+
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Bold"
 
-#: ../widgets/text/e-text.c:3581 ../widgets/text/e-text.c:3582
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Strikeout"
 
-#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "Anchor"
 
-#: ../widgets/text/e-text.c:3596 ../widgets/text/e-text.c:3597
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Justification"
 
-#: ../widgets/text/e-text.c:3603 ../widgets/text/e-text.c:3604
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "Clip Width"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Clip Height"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3624 ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Fill clip rectangle"
 
-#: ../widgets/text/e-text.c:3631 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X Offset"
 
-#: ../widgets/text/e-text.c:3638 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y Offset"
 
-#: ../widgets/text/e-text.c:3674 ../widgets/text/e-text.c:3675
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "Text width"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Text height"
 
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Use ellipsis"
 
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Ellipsis"
 
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Line wrap"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "Break characters"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Max lines"
 
-#: ../widgets/text/e-text.c:3746 ../widgets/text/e-text.c:3747
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "Draw borders"
 
-#: ../widgets/text/e-text.c:3753 ../widgets/text/e-text.c:3754
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Allow newlines"
 
-#: ../widgets/text/e-text.c:3760 ../widgets/text/e-text.c:3761
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "Draw background"
 
-#: ../widgets/text/e-text.c:3767 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "Draw button"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "Cursor position"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3782 ../widgets/text/e-text.c:3784
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM Context"
 
-#: ../widgets/text/e-text.c:3790 ../widgets/text/e-text.c:3791
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "Handle Popup"
 
+#~ msgid "search bar"
+#~ msgstr "search bar"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "evolution calendar search bar"
+
+#~ msgid "Combo Button"
+#~ msgstr "Combo Button"
+
+#~ msgid "Activate Default"
+#~ msgstr "Activate Default"
+
+#~ msgid "Popup Menu"
+#~ msgstr "Popup Menu"
+
+#~ msgid "C_ontacts"
+#~ msgstr "C_ontacts"
+
+#~ msgid "Configure contacts and autocompletion here"
+#~ msgstr "Configure contacts and autocompletion here"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "Evolution Address Book"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "Evolution Address Book address popup"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "Evolution Address Book address viewer"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "Evolution Address Book card viewer"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "Evolution Address Book component"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "Evolution S/MIME Certificate Management Control"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "Evolution folder settings configuration control"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "Manage your S/MIME certificates here"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "Failed upgrading Address Book settings or folders."
+
+#~ msgid "Save As vCard..."
+#~ msgstr "Save As vCard…"
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "Contact Source Selector"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+
+#~ msgid "Look up in address books"
+#~ msgstr "Look up in address books"
+
+#~ msgid "Name begins with"
+#~ msgstr "Name begins with"
+
+#~ msgid "_Print"
+#~ msgstr "_Print"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "Cop_y to Address Book…"
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "Mo_ve to Address Book…"
+
+#~ msgid "Cu_t"
+#~ msgstr "Cu_t"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copy"
+
+#~ msgid "P_aste"
+#~ msgstr "P_aste"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "Querying Address Book…"
+
+#~ msgid "Calendars"
+#~ msgstr "Calendars"
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "Configure your timezone, Calendar and Task List here "
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "Evolution Calendar and Tasks"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "Evolution Calendar configuration control"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "Evolution Calendar scheduling message viewer"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "Evolution Calendar/Task editor"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "Evolution's Calendar component"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "Evolution's Memos component"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "Evolution's Tasks component"
+
+#~ msgid "Memo_s"
+#~ msgstr "Memo_s"
+
+#~ msgid "_Calendars"
+#~ msgstr "_Calendars"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "Evolution Calendar alarm notification service"
+
+#~ msgid "minute"
+#~ msgid_plural "minutes"
+#~ msgstr[0] "minute"
+#~ msgstr[1] "minutes"
+
+#~ msgid "Start time"
+#~ msgstr "Start time"
+
+#~ msgid "Dismiss _All"
+#~ msgstr "Dismiss _All"
+
+#~ msgid "Snooze _time:"
+#~ msgstr "Snooze _time:"
+
+#~ msgid "_Dismiss"
+#~ msgstr "_Dismiss"
+
+#~ msgid "_Snooze"
+#~ msgstr "_Snooze"
+
+#~ msgid "location of appointment"
+#~ msgstr "location of appointment"
+
+#~ msgid "No summary available."
+#~ msgstr "No summary available."
+
+#~ msgid "No description available."
+#~ msgstr "No description available."
+
+#~ msgid "No location information available."
+#~ msgstr "No location information available."
+
+#~ msgid "You have %d alarms"
+#~ msgstr "You have %d alarms"
+
+#~ msgid ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "email notifications yet, but this reminder was\n"
+#~ "configured to send an email.  Evolution will display\n"
+#~ "a normal reminder dialog box instead."
+#~ msgstr ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "e-mail notifications yet, but this reminder was\n"
+#~ "configured to send an e-mail.  Evolution will display\n"
+#~ "a normal reminder dialogue box instead."
+
+#~ msgid ""
+#~ "An Evolution Calendar reminder is about to trigger. This reminder is "
+#~ "configured to run the following program:\n"
+#~ "\n"
+#~ "        %s\n"
+#~ "\n"
+#~ "Are you sure you want to run this program?"
+#~ msgstr ""
+#~ "An Evolution Calendar reminder is about to trigger. This reminder is "
+#~ "configured to run the following program:\n"
+#~ "\n"
+#~ "        %s\n"
+#~ "\n"
+#~ "Are you sure you want to run this program?"
+
+#~ msgid "Do not ask me about this program again."
+#~ msgstr "Do not ask me about this program again."
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "Could not initialise Bonobo"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running…"
+
+#~ msgid "invalid time"
+#~ msgstr "invalid time"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+
+#~ msgid "Category is"
+#~ msgstr "Category is"
+
+#~ msgid "Comment contains"
+#~ msgstr "Comment contains"
+
+#~ msgid "Location contains"
+#~ msgstr "Location contains"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "_Make available for offline use"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "_Do not make available for offline use"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "Failed upgrading calendars."
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr "Unable to open the calendar '%s' for creating events and meetings"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "There is no calendar available for creating events and meetings"
+
+#~ msgid "New appointment"
+#~ msgstr "New appointment"
+
+#~ msgid "New meeting"
+#~ msgstr "New meeting"
+
+#~ msgid "New all day appointment"
+#~ msgstr "New all day appointment"
+
+#~ msgid "New calendar"
+#~ msgstr "New calendar"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "Error while opening the calendar"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "Method not supported when opening the calendar"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "Permission denied to open the calendar"
+
+#~ msgid "Unknown error"
+#~ msgstr "Unknown error"
+
+#~ msgid "_Add "
+#~ msgstr "_Add "
+
+#~ msgid "_Save As..."
+#~ msgstr "_Save As…"
+
+#~ msgid "P_rint..."
+#~ msgstr "P_rint…"
+
+#~ msgid "C_ut"
+#~ msgstr "C_ut"
+
+#~ msgid "_Paste"
+#~ msgstr "_Paste"
+
+#~ msgid "_Forward as iCalendar"
+#~ msgstr "_Forward as iCalendar"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "_Mark Selected Tasks as Complete"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "_Mark Selected Tasks as Incomplete"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "_Delete Selected Tasks"
+
+#~ msgid "Select T_oday"
+#~ msgstr "Select T_oday"
+
+#~ msgid "_Select Date..."
+#~ msgstr "_Select Date…"
+
+#~ msgid "Pri_nt..."
+#~ msgstr "Pri_nt…"
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "_Delete Selected Memos"
+
+#~ msgid "Completing tasks..."
+#~ msgstr "Completing tasks…"
+
+#~ msgid "Expunging"
+#~ msgstr "Expunging"
+
+#~ msgid "_Custom View"
+#~ msgstr "_Custom View"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "_Save Custom View"
+
+#~ msgid "_Define Views..."
+#~ msgstr "_Define Views…"
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "Loading tasks at %s"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "Loading memos at %s"
+
+#~ msgid "Purging"
+#~ msgstr "Purging"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "Failed upgrading memos."
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr "Unable to open the memo list '%s' for creating events and meetings"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "There is no calendar available for creating memos"
+
+#~ msgid "New shared memo"
+#~ msgstr "New shared memo"
+
+#~ msgid "New memo list"
+#~ msgstr "New memo list"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "Memo li_st"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "Failed upgrading tasks."
+
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
+#~ msgstr "Unable to open the task list '%s' for creating events and meetings"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "There is no calendar available for creating tasks"
+
+#~ msgid "New task"
+#~ msgstr "New task"
+
+#~ msgid "New assigned task"
+#~ msgstr "New assigned task"
+
+#~ msgid "New task list"
+#~ msgstr "New task list"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "Tas_k list"
+
+#~ msgid "Hide"
+#~ msgstr "Hide"
+
+#~ msgid "Component"
+#~ msgstr "Component"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "Label name cannot be empty."
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr ""
+#~ "Configure mail preferences, including security and message display, here"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr "Configure spell-checking, signatures, and the message composer here"
+
+#~ msgid "Configure your email accounts here"
+#~ msgstr "Configure your e-mail accounts here"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "Configure your network connection settings here"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "Evolution Mail"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "Evolution Mail accounts configuration control"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "Evolution Mail component"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "Evolution Mail composer"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "Evolution Mail composer configuration control"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "Evolution Mail preferences control"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "Evolution Network configuration control"
+
+#~ msgid "[Default]"
+#~ msgstr "[Default]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "Signature(s)"
+
+#~ msgid "Account Search"
+#~ msgstr "Account Search"
+
+#~ msgid "All Account Search"
+#~ msgstr "All Account Search"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "_Copy to Folder"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "_Move to Folder"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "Cancel _Drag"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "Open in _New Window"
+
+#~ msgid "_Move..."
+#~ msgstr "_Move…"
+
+#~ msgid "Re_fresh"
+#~ msgstr "Re_fresh"
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "_Unread Search Folder"
+
+#~ msgid "U_ndelete"
+#~ msgstr "U_ndelete"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "Fla_g Completed"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "Cl_ear Flag"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Crea_te Rule From Message"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "Search Folder based on _Subject"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "Search Folder based on Se_nder"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "Search Folder based on _Recipients"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "Filter based on Sub_ject"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "Filter based on Sen_der"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "Filter based on Re_cipients"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "Filter based on _Mailing List"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "_Fit to Width"
+
+#~ msgid "Show _Original Size"
+#~ msgstr "Show _Original Size"
+
+#~ msgid "Tag"
+#~ msgstr "Tag"
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "untitled_image.%s"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "_Reply to sender"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Open in %s…"
+
+#~ msgid "Add address"
+#~ msgstr "Add address"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "Default height of the message window."
+
+#~ msgid "Default width of the message window."
+#~ msgstr "Default width of the message window."
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+
+#~ msgid "Message Window default height"
+#~ msgstr "Message Window default height"
+
+#~ msgid "Message Window default width"
+#~ msgstr "Message Window default width"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "Use side-by-side or wide layout"
+
+#~ msgid "New Mail Message"
+#~ msgstr "New Mail Message"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "New Mail Folder"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "Failed upgrading Mail settings or folders."
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Baltic (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Baltic (ISO-8859-4)"
+
+#~ msgid "Email Accounts"
+#~ msgstr "E-mail Accounts"
+
+#~ msgid ""
+#~ "If the server uses a non-standard port then specify the server address as "
+#~ "\"server-name:port-number\""
+#~ msgstr ""
+#~ "If the server uses a non-standard port then specify the server address as "
+#~ "\"server-name:port-number\""
+
+#~ msgid "Signatures Table"
+#~ msgstr "Signatures Table"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "Subject or Recipients contains"
+
+#~ msgid "Subject or Sender contains"
+#~ msgstr "Subject or Sender contains"
+
+#~ msgid "Audio Inline"
+#~ msgstr "Audio Inline"
+
+#~ msgid "Copy Tool"
+#~ msgstr "Copy Tool"
+
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "Unsubscribe Folders"
+
+#~ msgid ""
+#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
+#~ "tree."
+#~ msgstr ""
+#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
+#~ "tree."
+
+#~ msgid "Disable an account by right-clicking on it in the folder tree."
+#~ msgstr "Disable an account by right-clicking on it in the folder tree."
+
+#~ msgid "Specify _filename:"
+#~ msgstr "Specify _filename:"
+
+#~ msgid "Pl_ay"
+#~ msgstr "Pl_ay"
+
+#~ msgid "Mail-to-Task"
+#~ msgstr "Mail-to-Task"
+
+#~ msgid "Contact list _owner"
+#~ msgstr "Contact list _owner"
+
+#~ msgid "Get list _archive"
+#~ msgstr "Get list _archive"
+
+#~ msgid "Get list _usage information"
+#~ msgstr "Get list _usage information"
+
+#~ msgid "_Post message to list"
+#~ msgstr "_Post message to list"
+
+#~ msgid "_Subscribe to list"
+#~ msgstr "_Subscribe to list"
+
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "_Un-subscribe to list"
+
+#~ msgid "Mono Loader"
+#~ msgstr "Mono Loader"
+
+#~ msgid "Support plugins written in Mono."
+#~ msgstr "Support plugins written in Mono."
+
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "A plugin which loads other plugins written using Python."
+
+#~ msgid "Python Loader"
+#~ msgstr "Python Loader"
+
+#  calendar:prompt-save-task title
+#~ msgid "_Save to Disk"
+#~ msgstr "_Save to Disk"
+
+#~ msgid "Quickly select a single calendar or task list for viewing."
+#~ msgstr "Quickly select a single calendar or task list for viewing."
+
+#~ msgid "Select One Source"
+#~ msgstr "Select One Source"
+
+#~ msgid "Evolution Shell"
+#~ msgstr "Evolution Shell"
+
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "Evolution Shell Config factory"
+
+#~ msgid "Evolution Test"
+#~ msgstr "Evolution Test"
+
+#~ msgid "Evolution Test component"
+#~ msgstr "Evolution Test component"
+
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>Active Connections</b>"
+
+#~ msgid "Active Connections"
+#~ msgstr "Active Connections"
+
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr "Click OK to close these connections and go offline"
+
+#~ msgid "_Import"
+#~ msgstr "_Import"
+
+#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#~ msgstr "The GNOME Pilot tools do not appear to be installed on this system."
+
+#~ msgid "Error executing %s. (%s)"
+#~ msgstr "Error executing %s. (%s)"
+
+#~ msgid "Work Offline"
+#~ msgstr "Work Offline"
+
+#~ msgid "Evolution is in the process of going offline."
+#~ msgstr "Evolution is in the process of going offline."
+
+#~ msgid "Unknown system error."
+#~ msgstr "Unknown system error."
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Invalid arguments"
+
+#~ msgid "Cannot register on OAF"
+#~ msgstr "Cannot register on OAF"
+
+#~ msgid "Configuration Database not found"
+#~ msgstr "Configuration Database not found"
+
+#~ msgid "New Test"
+#~ msgstr "New Test"
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Cannot start Evolution"
+
+#~ msgid "Evolution can not start."
+#~ msgstr "Evolution can not start."
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+#~ msgstr ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+#~ msgstr ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+
+#~ msgid "Copy"
+#~ msgstr "Copy"
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copy to Folder…"
+
+#~ msgid "Create a new address book folder"
+#~ msgstr "Create a new address book folder"
+
+#~ msgid "Cut"
+#~ msgstr "Cut"
+
+#~ msgid "Forward Contact"
+#~ msgstr "Forward Contact"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Move to Folder…"
+
+#~ msgid "Paste"
+#~ msgstr "Paste"
+
+#~ msgid "Save as VCard..."
+#~ msgstr "Save as vCard…"
+
+#~ msgid "Select _All"
+#~ msgstr "Select _All"
+
+#~ msgid "Send message to contact"
+#~ msgstr "Send message to contact"
+
+#~ msgid "St_op"
+#~ msgstr "St_op"
+
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "_Copy Folder Contacts To"
+
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "_Move Folder Contacts To"
+
+#~ msgid "_Rename"
+#~ msgstr "_Rename"
+
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "_Save Contact as vCard…"
+
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "_Save Folder Contacts As vCard"
+
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "Delete _all Occurrences"
+
+#~ msgid "Show the working week"
+#~ msgstr "Show the working week"
+
+#~ msgid "View the debug console for log messages"
+#~ msgstr "View the debug console for log messages"
+
+#~ msgid "_Debug Logs"
+#~ msgstr "_Debug Logs"
+
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "Show message preview side-by-side with the message list"
+
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "Copy selected message(s) to the clipboard"
+
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "Cut selected message(s) to the clipboard"
+
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "Paste message(s) from the clipboard"
+
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr "Select all and only the messages that are not currently selected"
+
+#~ msgid "Cut selected messages to the clipboard"
+#~ msgstr "Cut selected messages to the clipboard"
+
+#~ msgid "Not Junk"
+#~ msgstr "Not Junk"
+
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "Paste messages from the clipboard"
+
+#~ msgid "_Save Message..."
+#~ msgstr "_Save Message…"
+
+#~ msgid "Close"
+#~ msgstr "Close"
+
+#~ msgid "Main toolbar"
+#~ msgstr "Main toolbar"
+
+#~ msgid "Mar_k as Complete"
+#~ msgstr "Mar_k as Complete"
+
+#~ msgid "Show task preview window"
+#~ msgstr "Show task preview window"
+
+#~ msgid "About Evolution..."
+#~ msgstr "About Evolution…"
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "Change the visibility of the toolbar"
+
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr "Forget remembered passwords so you will be prompted for them again"
+
+#~ msgid "Hide window buttons"
+#~ msgstr "Hide window buttons"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "Page Set_up…"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "Prefere_nces"
+
+#~ msgid "Send / Receive"
+#~ msgstr "Send / Receive"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "Submit Bug Report"
+
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "Toggle whether we are working offline."
+
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "View/Hide the Side Bar"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "View/Hide the Status Bar"
+
+#~ msgid "Work _Offline"
+#~ msgstr "Work _Offline"
+
+#~ msgid "_About"
+#~ msgstr "_About"
+
+#~ msgid "_Frequently Asked Questions"
+#~ msgstr "_Frequently Asked Questions"
+
+#~ msgid "_Hide Buttons"
+#~ msgstr "_Hide Buttons"
+
+#~ msgid "_Quit"
+#~ msgstr "_Quit"
+
+#~ msgid "Save Custom View"
+#~ msgstr "Save Custom View"
+
+#~ msgid "Unknown character set: %s"
+#~ msgstr "Unknown character set: %s"
+
+#~ msgid "_Searches"
+#~ msgstr "_Searches"
+
+#~ msgid "Choose Image"
+#~ msgstr "Choose Image"
+
+#~ msgid "Empty message"
+#~ msgstr "Empty message"
+
+#~ msgid "Reflow model"
+#~ msgstr "Reflow model"
+
+#~ msgid "Column width"
+#~ msgstr "Column width"
+
+#~ msgid "Search"
+#~ msgstr "Search"
+
+#~ msgid "_Clear"
+#~ msgstr "_Clear"
+
+#~ msgid "Item ID"
+#~ msgstr "Item ID"
+
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Toggle Attachment Bar"
+
+#~ msgid "activate"
+#~ msgstr "activate"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Type:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "Add Address Book"
+
+#~ msgid "Anonymously"
+#~ msgstr "Anonymously"
+
+#~ msgid "Basic"
+#~ msgstr "Basic"
+
+#~ msgid "Distinguished name"
+#~ msgstr "Distinguished name"
+
+#~ msgid "Email address"
+#~ msgstr "E-mail address"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "Find Possible Search Bases"
+
+#~ msgid "Search filter"
+#~ msgstr "Search filter"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "Using email address"
+#~ msgstr "Using e-mail address"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "Whenever Possible"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "_Add Address Book"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "_Notes:"
+#~ msgstr "_Notes:"
+
+#~ msgid "United States"
+#~ msgstr "United States"
+
+#~ msgid "Afghanistan"
+#~ msgstr "Afghanistan"
+
+#~ msgid "Albania"
+#~ msgstr "Albania"
+
+#~ msgid "Algeria"
+#~ msgstr "Algeria"
+
+#~ msgid "American Samoa"
+#~ msgstr "American Samoa"
+
+#~ msgid "Andorra"
+#~ msgstr "Andorra"
+
+#~ msgid "Angola"
+#~ msgstr "Angola"
+
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
+
+#~ msgid "Antarctica"
+#~ msgstr "Antarctica"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "Antigua And Barbuda"
+
+#~ msgid "Argentina"
+#~ msgstr "Argentina"
+
+#~ msgid "Armenia"
+#~ msgstr "Armenia"
+
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
+
+#~ msgid "Australia"
+#~ msgstr "Australia"
+
+#~ msgid "Austria"
+#~ msgstr "Austria"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbaijan"
+
+#~ msgid "Bahamas"
+#~ msgstr "Bahamas"
+
+#~ msgid "Bahrain"
+#~ msgstr "Bahrain"
+
+#~ msgid "Bangladesh"
+#~ msgstr "Bangladesh"
+
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
+
+#~ msgid "Belarus"
+#~ msgstr "Belarus"
+
+#~ msgid "Belgium"
+#~ msgstr "Belgium"
+
+#~ msgid "Belize"
+#~ msgstr "Belize"
+
+#~ msgid "Benin"
+#~ msgstr "Benin"
+
+#~ msgid "Bermuda"
+#~ msgstr "Bermuda"
+
+#~ msgid "Bhutan"
+#~ msgstr "Bhutan"
+
+#~ msgid "Bolivia"
+#~ msgstr "Bolivia"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "Bosnia And Herzegowina"
+
+#~ msgid "Botswana"
+#~ msgstr "Botswana"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "Bouvet Island"
+
+#~ msgid "Brazil"
+#~ msgstr "Brazil"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "British Indian Ocean Territory"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunei Darussalam"
+
+#~ msgid "Bulgaria"
+#~ msgstr "Bulgaria"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
+
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
+
+#~ msgid "Cambodia"
+#~ msgstr "Cambodia"
+
+#~ msgid "Cameroon"
+#~ msgstr "Cameroon"
+
+#~ msgid "Canada"
+#~ msgstr "Canada"
+
+#~ msgid "Cape Verde"
+#~ msgstr "Cape Verde"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "Cayman Islands"
+
+#~ msgid "Central African Republic"
+#~ msgstr "Central African Republic"
+
+#~ msgid "Chad"
+#~ msgstr "Chad"
+
+#~ msgid "Chile"
+#~ msgstr "Chile"
+
+#~ msgid "China"
+#~ msgstr "China"
+
+#~ msgid "Christmas Island"
+#~ msgstr "Christmas Island"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Cocos (Keeling) Islands"
+
+#~ msgid "Colombia"
+#~ msgstr "Colombia"
+
+#~ msgid "Comoros"
+#~ msgstr "Comoros"
+
+#~ msgid "Congo"
+#~ msgstr "Congo"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "Congo, The Democratic Republic Of The"
+
+#~ msgid "Cook Islands"
+#~ msgstr "Cook Islands"
+
+#~ msgid "Costa Rica"
+#~ msgstr "Costa Rica"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "Cote d'Ivoire"
+
+#~ msgid "Croatia"
+#~ msgstr "Croatia"
+
+#~ msgid "Cuba"
+#~ msgstr "Cuba"
+
+#~ msgid "Cyprus"
+#~ msgstr "Cyprus"
+
+#~ msgid "Czech Republic"
+#~ msgstr "Czech Republic"
+
+#~ msgid "Denmark"
+#~ msgstr "Denmark"
+
+#~ msgid "Djibouti"
+#~ msgstr "Djibouti"
+
+#~ msgid "Dominica"
+#~ msgstr "Dominica"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "Dominican Republic"
+
+#~ msgid "Ecuador"
+#~ msgstr "Ecuador"
+
+#~ msgid "Egypt"
+#~ msgstr "Egypt"
+
+#~ msgid "El Salvador"
+#~ msgstr "El Salvador"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Equatorial Guinea"
+
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
+
+#~ msgid "Estonia"
+#~ msgstr "Estonia"
+
+#~ msgid "Ethiopia"
+#~ msgstr "Ethiopia"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "Falkland Islands"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "Faroe Islands"
+
+#~ msgid "Fiji"
+#~ msgstr "Fiji"
+
+#~ msgid "Finland"
+#~ msgstr "Finland"
+
+#~ msgid "France"
+#~ msgstr "France"
+
+#~ msgid "French Guiana"
+#~ msgstr "French Guiana"
+
+#~ msgid "French Polynesia"
+#~ msgstr "French Polynesia"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "French Southern Territories"
+
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
+
+#~ msgid "Gambia"
+#~ msgstr "Gambia"
+
+#~ msgid "Georgia"
+#~ msgstr "Georgia"
+
+#~ msgid "Germany"
+#~ msgstr "Germany"
+
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
+
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltar"
+
+#~ msgid "Greece"
+#~ msgstr "Greece"
+
+#~ msgid "Greenland"
+#~ msgstr "Greenland"
+
+#~ msgid "Grenada"
+#~ msgstr "Grenada"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadeloupe"
+
+#~ msgid "Guam"
+#~ msgstr "Guam"
+
+#~ msgid "Guatemala"
+#~ msgstr "Guatemala"
+
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
+
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Guinea-Bissau"
+
+#~ msgid "Guyana"
+#~ msgstr "Guyana"
+
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "Heard And McDonald Islands"
+
+#~ msgid "Holy See"
+#~ msgstr "Holy See"
+
+#~ msgid "Honduras"
+#~ msgstr "Honduras"
+
+#~ msgid "Hong Kong"
+#~ msgstr "Hong Kong"
+
+#~ msgid "Hungary"
+#~ msgstr "Hungary"
+
+#~ msgid "Iceland"
+#~ msgstr "Iceland"
+
+#~ msgid "India"
+#~ msgstr "India"
+
+#~ msgid "Indonesia"
+#~ msgstr "Indonesia"
+
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Iraq"
+#~ msgstr "Iraq"
+
+#~ msgid "Ireland"
+#~ msgstr "Ireland"
+
+#~ msgid "Isle of Man"
+#~ msgstr "Isle of Man"
+
+#~ msgid "Israel"
+#~ msgstr "Israel"
+
+#~ msgid "Italy"
+#~ msgstr "Italy"
+
+#~ msgid "Jamaica"
+#~ msgstr "Jamaica"
+
+#~ msgid "Japan"
+#~ msgstr "Japan"
+
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
+
+#~ msgid "Jordan"
+#~ msgstr "Jordan"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "Kazakhstan"
+
+#~ msgid "Kenya"
+#~ msgstr "Kenya"
+
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "Korea, Democratic People's Republic Of"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "Korea, Republic Of"
+
+#~ msgid "Kuwait"
+#~ msgstr "Kuwait"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kyrgyzstan"
+
+#~ msgid "Laos"
+#~ msgstr "Laos"
+
+#~ msgid "Latvia"
+#~ msgstr "Latvia"
+
+#~ msgid "Lebanon"
+#~ msgstr "Lebanon"
+
+#~ msgid "Lesotho"
+#~ msgstr "Lesotho"
+
+#~ msgid "Liberia"
+#~ msgstr "Liberia"
+
+#~ msgid "Libya"
+#~ msgstr "Libya"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "Liechtenstein"
+
+#~ msgid "Lithuania"
+#~ msgstr "Lithuania"
+
+#~ msgid "Luxembourg"
+#~ msgstr "Luxembourg"
+
+#~ msgid "Macao"
+#~ msgstr "Macao"
+
+#~ msgid "Macedonia"
+#~ msgstr "Macedonia"
+
+#~ msgid "Madagascar"
+#~ msgstr "Madagascar"
+
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
+
+#~ msgid "Malaysia"
+#~ msgstr "Malaysia"
+
+#~ msgid "Maldives"
+#~ msgstr "Maldives"
+
+#~ msgid "Mali"
+#~ msgstr "Mali"
+
+#~ msgid "Malta"
+#~ msgstr "Malta"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "Marshall Islands"
+
+#~ msgid "Martinique"
+#~ msgstr "Martinique"
+
+#~ msgid "Mauritania"
+#~ msgstr "Mauritania"
+
+#~ msgid "Mauritius"
+#~ msgstr "Mauritius"
+
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
+
+#~ msgid "Mexico"
+#~ msgstr "Mexico"
+
+#~ msgid "Micronesia"
+#~ msgstr "Micronesia"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Moldova, Republic Of"
+
+#~ msgid "Monaco"
+#~ msgstr "Monaco"
+
+#~ msgid "Mongolia"
+#~ msgstr "Mongolia"
+
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
+
+#~ msgid "Morocco"
+#~ msgstr "Morocco"
+
+#~ msgid "Mozambique"
+#~ msgstr "Mozambique"
+
+#~ msgid "Myanmar"
+#~ msgstr "Myanmar"
+
+#~ msgid "Namibia"
+#~ msgstr "Namibia"
+
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
+
+#~ msgid "Nepal"
+#~ msgstr "Nepal"
+
+#~ msgid "Netherlands"
+#~ msgstr "Netherlands"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Netherlands Antilles"
+
+#~ msgid "New Caledonia"
+#~ msgstr "New Caledonia"
+
+#~ msgid "New Zealand"
+#~ msgstr "New Zealand"
+
+#~ msgid "Nicaragua"
+#~ msgstr "Nicaragua"
+
+#~ msgid "Niger"
+#~ msgstr "Niger"
+
+#~ msgid "Nigeria"
+#~ msgstr "Nigeria"
+
+#~ msgid "Niue"
+#~ msgstr "Niue"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolk Island"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Northern Mariana Islands"
+
+#~ msgid "Norway"
+#~ msgstr "Norway"
+
+#~ msgid "Oman"
+#~ msgstr "Oman"
+
+#~ msgid "Pakistan"
+#~ msgstr "Pakistan"
+
+#~ msgid "Palau"
+#~ msgstr "Palau"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "Palestinian Territory"
+
+#~ msgid "Panama"
+#~ msgstr "Panama"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua New Guinea"
+
+#~ msgid "Paraguay"
+#~ msgstr "Paraguay"
+
+#~ msgid "Peru"
+#~ msgstr "Peru"
+
+#~ msgid "Philippines"
+#~ msgstr "Philippines"
+
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairn"
+
+#~ msgid "Poland"
+#~ msgstr "Poland"
+
+#~ msgid "Portugal"
+#~ msgstr "Portugal"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "Puerto Rico"
+
+#~ msgid "Qatar"
+#~ msgstr "Qatar"
+
+#~ msgid "Reunion"
+#~ msgstr "Reunion"
+
+#~ msgid "Romania"
+#~ msgstr "Romania"
+
+#~ msgid "Russian Federation"
+#~ msgstr "Russian Federation"
+
+#~ msgid "Rwanda"
+#~ msgstr "Rwanda"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "Saint Kitts And Nevis"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "Saint Lucia"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "Saint Vincent And The Grenadines"
+
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
+
+#~ msgid "San Marino"
+#~ msgstr "San Marino"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "Sao Tome And Principe"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "Saudi Arabia"
+
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "Serbia And Montenegro"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
+
+#~ msgid "Singapore"
+#~ msgstr "Singapore"
+
+#~ msgid "Slovakia"
+#~ msgstr "Slovakia"
+
+#~ msgid "Slovenia"
+#~ msgstr "Slovenia"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "Solomon Islands"
+
+#~ msgid "Somalia"
+#~ msgstr "Somalia"
+
+#~ msgid "South Africa"
+#~ msgstr "South Africa"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "South Georgia And The South Sandwich Islands"
+
+#~ msgid "Spain"
+#~ msgstr "Spain"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Sri Lanka"
+
+#~ msgid "St. Helena"
+#~ msgstr "St. Helena"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "St. Pierre And Miquelon"
+
+#~ msgid "Sudan"
+#~ msgstr "Sudan"
+
+#~ msgid "Suriname"
+#~ msgstr "Suriname"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "Svalbard And Jan Mayen Islands"
+
+#~ msgid "Swaziland"
+#~ msgstr "Swaziland"
+
+#~ msgid "Sweden"
+#~ msgstr "Sweden"
+
+#~ msgid "Switzerland"
+#~ msgstr "Switzerland"
+
+#~ msgid "Syria"
+#~ msgstr "Syria"
+
+#~ msgid "Taiwan"
+#~ msgstr "Taiwan"
+
+#~ msgid "Tajikistan"
+#~ msgstr "Tajikistan"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "Tanzania, United Republic Of"
+
+#~ msgid "Thailand"
+#~ msgstr "Thailand"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "Timor-Leste"
+
+#~ msgid "Togo"
+#~ msgstr "Togo"
+
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
+
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "Trinidad And Tobago"
+
+#~ msgid "Tunisia"
+#~ msgstr "Tunisia"
+
+#~ msgid "Turkey"
+#~ msgstr "Turkey"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkmenistan"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "Turks And Caicos Islands"
+
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
+
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
+
+#~ msgid "Ukraine"
+#~ msgstr "Ukraine"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "United Arab Emirates"
+
+#~ msgid "United Kingdom"
+#~ msgstr "United Kingdom"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "United States Minor Outlying Islands"
+
+#~ msgid "Uruguay"
+#~ msgstr "Uruguay"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "Uzbekistan"
+
+#~ msgid "Vanuatu"
+#~ msgstr "Vanuatu"
+
+#~ msgid "Venezuela"
+#~ msgstr "Venezuela"
+
+#~ msgid "Viet Nam"
+#~ msgstr "Viet Nam"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Virgin Islands, British"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Virgin Islands, U.S."
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "Wallis And Futuna Islands"
+
+#~ msgid "Western Sahara"
+#~ msgstr "Western Sahara"
+
+#~ msgid "Yemen"
+#~ msgstr "Yemen"
+
+#~ msgid "Zambia"
+#~ msgstr "Zambia"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "Zimbabwe"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL Instant Messenger"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo Messenger"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu Messenger"
+
+#~ msgid "Service"
+#~ msgstr "Service"
+
+#~ msgid "Username"
+#~ msgstr "Username"
+
+#~ msgid "Address _2:"
+#~ msgstr "Address _2:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "Ci_ty:"
+
+#~ msgid "Countr_y:"
+#~ msgstr "Countr_y:"
+
+#~ msgid "Full Address"
+#~ msgstr "Full Address"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "Post _Code:"
+
+#~ msgid "Dr."
+#~ msgstr "Dr."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Jr."
+
+#~ msgid "Miss"
+#~ msgstr "Miss"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Sr."
+#~ msgstr "Sr."
+
+#~ msgid "Add IM Account"
+#~ msgstr "Add IM Account"
+
+#~ msgid "_Account name:"
+#~ msgstr "_Account name:"
+
+#~ msgid "_IM Service:"
+#~ msgstr "_IM Service:"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "Blank forms at end:"
+
+#~ msgid "Body"
+#~ msgstr "Body"
+
+#~ msgid "Bottom:"
+#~ msgstr "Bottom:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Dimensions:"
+
+#~ msgid "F_ont..."
+#~ msgstr "F_ont..."
+
+#~ msgid "Fonts"
+#~ msgstr "Fonts"
+
+#~ msgid "Footer:"
+#~ msgstr "Footer:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "Header/Footer"
+
+#~ msgid "Headings"
+#~ msgstr "Headings"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Headings for each letter"
+
+#~ msgid "Height:"
+#~ msgstr "Height:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Immediately follow each other"
+
+#~ msgid "Include:"
+#~ msgstr "Include:"
+
+#~ msgid "Landscape"
+#~ msgstr "Landscape"
+
+#~ msgid "Left:"
+#~ msgstr "Left:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Letter tabs on side"
+
+#~ msgid "Margins"
+#~ msgstr "Margins"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Number of columns:"
+
+#~ msgid "Options"
+#~ msgstr "Options"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientation"
+
+#~ msgid "Page"
+#~ msgstr "Page"
+
+#~ msgid "Page Setup:"
+#~ msgstr "Page Setup:"
+
+#~ msgid "Paper"
+#~ msgstr "Paper"
+
+#~ msgid "Paper source:"
+#~ msgstr "Paper source:"
+
+#~ msgid "Portrait"
+#~ msgstr "Portrait"
+
+#~ msgid "Preview:"
+#~ msgstr "Preview:"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "Print using grey shading"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "Reverse on even pages"
+
+#~ msgid "Right:"
+#~ msgstr "Right:"
+
+#~ msgid "Sections:"
+#~ msgstr "Sections:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Start on a new page"
+
+#~ msgid "Style name:"
+#~ msgstr "Style name:"
+
+#~ msgid "Top:"
+#~ msgstr "Top:"
+
+#~ msgid "Width:"
+#~ msgstr "Width:"
+
+#~ msgid "_Font..."
+#~ msgstr "_Font..."
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "Whether to use daylight savings time while displaying events."
+
+#~ msgid "daylight savings time"
+#~ msgstr "daylight savings time"
+
+#~ msgid "after"
+#~ msgstr "after"
+
+#~ msgid "day(s)"
+#~ msgstr "day(s)"
+
+#~ msgid "end of appointment"
+#~ msgstr "end of appointment"
+
+#~ msgid "hour(s)"
+#~ msgstr "hour(s)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minute(s)"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Adjust for daylight sa_ving time"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "Attached message - %s"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> Attachment"
+#~ msgstr[1] "<b>%d</b> Attachments"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "Hide Attachment _Bar"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "Show Attachment _Bar"
+
+#~ msgid "Show Attachments"
+#~ msgstr "Show Attachments"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "Press space key to toggle attachment bar"
+
+#~ msgid "1 day before appointment"
+#~ msgstr "1 day before appointment"
+
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 hour before appointment"
+
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minutes before appointment"
+
+#~ msgid "for"
+#~ msgstr "for"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>Att_endees</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "C_hange Organiser"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "Co_ntacts..."
+
+#~ msgid "forever"
+#~ msgstr "forever"
+
+#~ msgid "month(s)"
+#~ msgstr "month(s)"
+
+#~ msgid "week(s)"
+#~ msgstr "week(s)"
+
+#~ msgid "year(s)"
+#~ msgstr "year(s)"
+
+#~ msgid "_Save Selected"
+#~ msgstr "_Save Selected"
+
+#~ msgid "April"
+#~ msgstr "April"
+
+#~ msgid "August"
+#~ msgstr "August"
+
+#~ msgid "December"
+#~ msgstr "December"
+
+#~ msgid "February"
+#~ msgstr "February"
+
+#~ msgid "January"
+#~ msgstr "January"
+
+#~ msgid "July"
+#~ msgstr "July"
+
+#~ msgid "June"
+#~ msgstr "June"
+
+#~ msgid "March"
+#~ msgstr "March"
+
+#~ msgid "May"
+#~ msgstr "May"
+
+#~ msgid "November"
+#~ msgstr "November"
+
+#~ msgid "October"
+#~ msgstr "October"
+
+#~ msgid "September"
+#~ msgstr "September"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "Could not open autosave file"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "_Post-To Field"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "Toggles whether the Post-To field is displayed"
+
+#~ msgid "_Subject Field"
+#~ msgstr "_Subject Field"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "Toggles whether the Subject field is displayed"
+
+#~ msgid "_To Field"
+#~ msgstr "_To Field"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "Toggles whether the To field is displayed"
+
+#~ msgid "ago"
+#~ msgstr "ago"
+
+#~ msgid "months"
+#~ msgstr "months"
+
+#~ msgid "the time you specify"
+#~ msgstr "the time you specify"
+
+#~ msgid "years"
+#~ msgstr "years"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "Retrieving Message..."
+
+#~ msgid "C_all To..."
+#~ msgstr "C_all To..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "Completed on %d %B, %Y, %l:%M %p"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "by %d %B, %Y, %l:%M %p"
+
+#~ msgid "Save attachment as"
+#~ msgstr "Save attachment as"
+
+#~ msgid "Select folder to save all attachments"
+#~ msgstr "Select folder to save all attachments"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "_Save Selected..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d at_tachment"
+#~ msgstr[1] "%d at_tachments"
+
+#~ msgid "S_ave"
+#~ msgstr "S_ave"
+
+#~ msgid "No Attachment"
+#~ msgstr "No Attachment"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a, %R %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "View/Bcc menu item is checked"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "View/Bcc menu item is checked."
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "View/Cc menu item is checked"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "View/Cc menu item is checked."
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "View/From menu item is checked"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "View/From menu item is checked."
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "View/PostTo menu item is checked"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "View/PostTo menu item is checked."
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "View/ReplyTo menu item is checked"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "View/ReplyTo menu item is checked."
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "Ch_eck for Supported Types "
+
+#~ msgid "Do not quote"
+#~ msgstr "Do not quote"
+
+#~ msgid "Inline (Outlook style)"
+#~ msgstr "Inline (Outlook style)"
+
+#~ msgid "Quoted"
+#~ msgstr "Quoted"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "S_OCKS Host:"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Select Drafts Folder"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Select Sent Folder"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "_Automatic proxy configuration URL:"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "Case _sensitive"
+
+#~ msgid "F_ind:"
+#~ msgstr "F_ind:"
+
+#~ msgid "Find in Message"
+#~ msgstr "Find in Message"
+
+#~ msgid "None Selected"
+#~ msgstr "None Selected"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "Provides core functionality for local address books."
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr "A plugin for backing up and restore Evolution data and settings."
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "CalDAV Calendar sources"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "Provides core functionality for local calendars."
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "HTTP Calendars"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "Provides core functionality for webcal and http calendars."
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "Provides core functionality for weather calendars."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "A test plugin which demonstrates a context menu plugin which lets you "
+#~ "copy things to the clipboard."
+
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "S_pecify the mailbox name"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "A plugin that manages a collection of Exchange account-specific "
+#~ "operations and features."
+
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "Compose messages using an external editor"
+
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr "Allows unsubscribing of mail folders in the side bar context menu."
+
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "A plugin to setup Google Calendar and Contacts."
+
+#~ msgid "Google sources"
+#~ msgstr "Google sources"
+
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "A plugin to setup GroupWise calendar and contacts sources."
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "A plugin to setup hula calendar sources."
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "Hula Account Setup"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "A plugin for the features in the IMAP accounts."
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "_Import to Calendar"
+
+#~ msgid "Import ICS"
+#~ msgstr "Import ICS"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "Imports ICS attachments to calendar."
+
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr ""
+#~ "Synchronise the selected task/memo/calendar/address book with an Apple "
+#~ "iPod"
+
+#~ msgid "_Tasks :"
+#~ msgstr "_Tasks :"
+
+#~ msgid "Memos :"
+#~ msgstr "Memos :"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "Allows disabling of accounts."
+
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "Con_vert to Meeting"
+
+#~ msgid "Mail to meeting"
+#~ msgstr "Mail to meeting"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+
+#~ msgid "Con_vert to Task"
+#~ msgstr "Con_vert to Task"
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "Used for marking all the messages under a folder as read"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "A plugin which implements mono plugins."
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "A plugin for managing which plugins are enabled or disabled."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "Writes a log of profiling data events."
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "SpamAssassin (built-in)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "A plugin for saving all attachments or parts of a message at once."
+
+#~ msgid "Save Attachments..."
+#~ msgstr "Save Attachments..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "Save all attachments"
+
+#~ msgid "Select save base name"
+#~ msgstr "Select save base name"
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "Indicates if threading of messages should fall back to subject."
+
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr "A simple plugin which uses yTNEF to decode TNEF attachments."
+
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "A plugin to set up WebDAV contacts."
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "Pos_t New Message to Folder"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "Post a Repl_y"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "Post a message to a Public folder"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "Post a reply to a message in a Public folder"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "Attachment Bar"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "Cannot attach file %s: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "Cannot attach file %s: not a regular file"
+
+#~ msgid "MIME type:"
+#~ msgstr "MIME type:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "Suggest automatic display of attachment"
+
+#~ msgid "Expanded"
+#~ msgstr "Expanded"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "Whether or not the expander is expanded"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "Text of the expander's label"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "Space to put between the label and the child"
+
+#~ msgid "Label widget"
+#~ msgstr "Label widget"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "A widget to display in place of the usual expander label"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "Indicator Spacing"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "Spacing around expander arrow"
+
+#~ msgid "Current Message"
+#~ msgstr "Current Message"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "Edit Master Category List..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Item(s) belong to these _categories:"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "_Available Categories:"
+
+#~ msgid "categories"
+#~ msgstr "categories"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%H:%M"
+
+#~ msgid "DnD code"
+#~ msgstr "DnD code"
+
+#~ msgid "Full Header"
+#~ msgstr "Full Header"
+
+#~ msgid "Font Description"
+#~ msgstr "Font Description"
+
 #~ msgid "%Id"
 #~ msgstr "%Id"
 
@@ -24049,9 +25540,6 @@ msgstr "Handle Popup"
 #~ msgid "This should test the contact print style editor widget"
 #~ msgstr "This should test the contact print style editor widget"
 
-#~ msgid "Contact Print Test"
-#~ msgstr "Contact Print Test"
-
 #~ msgid "This should test the contact print code"
 #~ msgstr "This should test the contact print code"
 
@@ -24331,9 +25819,6 @@ msgstr "Handle Popup"
 #~ msgid "Enable attachment reminder plugin."
 #~ msgstr "Enable attachment reminder plugin."
 
-#~ msgid "Remind _missing attachments"
-#~ msgstr "Remind _missing attachments"
-
 #~ msgid "_Refresh:"
 #~ msgstr "_Refresh:"
 
@@ -24346,9 +25831,6 @@ msgstr "Handle Popup"
 #~ msgid "Prints the message"
 #~ msgstr "Prints the message"
 
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "Copy selection to clipboard"
-
 #~ msgid "Cut selection to clipboard"
 #~ msgstr "Cut selection to clipboard"
 
@@ -24391,9 +25873,6 @@ msgstr "Handle Popup"
 #~ msgid "Send the mail in HTML format"
 #~ msgstr "Send the mail in HTML format"
 
-#~ msgid "_Delete all"
-#~ msgstr "_Delete all"
-
 #~ msgid "_Open..."
 #~ msgstr "_Open..."
 
@@ -24487,9 +25966,6 @@ msgstr "Handle Popup"
 #~ "All information on this journal entry will be deleted and can not be "
 #~ "restored."
 
-#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
-#~ msgstr "Are you sure you want to delete the journal entry '{0}'?"
-
 #~ msgid "Are you sure you want to delete these {0} journal entries?"
 #~ msgstr "Are you sure you want to delete these {0} journal entries?"
 
@@ -24613,9 +26089,6 @@ msgstr "Handle Popup"
 #~ msgid "The Evolution PIM and Email Client"
 #~ msgstr "The Evolution PIM and Email Client"
 
-#~ msgid "The orientation of the tray."
-#~ msgstr "The orientation of the tray."
-
 #~ msgid "_Search name:"
 #~ msgstr "_Search name:"
 
@@ -24701,9 +26174,6 @@ msgstr "Handle Popup"
 #~ msgid "Importing Netscape data"
 #~ msgstr "Importing Netscape data"
 
-#~ msgid "Settings"
-#~ msgstr "Settings"
-
 #~ msgid "Mail Filters"
 #~ msgstr "Mail Filters"
 
@@ -24790,9 +26260,6 @@ msgstr "Handle Popup"
 #~ msgid "Account cannot send e-mail"
 #~ msgstr "Account cannot send e-mail"
 
-#~ msgid "No store available"
-#~ msgstr "No store available"
-
 #~ msgid ""
 #~ "A plugin which implements a CORBA interface for accessing mail data "
 #~ "remotely."
@@ -24809,15 +26276,6 @@ msgstr "Handle Popup"
 #~ msgid "(Untitled)"
 #~ msgstr "(Untitled)"
 
-#~ msgid "An attachment to add."
-#~ msgstr "An attachment to add."
-
-#~ msgid "Content type of the attachment."
-#~ msgstr "Content type of the attachment."
-
-#~ msgid "The filename to display in the mail."
-#~ msgstr "The filename to display in the mail."
-
 #~ msgid "Description of the attachment."
 #~ msgstr "Description of the attachment."
 
@@ -24964,9 +26422,6 @@ msgstr "Handle Popup"
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "ebby"
-#~ msgstr "ebby"
-
 #~ msgid "range"
 #~ msgstr "range"
 
@@ -25054,9 +26509,6 @@ msgstr "Handle Popup"
 #~ msgid "(none)"
 #~ msgstr "(none)"
 
-#~ msgid "Primary Email"
-#~ msgstr "Primary Email"
-
 #~ msgid "Select an Action"
 #~ msgstr "Select an Action"
 
@@ -25213,9 +26665,6 @@ msgstr "Handle Popup"
 #~ msgid "Timezone Button"
 #~ msgstr "Timezone Button"
 
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "The Evolution Groupware Suite"
-
 #~ msgid "      "
 #~ msgstr "      "
 
@@ -25384,9 +26833,6 @@ msgstr "Handle Popup"
 #~ msgid "Delete this Occurrence"
 #~ msgstr "Delete this Occurrence"
 
-#~ msgid "Customize My Evolution"
-#~ msgstr "Customise My Evolution"
-
 #~ msgid "Move"
 #~ msgstr "Move"