Added missing file. Updated Canadian English translation.

2005-12-03  Adam Weinberger  <adamw@gnome.org>

	* POTFILES.in: Added missing file.
	* en_CA.po: Updated Canadian English translation.

svn path=/trunk/; revision=30714

3 files changed, 1079 insertions, 980 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 1516c49e4e..b8b13e4a71 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-03  Adam Weinberger  <adamw@gnome.org>
+
+	* POTFILES.in: Added missing file.
+	* en_CA.po: Updated Canadian English translation.
+
 2005-12-02  Žygimantas Beručka  <zygis@gnome.org>
 
 	* lt.po: Updated Lithuanian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d4c1caf19e..ca3eace299 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -176,6 +176,7 @@ calendar/gui/itip-utils.c
 calendar/gui/memos-component.c
 calendar/gui/memos-control.c
 calendar/gui/migration.c
+calendar/gui/misc.c
 calendar/gui/print.c
 calendar/gui/tasks-component.c
 calendar/gui/tasks-control.c
diff --git a/po/en_CA.po b/po/en_CA.po
index a865b13ee2..8832c7e51f 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-17 21:08-0500\n"
+"POT-Creation-Date: 2005-12-03 14:48-0500\n"
 "PO-Revision-Date: 2005-08-21 19:18-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -40,9 +40,7 @@ msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "current addressbook folder has %d card"
 msgstr[1] "current addressbook folder has %d cards"
 
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:969
-#: ui/evolution-message-composer.xml.h:11
+#: a11y/addressbook/ea-minicard.c:31 ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Open"
 
@@ -343,44 +341,58 @@ msgid "Could not remove addressbook."
 msgstr "Could not remove addressbook."
 
 #: addressbook/addressbook.error.xml.h:8
+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."
+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."
+
+#: addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "Delete address book '{0}'?"
 
-#: addressbook/addressbook.error.xml.h:9
+#: addressbook/addressbook.error.xml.h:10
 msgid "Error loading addressbook."
 msgstr "Error loading addressbook."
 
-#: addressbook/addressbook.error.xml.h:10
+#: addressbook/addressbook.error.xml.h:11
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Error saving {0} to {1}: {2}"
 
-#: addressbook/addressbook.error.xml.h:11
+#: addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
 msgstr "Failed to authenticate with LDAP server."
 
-#: addressbook/addressbook.error.xml.h:12
+#: addressbook/addressbook.error.xml.h:13
+msgid "GroupWise Address book creation:"
+msgstr "GroupWise Address book creation:"
+
+#: addressbook/addressbook.error.xml.h:14
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server did not respond with valid schema information."
 
-#: addressbook/addressbook.error.xml.h:13
+#: addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
 msgstr "Server Version"
 
-#: addressbook/addressbook.error.xml.h:14 calendar/calendar.error.xml.h:44
+#: addressbook/addressbook.error.xml.h:16 calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr "Some features may not work properly with your current server"
 
-#: addressbook/addressbook.error.xml.h:15
+#: addressbook/addressbook.error.xml.h:17
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "The Evolution addressbook has quit unexpectedly."
 
-#: addressbook/addressbook.error.xml.h:16
+#: addressbook/addressbook.error.xml.h:18
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "The image you have selected is large. Do you want to resize and store it?"
 
-#: addressbook/addressbook.error.xml.h:17
+#: addressbook/addressbook.error.xml.h:19
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -390,19 +402,19 @@ msgstr ""
 "this functionality, or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 
-#: addressbook/addressbook.error.xml.h:18
+#: addressbook/addressbook.error.xml.h:20
 msgid "This address book will be removed permanently."
 msgstr "This address book will be removed permanently."
 
-#: addressbook/addressbook.error.xml.h:19
+#: addressbook/addressbook.error.xml.h:21
 msgid "This addressbook could not be opened."
 msgstr "This addressbook could not be opened."
 
-#: addressbook/addressbook.error.xml.h:20
+#: addressbook/addressbook.error.xml.h:22
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "This addressbook server does not have any suggested search bases."
 
-#: addressbook/addressbook.error.xml.h:21
+#: addressbook/addressbook.error.xml.h:23
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -410,27 +422,27 @@ msgstr ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 
-#: addressbook/addressbook.error.xml.h:22
+#: addressbook/addressbook.error.xml.h:24
 msgid "This server does not support LDAPv3 schema information."
 msgstr "This server does not support LDAPv3 schema information."
 
-#: addressbook/addressbook.error.xml.h:23
+#: addressbook/addressbook.error.xml.h:25
 msgid "Unable to open addressbook"
 msgstr "Unable to open addressbook"
 
-#: addressbook/addressbook.error.xml.h:24
+#: addressbook/addressbook.error.xml.h:26
 msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
-#: addressbook/addressbook.error.xml.h:25
+#: addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
 msgstr "Unable to save {0}."
 
-#: addressbook/addressbook.error.xml.h:26
+#: addressbook/addressbook.error.xml.h:28
 msgid "Would you like to save your changes?"
 msgstr "Would you like to save your changes?"
 
-#: addressbook/addressbook.error.xml.h:27
+#: addressbook/addressbook.error.xml.h:29
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -438,7 +450,7 @@ msgstr ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 
-#: addressbook/addressbook.error.xml.h:28 calendar/calendar.error.xml.h:61
+#: addressbook/addressbook.error.xml.h:30 calendar/calendar.error.xml.h:61
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -448,7 +460,7 @@ msgstr ""
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 
-#: addressbook/addressbook.error.xml.h:29
+#: addressbook/addressbook.error.xml.h:31
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -456,29 +468,29 @@ msgstr ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 
-#: addressbook/addressbook.error.xml.h:30
+#: addressbook/addressbook.error.xml.h:32
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
-#: addressbook/addressbook.error.xml.h:31 mail/em-vfolder-rule.c:495
+#: addressbook/addressbook.error.xml.h:33 mail/em-vfolder-rule.c:495
 #: plugins/groupwise-features/junk-settings.glade.h:4
 #: plugins/groupwise-features/properties.glade.h:10
 #: widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Add"
 
-#: addressbook/addressbook.error.xml.h:32
+#: addressbook/addressbook.error.xml.h:34
 msgid "_Discard"
 msgstr "_Discard"
 
-#: addressbook/addressbook.error.xml.h:33
+#: addressbook/addressbook.error.xml.h:35
 #: plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "{0}"
 
-#: addressbook/addressbook.error.xml.h:34
+#: addressbook/addressbook.error.xml.h:36
 msgid "{1}"
 msgstr "{1}"
 
@@ -514,7 +526,7 @@ msgstr "Configure autocomplete here"
 
 #. Create the contacts group
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1180
+#: addressbook/gui/component/addressbook-view.c:1186
 #: calendar/gui/calendar-component.c:246 calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Contacts"
@@ -602,7 +614,7 @@ msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
 #: addressbook/gui/component/addressbook-component.c:241
-#: addressbook/gui/component/addressbook-config.c:1149
+#: addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "New Address Book"
 
@@ -618,21 +630,21 @@ msgstr "Create a new address book"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Failed upgrading Addressbook settings or folders."
 
-#: addressbook/gui/component/addressbook-config.c:316
+#: addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "Base"
 
-#: addressbook/gui/component/addressbook-config.c:511
+#: addressbook/gui/component/addressbook-config.c:530
 #: calendar/gui/dialogs/calendar-setup.c:192
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
 
-#: addressbook/gui/component/addressbook-config.c:610
+#: addressbook/gui/component/addressbook-config.c:634
 msgid "Copy book content locally for offline operation"
 msgstr "Copy book content locally for offline operation"
 
-#: addressbook/gui/component/addressbook-config.c:933
+#: addressbook/gui/component/addressbook-config.c:981
 #: addressbook/gui/component/ldap-config.glade.h:22
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.c:368
@@ -642,34 +654,34 @@ msgstr "Copy book content locally for offline operation"
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/addressbook-config.c:934
+#: addressbook/gui/component/addressbook-config.c:982
 #: mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Addressbook"
 
-#: addressbook/gui/component/addressbook-config.c:938
+#: addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Server Information"
 
-#: addressbook/gui/component/addressbook-config.c:940
+#: addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Authentication"
 
-#: addressbook/gui/component/addressbook-config.c:943
+#: addressbook/gui/component/addressbook-config.c:991
 #: addressbook/gui/component/ldap-config.glade.h:17
 #: mail/mail-dialogs.glade.h:7 smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/component/addressbook-config.c:944
+#: addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Searching"
 
-#: addressbook/gui/component/addressbook-config.c:946
+#: addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Downloading"
 
-#: addressbook/gui/component/addressbook-config.c:1147
+#: addressbook/gui/component/addressbook-config.c:1200
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
@@ -735,28 +747,28 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-view.c:763
+#: addressbook/gui/component/addressbook-view.c:769
 msgid "_New Address Book"
 msgstr "_New Address Book"
 
 #. FIXME: need to disable for undeletable folders
-#: addressbook/gui/component/addressbook-view.c:764
-#: addressbook/gui/widgets/e-addressbook-view.c:952
-#: calendar/gui/calendar-component.c:537 calendar/gui/e-calendar-table.c:1187
-#: calendar/gui/e-calendar-view.c:1569 calendar/gui/e-memo-table.c:862
+#: addressbook/gui/component/addressbook-view.c:770
+#: addressbook/gui/widgets/e-addressbook-view.c:966
+#: calendar/gui/calendar-component.c:537 calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-view.c:1583 calendar/gui/e-memo-table.c:869
 #: calendar/gui/tasks-component.c:441 mail/em-folder-tree.c:2054
-#: mail/em-folder-view.c:1049 ui/evolution-addressbook.xml.h:34
+#: mail/em-folder-view.c:1050 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:27
 #: ui/evolution-memos.xml.h:16 ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Delete"
 
-#: addressbook/gui/component/addressbook-view.c:766
+#: addressbook/gui/component/addressbook-view.c:772
 #: calendar/gui/calendar-component.c:538 calendar/gui/tasks-component.c:442
 msgid "_Properties..."
 msgstr "_Properties..."
 
-#: addressbook/gui/component/addressbook-view.c:1191
+#: addressbook/gui/component/addressbook-view.c:1197
 msgid "Contact Source Selector"
 msgstr "Contact Source Selector"
 
@@ -1110,8 +1122,10 @@ msgstr "cards"
 
 #: addressbook/gui/component/ldap-config.glade.h:57
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: calendar/gui/alarm-notify/util.c:64 calendar/gui/alarm-notify/util.c:66
 #: calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 calendar/gui/misc.c:111
+#: calendar/gui/misc.c:113 filter/filter.glade.h:16
 #: mail/em-account-editor.c:1951 plugins/calendar-http/calendar-http.c:263
 #: plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1176,23 +1190,23 @@ msgid "<b>Work</b>"
 msgstr "<b>Work</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:525
-#: addressbook/gui/contact-editor/e-contact-editor.c:540
-#: addressbook/gui/contact-editor/e-contact-editor.c:2372
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
+#: addressbook/gui/contact-editor/e-contact-editor.c:541
+#: addressbook/gui/contact-editor/e-contact-editor.c:2373
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -1205,7 +1219,7 @@ msgid "Image"
 msgstr "Image"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1218,7 +1232,7 @@ msgid "Ni_ckname:"
 msgstr "Ni_ckname:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1232,8 +1246,8 @@ msgstr "Telephone"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: filter/filter-label.c:122 mail/em-migrate.c:1042 mail/mail-config.c:77
 #: mail/mail-config.glade.h:153
 msgid "Work"
@@ -1257,12 +1271,12 @@ msgid "_Birthday:"
 msgstr "_Birthday:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: plugins/itip-formatter/itip-view.c:1662
+#: plugins/itip-formatter/itip-view.c:1661
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Categories"
 
@@ -1350,17 +1364,17 @@ msgstr "_Where:"
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:97
 #: addressbook/gui/widgets/eab-contact-display.c:367
 #: addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Address"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:142
+#: addressbook/gui/contact-editor/e-contact-editor.c:301
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: addressbook/gui/widgets/e-addressbook-model.c:310
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: addressbook/gui/widgets/e-minicard-label.c:164
@@ -1373,975 +1387,975 @@ msgstr "Address"
 msgid "Editable"
 msgstr "Editable"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
 msgstr "United States"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Algeria"
 msgstr "Algeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
 msgstr "American Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
 msgstr "Antarctica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
 msgstr "Antigua And Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Austria"
 msgstr "Austria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belarus"
 msgstr "Belarus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belgium"
 msgstr "Belgium"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia And Herzegowina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
 msgstr "Bouvet Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "Brazil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
 msgstr "Central African Republic"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "China"
 msgstr "China"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Christmas Island"
 msgstr "Christmas Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Colombia"
 msgstr "Colombia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
 msgstr "Comoros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, The Democratic Republic Of The"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cook Islands"
 msgstr "Cook Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Croatia"
 msgstr "Croatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Czech Republic"
 msgstr "Czech Republic"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Denmark"
 msgstr "Denmark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Dominican Republic"
 msgstr "Dominican Republic"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "Egypt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
 msgstr "Falkland Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
 msgstr "Faroe Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "France"
 msgstr "France"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
 msgstr "French Polynesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
 msgstr "French Southern Territories"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Germany"
 msgstr "Germany"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "Greece"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Greenland"
 msgstr "Greenland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
 msgstr "Heard And McDonald Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Holy See"
 msgstr "Holy See"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Hungary"
 msgstr "Hungary"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
 msgstr "Iceland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iran"
 msgstr "Iran"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Iraq"
 msgstr "Iraq"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Ireland"
 msgstr "Ireland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Italy"
 msgstr "Italy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jersey"
 msgstr "Jersey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korea, Democratic People's Republic Of"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr "Korea, Republic Of"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
 msgstr "Libya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Maldives"
 msgstr "Maldives"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Moldova, Republic Of"
 msgstr "Moldova, Republic Of"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Morocco"
 msgstr "Morocco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
 msgstr "New Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
 msgstr "Norfolk Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
 msgstr "Norway"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr "Palestinian Territory"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Philippines"
 msgstr "Philippines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
 msgstr "Poland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Russian Federation"
 msgstr "Russian Federation"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts And Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent And The Grenadines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome And Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Serbia And Montenegro"
 msgstr "Serbia And Montenegro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Solomon Islands"
 msgstr "Solomon Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Africa"
 msgstr "South Africa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 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:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "Spain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre And Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
 msgstr "Suriname"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard And Jan Mayen Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
 msgstr "Sweden"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Syria"
 msgstr "Syria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, United Republic Of"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
 msgstr "Trinidad And Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "Turkey"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
 msgstr "Turks And Caicos Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
 msgstr "United Arab Emirates"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Viet Nam"
 msgstr "Viet Nam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
 msgstr "Virgin Islands, British"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Virgin Islands, U.S."
 msgstr "Virgin Islands, U.S."
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis And Futuna Islands"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Western Sahara"
 msgstr "Western Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:378
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
 #: plugins/exchange-operations/exchange-delegates.c:936
 #: plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: plugins/plugin-manager/plugin-manager.c:44
@@ -2350,105 +2364,105 @@ msgstr "Zimbabwe"
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:119
 msgid "Service"
 msgstr "Service"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: calendar/gui/dialogs/cal-prefs-dialog.c:594
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Location"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:135
 msgid "Username"
 msgstr "Username"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Home"
 msgstr "Home"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:204
 msgid "Other"
 msgstr "Other"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
 #: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:190
 #: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Required Fields"
 msgstr "Required Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:307
+#: addressbook/gui/contact-editor/e-contact-editor.c:308
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:535
-#: addressbook/gui/contact-editor/e-contact-editor.c:2367
+#: addressbook/gui/contact-editor/e-contact-editor.c:536
+#: addressbook/gui/contact-editor/e-contact-editor.c:2368
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor - %s"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2680
+#: addressbook/gui/contact-editor/e-contact-editor.c:2681
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: addressbook/gui/contact-editor/e-contact-editor.c:2682
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2960
+#: addressbook/gui/contact-editor/e-contact-editor.c:2961
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2456,7 +2470,7 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3012
+#: addressbook/gui/contact-editor/e-contact-editor.c:3013
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
@@ -2623,7 +2637,7 @@ msgid "Add an email to the List"
 msgstr "Add an email to the List"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -2655,24 +2669,24 @@ msgstr "_Select"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an email address or drag a contact into the list below:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:296
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 #: addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Book"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Is New List"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Members"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
@@ -2732,7 +2746,7 @@ msgstr[1] "%d contacts"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:303
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: addressbook/gui/widgets/e-addressbook-view.c:237
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -2755,35 +2769,35 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Name begins with"
 msgstr "Name begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:171
 msgid "Email begins with"
 msgstr "Email begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Category is"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:173
 #: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Any field contains"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:173
-#: addressbook/gui/widgets/e-addressbook-view.c:178
+#: addressbook/gui/widgets/e-addressbook-view.c:174
+#: addressbook/gui/widgets/e-addressbook-view.c:179
 msgid "Advanced..."
 msgstr "Advanced..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 msgid "Source"
 msgstr "Source"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:244
+#: addressbook/gui/widgets/e-addressbook-view.c:245
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:377
@@ -2792,98 +2806,98 @@ msgstr "Source"
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:544
+#: addressbook/gui/widgets/e-addressbook-view.c:550
 msgid "Address Book"
 msgstr "Address Book"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
-#: addressbook/gui/widgets/e-addressbook-view.c:2018
+#: addressbook/gui/widgets/e-addressbook-view.c:821
+#: addressbook/gui/widgets/e-addressbook-view.c:2037
 #: ui/evolution-addressbook.xml.h:20
 msgid "Save as VCard..."
 msgstr "Save as VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/dialogs/comp-editor.c:1054
-#: calendar/gui/e-calendar-table.c:1167 calendar/gui/e-calendar-view.c:1549
-#: calendar/gui/e-memo-table.c:845 ui/evolution-addressbook.xml.h:38
+#: addressbook/gui/widgets/e-addressbook-view.c:944
+#: calendar/gui/dialogs/comp-editor.c:1055
+#: calendar/gui/e-calendar-table.c:1174 calendar/gui/e-calendar-view.c:1563
+#: calendar/gui/e-memo-table.c:852 ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "_Open"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_New Contact..."
 msgstr "_New Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "New Contact _List..."
 msgstr "New Contact _List..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:936
+#: addressbook/gui/widgets/e-addressbook-view.c:950
 #: ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "_Save as VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:937
+#: addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "_Forward Contact"
 msgstr "_Forward Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:938
+#: addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "_Forward Contacts"
 msgstr "_Forward Contacts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:939
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Send _Message to Contact"
 msgstr "Send _Message to Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "Send _Message to List"
 msgstr "Send _Message to List"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:941
+#: addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "Send _Message to Contacts"
 msgstr "Send _Message to Contacts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:942
+#: addressbook/gui/widgets/e-addressbook-view.c:956
 msgid "_Print"
 msgstr "_Print"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "Cop_y to Address Book..."
 msgstr "Cop_y to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:946
+#: addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ve to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:963
 #: ui/evolution-composer-entries.xml.h:2 ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:950
+#: addressbook/gui/widgets/e-addressbook-view.c:964
 #: calendar/gui/calendar-component.c:536
-#: calendar/gui/dialogs/comp-editor.c:431 calendar/gui/e-calendar-table.c:1175
-#: calendar/gui/e-calendar-view.c:1556 calendar/gui/e-memo-table.c:853
+#: calendar/gui/dialogs/comp-editor.c:432 calendar/gui/e-calendar-table.c:1182
+#: calendar/gui/e-calendar-view.c:1570 calendar/gui/e-memo-table.c:860
 #: calendar/gui/tasks-component.c:440 composer/e-msg-composer.c:3049
-#: mail/em-folder-tree.c:979 mail/em-folder-view.c:1035
+#: mail/em-folder-tree.c:979 mail/em-folder-view.c:1036
 #: mail/message-list.c:1718 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-editor.xml.h:16 ui/evolution-mail-message.xml.h:102
+#: ui/evolution-editor.xml.h:16 ui/evolution-mail-message.xml.h:104
 #: ui/evolution-memos.xml.h:15 ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:951
+#: addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "P_aste"
 msgstr "P_aste"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1565
+#: addressbook/gui/widgets/e-addressbook-view.c:1584
 #: calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Any Category"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: addressbook/gui/widgets/e-addressbook-view.c:1767
+#: addressbook/gui/widgets/e-addressbook-view.c:1786
 msgid "Print cards"
 msgstr "Print cards"
 
@@ -2916,6 +2930,7 @@ msgid "Car Phone"
 msgstr "Car Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: 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
@@ -3288,7 +3303,7 @@ msgstr "Protocol not supported"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:232
 #: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:661
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/print.c:2375
+#: calendar/gui/e-calendar-table.c:462 calendar/gui/print.c:2375
 msgid "Cancelled"
 msgstr "Cancelled"
 
@@ -3353,7 +3368,7 @@ msgstr ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:111
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3361,7 +3376,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3371,7 +3386,7 @@ msgstr ""
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 
-#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:123
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3379,7 +3394,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:145
+#: addressbook/gui/widgets/eab-gui-util.c:146
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3391,7 +3406,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:151
+#: addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3403,45 +3418,45 @@ msgstr ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:157
+#: addressbook/gui/widgets/eab-gui-util.c:158
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "The backend for this addressbook was unable to parse this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:160
+#: addressbook/gui/widgets/eab-gui-util.c:161
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "The backend for this addressbook refused to perform this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:163
+#: addressbook/gui/widgets/eab-gui-util.c:164
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#: addressbook/gui/widgets/eab-gui-util.c:185
+#: addressbook/gui/widgets/eab-gui-util.c:186
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:185
-#: addressbook/gui/widgets/eab-gui-util.c:693
+#: addressbook/gui/widgets/eab-gui-util.c:186
+#: addressbook/gui/widgets/eab-gui-util.c:694
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:196
+#: addressbook/gui/widgets/eab-gui-util.c:197
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:196
+#: addressbook/gui/widgets/eab-gui-util.c:197
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/widgets/eab-gui-util.c:209
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:208
-#: addressbook/gui/widgets/eab-gui-util.c:648
+#: addressbook/gui/widgets/eab-gui-util.c:209
+#: addressbook/gui/widgets/eab-gui-util.c:649
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:290
+#: addressbook/gui/widgets/eab-gui-util.c:291
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3456,7 +3471,7 @@ 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:319
+#: addressbook/gui/widgets/eab-gui-util.c:320
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3465,64 +3480,64 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:323
+#: addressbook/gui/widgets/eab-gui-util.c:324
 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:368
-#: addressbook/gui/widgets/eab-gui-util.c:371
+#: addressbook/gui/widgets/eab-gui-util.c:369
+#: addressbook/gui/widgets/eab-gui-util.c:372
 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:418
+#: addressbook/gui/widgets/eab-gui-util.c:419
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:594
+#: addressbook/gui/widgets/eab-gui-util.c:595
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:754
+#: addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:756
+#: addressbook/gui/widgets/eab-gui-util.c:757
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:759
+#: addressbook/gui/widgets/eab-gui-util.c:760
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:761
+#: addressbook/gui/widgets/eab-gui-util.c:762
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:764
+#: addressbook/gui/widgets/eab-gui-util.c:765
 msgid "Select target addressbook."
 msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:987
+#: addressbook/gui/widgets/eab-gui-util.c:988
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:990
+#: addressbook/gui/widgets/eab-gui-util.c:991
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
 
-#: addressbook/gui/widgets/eab-gui-util.c:1031
-#: addressbook/gui/widgets/eab-gui-util.c:1049
+#: addressbook/gui/widgets/eab-gui-util.c:1032
+#: addressbook/gui/widgets/eab-gui-util.c:1050
 msgid "Contact information"
 msgstr "Contact information"
 
-#: addressbook/gui/widgets/eab-gui-util.c:1051
+#: addressbook/gui/widgets/eab-gui-util.c:1052
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
@@ -3590,18 +3605,18 @@ msgstr "Card View"
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/importers/evolution-ldif-importer.c:582
+#: addressbook/importers/evolution-ldif-importer.c:583
 #: addressbook/importers/evolution-vcard-importer.c:249
 #: calendar/importers/icalendar-importer.c:311
 #: calendar/importers/icalendar-importer.c:643 shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "Importing ..."
 
-#: addressbook/importers/evolution-ldif-importer.c:748
+#: addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: addressbook/importers/evolution-ldif-importer.c:749
+#: addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
@@ -3618,12 +3633,12 @@ msgstr "Evolution VCard Importer"
 msgid "Print envelope"
 msgstr "Print envelope"
 
-#: addressbook/printing/e-contact-print.c:1026
+#: addressbook/printing/e-contact-print.c:1027
 msgid "Print contacts"
 msgstr "Print contacts"
 
-#: addressbook/printing/e-contact-print.c:1117
-#: addressbook/printing/e-contact-print.c:1145
+#: addressbook/printing/e-contact-print.c:1118
+#: addressbook/printing/e-contact-print.c:1146
 msgid "Print contact"
 msgstr "Print contact"
 
@@ -3775,7 +3790,7 @@ msgstr "Shading"
 
 #. FIXME: Take care of i18n
 #: addressbook/printing/e-contact-print.glade.h:36
-#: plugins/exchange-operations/exchange-account-setup.c:940
+#: plugins/exchange-operations/exchange-account-setup.c:939
 #: plugins/exchange-operations/exchange-calendar.c:224
 #: plugins/exchange-operations/exchange-contacts.c:197
 msgid "Size:"
@@ -4234,7 +4249,7 @@ msgid "_Save Changes"
 msgstr "_Save Changes"
 
 #: calendar/calendar.error.xml.h:69 composer/mail-composer.error.xml.h:31
-#: mail/mail.error.xml.h:127
+#: mail/mail.error.xml.h:129
 msgid "_Send"
 msgstr "_Send"
 
@@ -4336,15 +4351,15 @@ msgid "Memo_s"
 msgstr "Memo_s"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-memos.c:1091 calendar/gui/memos-component.c:528
-#: calendar/gui/memos-component.c:998 calendar/gui/memos-control.c:334
+#: calendar/gui/e-memos.c:1092 calendar/gui/memos-component.c:528
+#: calendar/gui/memos-component.c:998 calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Memos"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: calendar/gui/e-tasks.c:1333 calendar/gui/print.c:1831
+#: calendar/gui/e-tasks.c:1334 calendar/gui/print.c:1831
 #: calendar/gui/tasks-component.c:519 calendar/gui/tasks-component.c:1013
-#: calendar/gui/tasks-control.c:466 calendar/importers/icalendar-importer.c:79
+#: calendar/gui/tasks-control.c:472 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:707
 #: plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: plugins/groupwise-account-setup/camel-gw-listener.c:591
@@ -4365,17 +4380,19 @@ msgstr "_Tasks"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Calendar alarm notification service"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: calendar/gui/alarm-notify/util.c:64 calendar/gui/alarm-notify/util.c:66
+#: calendar/gui/misc.c:111 calendar/gui/misc.c:113
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:251
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
 msgid "Start time"
 msgstr "Start time"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:349
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:356
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -4391,7 +4408,9 @@ msgstr "Appointments"
 
 #. Location
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: calendar/gui/e-itip-control.c:1117 plugins/itip-formatter/itip-view.c:884
+#: calendar/gui/alarm-notify/alarm-queue.c:1419
+#: calendar/gui/alarm-notify/alarm-queue.c:1425
+#: calendar/gui/e-itip-control.c:1117 plugins/itip-formatter/itip-view.c:883
 msgid "Location:"
 msgstr "Location:"
 
@@ -4421,46 +4440,48 @@ msgstr "_Snooze"
 msgid "location of appointment"
 msgstr "location of appointment"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:970
-msgid "Dismiss"
-msgstr "Dismiss"
+#: calendar/gui/alarm-notify/alarm-queue.c:1097
+msgid "<b>Calendars</b>"
+msgstr "<b>Calendars</b>"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:971
-msgid "Dismiss All"
-msgstr "Dismiss All"
+#: calendar/gui/alarm-notify/alarm-queue.c:1163
+msgid "Preferences"
+msgstr "Preferences"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1053
+#: calendar/gui/alarm-notify/alarm-queue.c:1176
+msgid "_Configure Alarms"
+msgstr "_Configure Alarms"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:1178 ui/evolution.xml.h:41
+msgid "_Quit"
+msgstr "_Quit"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:1284
+#: calendar/gui/alarm-notify/alarm-queue.c:1401
 msgid "No summary available."
 msgstr "No summary available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1062
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: calendar/gui/alarm-notify/alarm-queue.c:1293
+#: calendar/gui/alarm-notify/alarm-queue.c:1295
 msgid "No description available."
 msgstr "No description available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1072
+#: calendar/gui/alarm-notify/alarm-queue.c:1303
 msgid "No location information available."
 msgstr "No location information available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1088
+#: calendar/gui/alarm-notify/alarm-queue.c:1339
 #, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
+msgid "You have %d alarms"
+msgstr "You have %d alarms"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1191
-#: calendar/gui/alarm-notify/alarm-queue.c:1215
+#. FIXME
+#: calendar/gui/alarm-notify/alarm-queue.c:1502
+#: calendar/gui/alarm-notify/alarm-queue.c:1526
 msgid "Warning"
 msgstr "Warning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1195
+#: calendar/gui/alarm-notify/alarm-queue.c:1506
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4472,7 +4493,7 @@ msgstr ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1221
+#: calendar/gui/alarm-notify/alarm-queue.c:1532
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4489,15 +4510,15 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1235
+#: calendar/gui/alarm-notify/alarm-queue.c:1546
 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:147
+#: calendar/gui/alarm-notify/notify-main.c:155
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialize Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:158
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not create the alarm notify service factory"
 msgstr "Could not create the alarm notify service factory"
 
@@ -4505,6 +4526,62 @@ msgstr "Could not create the alarm notify service factory"
 msgid "invalid time"
 msgstr "invalid time"
 
+#. Can't be zero
+#: calendar/gui/alarm-notify/util.c:58 calendar/gui/misc.c:105
+#, c-format
+msgid "(%d seconds)"
+msgstr "(%d seconds)"
+
+#: calendar/gui/alarm-notify/util.c:64 calendar/gui/misc.c:111
+#, c-format
+msgid "(%d %s %d %s)"
+msgstr "(%d %s %d %s)"
+
+#: calendar/gui/alarm-notify/util.c:64
+#: calendar/gui/dialogs/recurrence-page.c:991 calendar/gui/misc.c:111
+msgid "second"
+msgstr "second"
+
+#: calendar/gui/alarm-notify/util.c:64 calendar/gui/misc.c:111
+#: filter/filter.glade.h:18 mail/mail-config.glade.h:177
+msgid "seconds"
+msgstr "seconds"
+
+#: calendar/gui/alarm-notify/util.c:66 calendar/gui/misc.c:113
+#, c-format
+msgid "(%d %s)"
+msgstr "(%d %s)"
+
+#: calendar/gui/alarm-notify/util.c:77 calendar/gui/misc.c:124
+#, c-format
+msgid " %u second"
+msgstr " %u second"
+
+#: calendar/gui/alarm-notify/util.c:77 calendar/gui/misc.c:124
+#, c-format
+msgid " %u seconds"
+msgstr " %u seconds"
+
+#: calendar/gui/alarm-notify/util.c:79 calendar/gui/misc.c:126
+#, c-format
+msgid " %u minute"
+msgstr " %u minute"
+
+#: calendar/gui/alarm-notify/util.c:79 calendar/gui/misc.c:126
+#, c-format
+msgid " %u minutes"
+msgstr " %u minutes"
+
+#: calendar/gui/alarm-notify/util.c:81 calendar/gui/misc.c:128
+#, c-format
+msgid "%u hour"
+msgstr "%u hour"
+
+#: calendar/gui/alarm-notify/util.c:81 calendar/gui/misc.c:128
+#, c-format
+msgid "%u hours"
+msgstr "%u hours"
+
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "Alarm programs"
@@ -4903,15 +4980,15 @@ msgstr "Location contains"
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: calendar/gui/calendar-commands.c:119 calendar/gui/print.c:2512
+#: calendar/gui/calendar-commands.c:120 calendar/gui/print.c:2512
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:76 ui/evolution-memos.xml.h:11
+#: ui/evolution-mail-message.xml.h:77 ui/evolution-memos.xml.h:11
 #: ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Print"
 
-#: calendar/gui/calendar-commands.c:119 calendar/gui/calendar-component.c:708
-#: calendar/gui/dialogs/calendar-setup.c:369 calendar/gui/gnome-cal.c:2116
+#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:708
+#: calendar/gui/dialogs/calendar-setup.c:369 calendar/gui/gnome-cal.c:2117
 #: plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: plugins/groupwise-account-setup/camel-gw-listener.c:413
 #: plugins/groupwise-account-setup/camel-gw-listener.c:590
@@ -4920,7 +4997,7 @@ msgstr "Print"
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/calendar-commands.c:355
 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 "
@@ -4930,11 +5007,11 @@ msgstr ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 
-#: calendar/gui/calendar-commands.c:360
+#: calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: calendar/gui/calendar-commands.c:365
+#: calendar/gui/calendar-commands.c:366
 #: calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
 #: plugins/calendar-http/calendar-http.c:265
@@ -5025,7 +5102,7 @@ msgid "New calendar"
 msgstr "New calendar"
 
 #: calendar/gui/calendar-component.c:1500
-#: calendar/gui/dialogs/event-page.c:828
+#: calendar/gui/dialogs/event-page.c:829
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
@@ -5158,7 +5235,7 @@ msgstr "hour(s)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
-#: calendar/gui/dialogs/event-page.glade.h:18 filter/filter.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:19 filter/filter.glade.h:15
 #: plugins/calendar-http/calendar-http.c:264
 #: plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
@@ -5172,7 +5249,7 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:199
+#: calendar/gui/dialogs/alarm-list-dialog.c:200
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -5208,17 +5285,17 @@ msgstr "%.0fG"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:311
 #: calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: calendar/gui/dialogs/comp-editor.c:2575
+#: calendar/gui/dialogs/comp-editor.c:2582
 #: composer/e-msg-composer-attachment-bar.c:307 mail/em-utils.c:138
 #: mail/em-utils.c:483 mail/em-utils.c:520 widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "attachment"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:473
-#: calendar/gui/dialogs/comp-editor.c:1055
-#: calendar/gui/dialogs/event-page.c:1733
-#: calendar/gui/dialogs/meeting-page.c:908
-#: calendar/gui/dialogs/task-page.c:1182
+#: calendar/gui/dialogs/comp-editor.c:1056
+#: calendar/gui/dialogs/event-page.c:1734
+#: calendar/gui/dialogs/meeting-page.c:909
+#: calendar/gui/dialogs/task-page.c:1183
 #: composer/e-msg-composer-attachment-bar.c:470 composer/e-msg-composer.c:3545
 #: plugins/groupwise-features/junk-settings.glade.h:8
 #: plugins/groupwise-features/properties.glade.h:14
@@ -5227,14 +5304,14 @@ msgid "_Remove"
 msgstr "_Remove"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:474
-#: calendar/gui/dialogs/comp-editor.c:1056
+#: calendar/gui/dialogs/comp-editor.c:1057
 #: composer/e-msg-composer-attachment-bar.c:471 composer/e-msg-composer.c:3546
 #: mail/em-folder-tree.c:2058 ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Properties"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:476
-#: calendar/gui/dialogs/comp-editor.c:1058
+#: calendar/gui/dialogs/comp-editor.c:1059
 #: composer/e-msg-composer-attachment-bar.c:473 composer/e-msg-composer.c:3548
 msgid "_Add attachment..."
 msgstr "_Add attachment..."
@@ -5260,24 +5337,24 @@ msgstr "Suggest automatic display of attachment"
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
-#: calendar/gui/dialogs/cal-attachment.c:210
-#: calendar/gui/dialogs/cal-attachment.c:226
-#: calendar/gui/dialogs/cal-attachment.c:319
-#: calendar/gui/dialogs/cal-attachment.c:335
-#: composer/e-msg-composer-attachment.c:187
-#: composer/e-msg-composer-attachment.c:203
-#: composer/e-msg-composer-attachment.c:297
-#: composer/e-msg-composer-attachment.c:313 widgets/misc/e-attachment.c:221
+#: calendar/gui/dialogs/cal-attachment.c:211
+#: calendar/gui/dialogs/cal-attachment.c:227
+#: calendar/gui/dialogs/cal-attachment.c:320
+#: calendar/gui/dialogs/cal-attachment.c:336
+#: composer/e-msg-composer-attachment.c:188
+#: composer/e-msg-composer-attachment.c:204
+#: composer/e-msg-composer-attachment.c:298
+#: composer/e-msg-composer-attachment.c:314 widgets/misc/e-attachment.c:221
 #: widgets/misc/e-attachment.c:237 widgets/misc/e-attachment.c:425
 #: widgets/misc/e-attachment.c:441
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Cannot attach file %s: %s"
 
-#: calendar/gui/dialogs/cal-attachment.c:218
-#: calendar/gui/dialogs/cal-attachment.c:327
-#: composer/e-msg-composer-attachment.c:195
-#: composer/e-msg-composer-attachment.c:305 widgets/misc/e-attachment.c:229
+#: calendar/gui/dialogs/cal-attachment.c:219
+#: calendar/gui/dialogs/cal-attachment.c:328
+#: composer/e-msg-composer-attachment.c:196
+#: composer/e-msg-composer-attachment.c:306 widgets/misc/e-attachment.c:229
 #: widgets/misc/e-attachment.c:433
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
@@ -5310,33 +5387,33 @@ msgid "MIME type:"
 msgstr "MIME type:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:504
-#: mail/em-composer-prefs.c:919 plugins/plugin-manager/plugin-manager.c:213
+#: calendar/gui/dialogs/cal-prefs-dialog.c:583 mail/em-account-prefs.c:504
+#: mail/em-composer-prefs.c:930 plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Enabled"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+#: calendar/gui/dialogs/cal-prefs-dialog.c:740
 msgid "Are you sure you want to remove this URL?"
 msgstr "Are you sure you want to remove this URL?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:736
+#: calendar/gui/dialogs/cal-prefs-dialog.c:743
 msgid "Remove"
 msgstr "Remove"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:741
+#: calendar/gui/dialogs/cal-prefs-dialog.c:748
 msgid "Don't Remove"
 msgstr "Don't Remove"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: calendar/gui/dialogs/cal-prefs-dialog.c:856 mail/em-account-prefs.c:330
+#: calendar/gui/dialogs/cal-prefs-dialog.c:797
+#: calendar/gui/dialogs/cal-prefs-dialog.c:830
+#: calendar/gui/dialogs/cal-prefs-dialog.c:863 mail/em-account-prefs.c:330
 #: mail/em-account-prefs.c:375 mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "Disable"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:790
-#: calendar/gui/dialogs/cal-prefs-dialog.c:823
-#: calendar/gui/dialogs/cal-prefs-dialog.c:858 mail/em-account-prefs.c:330
+#: calendar/gui/dialogs/cal-prefs-dialog.c:797
+#: calendar/gui/dialogs/cal-prefs-dialog.c:830
+#: calendar/gui/dialogs/cal-prefs-dialog.c:865 mail/em-account-prefs.c:330
 #: mail/em-account-prefs.c:375 mail/em-account-prefs.c:408
 msgid "Enable"
 msgstr "Enable"
@@ -5426,12 +5503,12 @@ msgid "E_nable"
 msgstr "E_nable"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/event-editor.c:549 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:555 ui/evolution-event-editor.xml.h:6
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Friday"
@@ -5445,7 +5522,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Monday"
@@ -5459,7 +5536,7 @@ msgid "S_un"
 msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1051
 #: calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Saturday"
@@ -5473,7 +5550,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1051
+#: calendar/gui/dialogs/recurrence-page.c:1052
 #: calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Sunday"
@@ -5491,13 +5568,13 @@ msgid "Template:"
 msgstr "Template:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Thursday"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
@@ -5506,7 +5583,7 @@ msgid "Time format:"
 msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Tuesday"
@@ -5516,7 +5593,7 @@ msgid "W_eek starts:"
 msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Wednesday"
@@ -5745,14 +5822,14 @@ msgstr " (Due "
 msgid "Due "
 msgstr "Due "
 
-#: calendar/gui/dialogs/comp-editor.c:193 composer/e-msg-composer.c:2800
+#: calendar/gui/dialogs/comp-editor.c:194 composer/e-msg-composer.c:2800
 #, c-format
 msgid "Attached message - %s"
 msgstr "Attached message - %s"
 
 #. translators, this count will always be >1
-#: calendar/gui/dialogs/comp-editor.c:198
-#: calendar/gui/dialogs/comp-editor.c:368 composer/e-msg-composer.c:2805
+#: calendar/gui/dialogs/comp-editor.c:199
+#: calendar/gui/dialogs/comp-editor.c:369 composer/e-msg-composer.c:2805
 #: composer/e-msg-composer.c:2984
 #, c-format
 msgid "Attached message"
@@ -5760,88 +5837,88 @@ msgid_plural "%d attached messages"
 msgstr[0] "Attached message"
 msgstr[1] "%d attached messages"
 
-#: calendar/gui/dialogs/comp-editor.c:432 composer/e-msg-composer.c:3050
+#: calendar/gui/dialogs/comp-editor.c:433 composer/e-msg-composer.c:3050
 #: mail/em-folder-tree.c:980 mail/em-folder-utils.c:368
-#: mail/em-folder-view.c:931 mail/message-list.c:1719
+#: mail/em-folder-view.c:932 mail/message-list.c:1719
 msgid "_Move"
 msgstr "_Move"
 
-#: calendar/gui/dialogs/comp-editor.c:434 composer/e-msg-composer.c:3052
+#: calendar/gui/dialogs/comp-editor.c:435 composer/e-msg-composer.c:3052
 #: mail/em-folder-tree.c:982 mail/message-list.c:1721
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: calendar/gui/dialogs/comp-editor.c:777
+#: calendar/gui/dialogs/comp-editor.c:778
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: calendar/gui/dialogs/comp-editor.c:913 composer/e-msg-composer.c:2443
+#: calendar/gui/dialogs/comp-editor.c:914 composer/e-msg-composer.c:2443
 #, 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:943
+#: calendar/gui/dialogs/comp-editor.c:944
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: calendar/gui/dialogs/comp-editor.c:946
-#: calendar/gui/dialogs/comp-editor.c:1363
+#: calendar/gui/dialogs/comp-editor.c:947
+#: calendar/gui/dialogs/comp-editor.c:1364
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: calendar/gui/dialogs/comp-editor.c:1387
+#: calendar/gui/dialogs/comp-editor.c:1388
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr "Attachment Button: Press space key to toggle attachment bar"
 
-#: calendar/gui/dialogs/comp-editor.c:1984
-#: calendar/gui/dialogs/comp-editor.c:2027
+#: calendar/gui/dialogs/comp-editor.c:1991
+#: calendar/gui/dialogs/comp-editor.c:2034
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: calendar/gui/dialogs/comp-editor.c:1990
-#: calendar/gui/dialogs/comp-editor.c:2033
+#: calendar/gui/dialogs/comp-editor.c:1997
+#: calendar/gui/dialogs/comp-editor.c:2040
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1992
-#: calendar/gui/dialogs/comp-editor.c:2035
+#: calendar/gui/dialogs/comp-editor.c:1999
+#: calendar/gui/dialogs/comp-editor.c:2042
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1996
-#: calendar/gui/dialogs/comp-editor.c:2039
+#: calendar/gui/dialogs/comp-editor.c:2003
+#: calendar/gui/dialogs/comp-editor.c:2046
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1998
-#: calendar/gui/dialogs/comp-editor.c:2041
+#: calendar/gui/dialogs/comp-editor.c:2005
+#: calendar/gui/dialogs/comp-editor.c:2048
 #, c-format
 msgid "Task - %s"
 msgstr "Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:2001
-#: calendar/gui/dialogs/comp-editor.c:2044
+#: calendar/gui/dialogs/comp-editor.c:2008
+#: calendar/gui/dialogs/comp-editor.c:2051
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal entry - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:2012
-#: calendar/gui/dialogs/comp-editor.c:2054
+#: calendar/gui/dialogs/comp-editor.c:2019
+#: calendar/gui/dialogs/comp-editor.c:2061
 msgid "No summary"
 msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:2668
-#: calendar/gui/dialogs/comp-editor.c:2701
-#: calendar/gui/dialogs/comp-editor.c:2725
+#: calendar/gui/dialogs/comp-editor.c:2675
+#: calendar/gui/dialogs/comp-editor.c:2708
+#: calendar/gui/dialogs/comp-editor.c:2732
 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:2749
+#: calendar/gui/dialogs/comp-editor.c:2756
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -5918,94 +5995,94 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:525
+#: calendar/gui/dialogs/event-editor.c:531
 msgid "Appoint_ment"
 msgstr "Appoint_ment"
 
-#: calendar/gui/dialogs/event-editor.c:529 ui/evolution-event-editor.xml.h:12
+#: calendar/gui/dialogs/event-editor.c:535 ui/evolution-event-editor.xml.h:12
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-page.c:834 calendar/gui/dialogs/task-page.c:443
+#: calendar/gui/dialogs/event-page.c:835 calendar/gui/dialogs/task-page.c:444
 msgid "Or_ganizer"
 msgstr "Or_ganizer"
 
-#: calendar/gui/dialogs/event-page.c:872
+#: calendar/gui/dialogs/event-page.c:873
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: calendar/gui/dialogs/event-page.c:874
+#: calendar/gui/dialogs/event-page.c:875
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: calendar/gui/dialogs/event-page.c:1033
+#: calendar/gui/dialogs/event-page.c:1034
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: calendar/gui/dialogs/event-page.c:1036
+#: calendar/gui/dialogs/event-page.c:1037
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: calendar/gui/dialogs/event-page.c:1201 calendar/gui/dialogs/task-page.c:847
+#: calendar/gui/dialogs/event-page.c:1202 calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1211
+#: calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1234
+#: calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1241
+#: calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1396
-#: calendar/gui/dialogs/meeting-page.c:463
-#: calendar/gui/dialogs/task-page.c:904
+#: calendar/gui/dialogs/event-page.c:1397
+#: calendar/gui/dialogs/meeting-page.c:464
+#: calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "The organizer selected no longer has an account."
 
-#: calendar/gui/dialogs/event-page.c:1402
-#: calendar/gui/dialogs/meeting-page.c:469
-#: calendar/gui/dialogs/task-page.c:910
+#: calendar/gui/dialogs/event-page.c:1403
+#: calendar/gui/dialogs/meeting-page.c:470
+#: calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "An organizer is required."
 
-#: calendar/gui/dialogs/event-page.c:1417
-#: calendar/gui/dialogs/meeting-page.c:484
-#: calendar/gui/dialogs/task-page.c:925
+#: calendar/gui/dialogs/event-page.c:1418
+#: calendar/gui/dialogs/meeting-page.c:485
+#: calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: calendar/gui/dialogs/event-page.c:1734
-#: calendar/gui/dialogs/meeting-page.c:909
-#: calendar/gui/dialogs/task-page.c:1183
+#: calendar/gui/dialogs/event-page.c:1735
+#: calendar/gui/dialogs/meeting-page.c:910
+#: calendar/gui/dialogs/task-page.c:1184
 msgid "_Add "
 msgstr "_Add "
 
-#: calendar/gui/dialogs/event-page.c:2421
+#: calendar/gui/dialogs/event-page.c:2422
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
-#: calendar/gui/dialogs/event-page.c:2661
+#: calendar/gui/dialogs/event-page.c:2662
 #, 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:2669
+#: calendar/gui/dialogs/event-page.c:2670
 #, 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:2677
+#: calendar/gui/dialogs/event-page.c:2678
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6042,51 +6119,51 @@ msgstr "Ca_tegories..."
 msgid "Cale_ndar:"
 msgstr "Cale_ndar:"
 
-#: 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:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 msgid "Locat_ion:"
 msgstr "Locat_ion:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "Or_ganizer:"
 msgstr "Or_ganizer:"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Su_mmary:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Description:"
 msgstr "_Description:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Set alarm\t"
 msgstr "_Set alarm\t"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Time:"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:18
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/event-page.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "until"
 
-#: calendar/gui/dialogs/meeting-page.c:305
+#: calendar/gui/dialogs/meeting-page.c:306
 msgid "<b>Dele_gatees</b>"
 msgstr "<b>Dele_gatees</b>"
 
-#: calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.c:310
 msgid "<b>From:</b>"
 msgstr "<b>From:</b>"
 
@@ -6095,19 +6172,19 @@ msgstr "<b>From:</b>"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:315
+#: calendar/gui/dialogs/meeting-page.c:316
 #: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:1103
 #: composer/e-msg-composer.c:2246 filter/filter-rule.c:881
 #: mail/em-account-editor.c:683 mail/em-account-editor.c:1348
-#: mail/em-account-prefs.c:464 mail/em-folder-view.c:1064
+#: mail/em-account-prefs.c:464 mail/em-folder-view.c:1065
 #: mail/em-junk-hook.c:78 plugins/calendar-weather/calendar-weather.c:370
 #: plugins/calendar-weather/calendar-weather.c:424
 #: plugins/exchange-operations/exchange-delegates.glade.h:7
 #: plugins/itip-formatter/itip-formatter.c:1627
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:467
-#: widgets/misc/e-dateedit.c:1506 widgets/misc/e-dateedit.c:1675
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:474
+#: widgets/misc/e-dateedit.c:1513 widgets/misc/e-dateedit.c:1727
 msgid "None"
 msgstr "None"
 
@@ -6185,7 +6262,7 @@ msgstr "Organizer:"
 msgid "Memo"
 msgstr "Memo"
 
-#: calendar/gui/dialogs/memo-page.c:489
+#: calendar/gui/dialogs/memo-page.c:490
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Unable to open memos in '%s'."
@@ -6198,19 +6275,19 @@ msgstr "<span weight=\"bold\">Basics</span>"
 msgid "Classi_fication:"
 msgstr "Classi_fication:"
 
-#: calendar/gui/dialogs/memo-page.glade.h:5 calendar/gui/e-cal-list-view.c:254
-#: calendar/gui/e-cal-model.c:325 calendar/gui/e-calendar-table.c:364
+#: calendar/gui/dialogs/memo-page.glade.h:5 calendar/gui/e-cal-list-view.c:256
+#: calendar/gui/e-cal-model.c:325 calendar/gui/e-calendar-table.c:366
 msgid "Confidential"
 msgstr "Confidential"
 
-#: calendar/gui/dialogs/memo-page.glade.h:6 calendar/gui/e-cal-list-view.c:253
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/dialogs/memo-page.glade.h:6 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:365
 msgid "Private"
 msgstr "Private"
 
-#: calendar/gui/dialogs/memo-page.glade.h:7 calendar/gui/e-cal-list-view.c:252
+#: calendar/gui/dialogs/memo-page.glade.h:7 calendar/gui/e-cal-list-view.c:254
 #: calendar/gui/e-cal-model.c:314 calendar/gui/e-cal-model.c:321
-#: calendar/gui/e-calendar-table.c:362
+#: calendar/gui/e-calendar-table.c:364
 msgid "Public"
 msgstr "Public"
 
@@ -6293,55 +6370,51 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: calendar/gui/dialogs/recurrence-page.c:497
+#: calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: calendar/gui/dialogs/recurrence-page.c:818
+#: calendar/gui/dialogs/recurrence-page.c:819
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: calendar/gui/dialogs/recurrence-page.c:929
+#: calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr "on"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:990
 msgid "first"
 msgstr "first"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
-msgid "second"
-msgstr "second"
-
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:992
 msgid "third"
 msgstr "third"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:993
 msgid "fourth"
 msgstr "fourth"
 
-#: calendar/gui/dialogs/recurrence-page.c:993
+#: calendar/gui/dialogs/recurrence-page.c:994
 msgid "last"
 msgstr "last"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:1017
 msgid "Other Date"
 msgstr "Other Date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1045
 msgid "day"
 msgstr "day"
 
-#: calendar/gui/dialogs/recurrence-page.c:1181
+#: calendar/gui/dialogs/recurrence-page.c:1182
 msgid "on the"
 msgstr "on the"
 
-#: calendar/gui/dialogs/recurrence-page.c:1370
+#: calendar/gui/dialogs/recurrence-page.c:1371
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2325
+#: calendar/gui/dialogs/recurrence-page.c:2326
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -6381,12 +6454,12 @@ msgstr "week(s)"
 msgid "year(s)"
 msgstr "year(s)"
 
-#: calendar/gui/dialogs/task-details-page.c:410
-#: calendar/gui/dialogs/task-details-page.c:430
+#: calendar/gui/dialogs/task-details-page.c:411
+#: calendar/gui/dialogs/task-details-page.c:431
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
-#: calendar/gui/dialogs/task-details-page.c:522
+#: calendar/gui/dialogs/task-details-page.c:523
 msgid "Web Page"
 msgstr "Web Page"
 
@@ -6403,7 +6476,7 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:229
 #: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:659
-#: calendar/gui/e-calendar-table.c:459 calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-calendar-table.c:461 calendar/gui/e-itip-control.c:895
 #: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
 #: calendar/gui/print.c:2372 plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -6411,34 +6484,34 @@ msgstr "Completed"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:248
-#: calendar/gui/e-calendar-table.c:384 mail/message-list.c:1018
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:1018
 msgid "High"
 msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:226
 #: calendar/gui/e-cal-model-tasks.c:344 calendar/gui/e-cal-model-tasks.c:657
-#: calendar/gui/e-cal-model-tasks.c:732 calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-cal-model-tasks.c:732 calendar/gui/e-calendar-table.c:460
 #: calendar/gui/print.c:2369
 msgid "In Progress"
 msgstr "In Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:252
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:1016
+#: calendar/gui/e-calendar-table.c:388 mail/message-list.c:1016
 msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:250 calendar/gui/e-cal-model.c:920
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:1017
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:1017
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:236
 #: calendar/gui/e-cal-model-tasks.c:342 calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/print.c:2366
+#: calendar/gui/e-calendar-table.c:459 calendar/gui/print.c:2366
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -6451,7 +6524,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:387
+#: calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Undefined"
 
@@ -6476,15 +6549,15 @@ msgstr "_Task"
 msgid "Task Details"
 msgstr "Task Details"
 
-#: calendar/gui/dialogs/task-page.c:436
+#: calendar/gui/dialogs/task-page.c:437
 msgid "_Group"
 msgstr "_Group"
 
-#: calendar/gui/dialogs/task-page.c:820
+#: calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: calendar/gui/dialogs/task-page.c:1613
+#: calendar/gui/dialogs/task-page.c:1614
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
@@ -6639,7 +6712,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
 #: calendar/gui/e-cal-component-memo-preview.c:72
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2704
+#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2728
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -6676,7 +6749,7 @@ msgstr "Due Date:"
 #: calendar/gui/e-cal-component-preview.c:222
 #: calendar/gui/e-itip-control.c:1131
 #: plugins/exchange-operations/exchange-account-setup.c:265
-#: plugins/itip-formatter/itip-view.c:909
+#: plugins/itip-formatter/itip-view.c:908
 msgid "Status:"
 msgstr "Status:"
 
@@ -6699,11 +6772,11 @@ msgstr "Start Date"
 msgid "Summary"
 msgstr "Summary"
 
-#: calendar/gui/e-cal-model-calendar.c:180 calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-cal-model-calendar.c:183 calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Free"
 
-#: calendar/gui/e-cal-model-calendar.c:183 calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-cal-model-calendar.c:186 calendar/gui/e-calendar-table.c:439
 #: calendar/gui/e-meeting-time-sel.c:415
 msgid "Busy"
 msgstr "Busy"
@@ -6766,9 +6839,9 @@ msgstr "Select folder to save selected attachments..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: calendar/gui/e-cal-popup.c:270 calendar/gui/e-calendar-table.c:1169
-#: calendar/gui/e-calendar-view.c:1550 calendar/gui/e-memo-table.c:847
-#: mail/em-folder-view.c:1045 mail/em-popup.c:553 mail/em-popup.c:564
+#: calendar/gui/e-cal-popup.c:270 calendar/gui/e-calendar-table.c:1176
+#: calendar/gui/e-calendar-view.c:1564 calendar/gui/e-memo-table.c:854
+#: mail/em-folder-view.c:1046 mail/em-popup.c:553 mail/em-popup.c:564
 msgid "_Save As..."
 msgstr "_Save As..."
 
@@ -6785,120 +6858,120 @@ msgstr "_Save Selected"
 msgid "Open in %s..."
 msgstr "Open in %s..."
 
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:407
+#: calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:410
+#: calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:518
+#: calendar/gui/e-calendar-table.c:525
 msgid "Task Table"
 msgstr "Task Table"
 
-#: calendar/gui/e-calendar-table.c:696 calendar/gui/e-calendar-view.c:671
-#: calendar/gui/e-memo-table.c:426
+#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:677
+#: calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: calendar/gui/e-calendar-table.c:875 calendar/gui/e-calendar-view.c:799
-#: calendar/gui/e-memo-table.c:603
+#: calendar/gui/e-calendar-table.c:882 calendar/gui/e-calendar-view.c:805
+#: calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-view.c:1126
-#: calendar/gui/e-memo-table.c:735 composer/e-msg-composer.c:1341
+#: calendar/gui/e-calendar-table.c:1032 calendar/gui/e-calendar-view.c:1140
+#: calendar/gui/e-memo-table.c:742 composer/e-msg-composer.c:1341
 msgid "Save as..."
 msgstr "Save as..."
 
-#: calendar/gui/e-calendar-table.c:1168 calendar/gui/e-memo-table.c:846
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: calendar/gui/e-calendar-table.c:1170 calendar/gui/e-calendar-view.c:1530
-#: calendar/gui/e-calendar-view.c:1551 calendar/gui/e-memo-table.c:848
-#: mail/em-folder-view.c:1046
+#: calendar/gui/e-calendar-table.c:1177 calendar/gui/e-calendar-view.c:1544
+#: calendar/gui/e-calendar-view.c:1565 calendar/gui/e-memo-table.c:855
+#: mail/em-folder-view.c:1047
 #: plugins/print-message/org-gnome-print-message.xml.h:3
 #: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-message.xml.h:119 ui/evolution-memos.xml.h:20
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-memos.xml.h:20
 #: ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Print..."
 
-#: calendar/gui/e-calendar-table.c:1174 calendar/gui/e-calendar-view.c:1555
-#: calendar/gui/e-memo-table.c:852 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:1181 calendar/gui/e-calendar-view.c:1569
+#: calendar/gui/e-memo-table.c:859 ui/evolution-addressbook.xml.h:1
 #: 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:1176 calendar/gui/e-calendar-view.c:1533
-#: calendar/gui/e-calendar-view.c:1557 calendar/gui/e-memo-table.c:854
+#: calendar/gui/e-calendar-table.c:1183 calendar/gui/e-calendar-view.c:1547
+#: calendar/gui/e-calendar-view.c:1571 calendar/gui/e-memo-table.c:861
 #: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:43
 #: ui/evolution-composer-entries.xml.h:9 ui/evolution-editor.xml.h:22
 #: ui/evolution-memos.xml.h:19 ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Paste"
 
-#: calendar/gui/e-calendar-table.c:1180 ui/evolution-tasks.xml.h:22
+#: calendar/gui/e-calendar-table.c:1187 ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: calendar/gui/e-calendar-table.c:1181 calendar/gui/e-memo-table.c:858
+#: calendar/gui/e-calendar-table.c:1188 calendar/gui/e-memo-table.c:865
 #: ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Forward as iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1182
+#: calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: calendar/gui/e-calendar-table.c:1183
+#: calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark Selected Tasks as Complete"
 
-#: calendar/gui/e-calendar-table.c:1188
+#: calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Delete Selected Tasks"
 
-#: calendar/gui/e-calendar-table.c:1421
+#: calendar/gui/e-calendar-table.c:1428
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Click to add a task"
@@ -6933,77 +7006,77 @@ msgstr "Start date"
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1252
+#: calendar/gui/e-calendar-view.c:1266
 msgid "Moving items"
 msgstr "Moving items"
 
-#: calendar/gui/e-calendar-view.c:1254
+#: calendar/gui/e-calendar-view.c:1268
 msgid "Copying items"
 msgstr "Copying items"
 
-#: calendar/gui/e-calendar-view.c:1524
+#: calendar/gui/e-calendar-view.c:1538
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1525
+#: calendar/gui/e-calendar-view.c:1539
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1526
+#: calendar/gui/e-calendar-view.c:1540
 msgid "New _Meeting"
 msgstr "New _Meeting"
 
-#: calendar/gui/e-calendar-view.c:1527
+#: calendar/gui/e-calendar-view.c:1541
 msgid "New _Task"
 msgstr "New _Task"
 
 #. FIXME: hook in this somehow
-#: calendar/gui/e-calendar-view.c:1537 widgets/menus/gal-view-menus.c:291
+#: calendar/gui/e-calendar-view.c:1551 widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Current View"
 
-#: calendar/gui/e-calendar-view.c:1539
+#: calendar/gui/e-calendar-view.c:1553
 msgid "Select T_oday"
 msgstr "Select T_oday"
 
-#: calendar/gui/e-calendar-view.c:1540
+#: calendar/gui/e-calendar-view.c:1554
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: calendar/gui/e-calendar-view.c:1545 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1559 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1561
+#: calendar/gui/e-calendar-view.c:1575
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1562
+#: calendar/gui/e-calendar-view.c:1576
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1563
+#: calendar/gui/e-calendar-view.c:1577
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1564
+#: calendar/gui/e-calendar-view.c:1578
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1565
+#: calendar/gui/e-calendar-view.c:1579
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1570
+#: calendar/gui/e-calendar-view.c:1584
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: calendar/gui/e-calendar-view.c:1571
+#: calendar/gui/e-calendar-view.c:1585
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1572
+#: calendar/gui/e-calendar-view.c:1586
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
@@ -7153,10 +7226,10 @@ msgstr "iCalendar Error"
 
 #: calendar/gui/e-itip-control.c:1037 calendar/gui/e-itip-control.c:1053
 #: calendar/gui/e-itip-control.c:1064 calendar/gui/e-itip-control.c:1081
+#: plugins/itip-formatter/itip-view.c:337
 #: plugins/itip-formatter/itip-view.c:338
-#: plugins/itip-formatter/itip-view.c:339
+#: plugins/itip-formatter/itip-view.c:405
 #: plugins/itip-formatter/itip-view.c:406
-#: plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "An unknown person"
 
@@ -7607,7 +7680,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1684
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1736
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -7675,15 +7748,15 @@ msgstr "_Start time:"
 msgid "_End time:"
 msgstr "_End time:"
 
-#: calendar/gui/e-memo-table.c:267
+#: calendar/gui/e-memo-table.c:274
 msgid "Memo Table"
 msgstr "Memo Table"
 
-#: calendar/gui/e-memo-table.c:863
+#: calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Delete Selected Memos"
 
-#: calendar/gui/e-memo-table.c:986 calendar/gui/e-memo-table.etspec.h:2
+#: calendar/gui/e-memo-table.c:993 calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
@@ -7691,8 +7764,8 @@ msgstr "Click to add a memo"
 msgid "Memo sort"
 msgstr "Memo sort"
 
-#: calendar/gui/e-memos.c:727 calendar/gui/e-tasks.c:822
-#: calendar/gui/gnome-cal.c:2556
+#: calendar/gui/e-memos.c:728 calendar/gui/e-tasks.c:823
+#: calendar/gui/gnome-cal.c:2565
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7701,16 +7774,16 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-memos.c:775
+#: calendar/gui/e-memos.c:776
 msgid "Loading memos"
 msgstr "Loading memos"
 
-#: calendar/gui/e-memos.c:860
+#: calendar/gui/e-memos.c:861
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opening memos at %s"
 
-#: calendar/gui/e-memos.c:1033 calendar/gui/e-tasks.c:1225
+#: calendar/gui/e-memos.c:1034 calendar/gui/e-tasks.c:1226
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
@@ -7719,20 +7792,20 @@ msgstr "Deleting selected objects..."
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/e-tasks.c:870
+#: calendar/gui/e-tasks.c:871
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:957
+#: calendar/gui/e-tasks.c:958
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:1202
+#: calendar/gui/e-tasks.c:1203
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:1252
+#: calendar/gui/e-tasks.c:1253
 msgid "Expunging"
 msgstr "Expunging"
 
@@ -7747,38 +7820,38 @@ msgstr "Timezone Button"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:791
+#: calendar/gui/gnome-cal.c:792
 msgid "Updating query"
 msgstr "Updating query"
 
-#: calendar/gui/gnome-cal.c:2231
+#: calendar/gui/gnome-cal.c:2240
 msgid "_Custom View"
 msgstr "_Custom View"
 
-#: calendar/gui/gnome-cal.c:2232
+#: calendar/gui/gnome-cal.c:2241
 msgid "_Save Custom View"
 msgstr "_Save Custom View"
 
-#: calendar/gui/gnome-cal.c:2237
+#: calendar/gui/gnome-cal.c:2246
 msgid "_Define Views..."
 msgstr "_Define Views..."
 
-#: calendar/gui/gnome-cal.c:2399
+#: calendar/gui/gnome-cal.c:2408
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:2418
+#: calendar/gui/gnome-cal.c:2427
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:2522
+#: calendar/gui/gnome-cal.c:2531
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:3440
+#: calendar/gui/gnome-cal.c:3449
 msgid "Purging"
 msgstr "Purging"
 
@@ -7965,7 +8038,7 @@ msgstr "Memo l_ist"
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
-#: calendar/gui/memos-control.c:334
+#: calendar/gui/memos-control.c:340
 msgid "Print Memos"
 msgstr "Print Memos"
 
@@ -8311,7 +8384,7 @@ msgstr "Task l_ist"
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: calendar/gui/tasks-control.c:429
+#: calendar/gui/tasks-control.c:435
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8323,11 +8396,11 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: calendar/gui/tasks-control.c:432
+#: calendar/gui/tasks-control.c:438
 msgid "Do not ask me again."
 msgstr "Do not ask me again."
 
-#: calendar/gui/tasks-control.c:466
+#: calendar/gui/tasks-control.c:472
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
@@ -10310,7 +10383,7 @@ msgstr ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 
-#: e-util/e-dialog-utils.c:270
+#: e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10318,7 +10391,7 @@ msgstr ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 
-#: e-util/e-dialog-utils.c:272 e-util/e-system.error.xml.h:6
+#: e-util/e-dialog-utils.c:283 e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
@@ -10362,7 +10435,7 @@ msgstr "Do you wish to overwrite it?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "File exists &quot;{0}&quot;."
 
-#: e-util/e-system.error.xml.h:7 mail/mail.error.xml.h:126
+#: e-util/e-system.error.xml.h:7 mail/mail.error.xml.h:128
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
@@ -10446,7 +10519,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1440 widgets/misc/e-dateedit.c:1722
+#: widgets/misc/e-dateedit.c:1447 widgets/misc/e-dateedit.c:1774
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10455,7 +10528,7 @@ msgstr "%I:%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1437 widgets/misc/e-dateedit.c:1719
+#: widgets/misc/e-dateedit.c:1444 widgets/misc/e-dateedit.c:1771
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10695,10 +10768,6 @@ msgstr "ago"
 msgid "months"
 msgstr "months"
 
-#: filter/filter.glade.h:18 mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "seconds"
-
 #: filter/filter.glade.h:19
 msgid "the current time"
 msgstr "the current time"
@@ -10765,7 +10834,7 @@ msgstr "Evolution Mail composer configuration control"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Mail preferences control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:494
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:495
 #: mail/importers/elm-importer.c:342 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:388 mail/mail-component.c:561
 #: mail/mail-component.c:648
@@ -10872,35 +10941,35 @@ msgstr "Protocol"
 msgid "Mail Accounts Table"
 msgstr "Mail Accounts Table"
 
-#: mail/em-composer-prefs.c:309 mail/em-composer-prefs.c:435
+#: mail/em-composer-prefs.c:311 mail/em-composer-prefs.c:437
 #: mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:925
+#: mail/em-composer-prefs.c:936
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:968
+#: mail/em-composer-prefs.c:979
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:988
+#: mail/em-composer-prefs.c:999
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-composer-utils.c:855 mail/em-format-quote.c:389
+#: mail/em-composer-utils.c:862 mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1650
+#: mail/em-composer-utils.c:1657
 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:1697
+#: mail/em-composer-utils.c:1704
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11038,7 +11107,7 @@ msgid "is not Flagged"
 msgstr "is not Flagged"
 
 #: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:93
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
@@ -11046,7 +11115,7 @@ msgstr "Junk"
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:1063
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:1064
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -11264,11 +11333,11 @@ msgstr "Copying messages into folder %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:977 ui/evolution-mail-message.xml.h:103
+#: mail/em-folder-tree.c:977 ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:978 ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-tree.c:978 ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
@@ -11306,7 +11375,7 @@ msgstr "_New Folder..."
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: mail/em-folder-tree.c:2060 mail/mail.error.xml.h:123
+#: mail/em-folder-tree.c:2060 mail/mail.error.xml.h:125
 msgid "_Empty Trash"
 msgstr "_Empty Trash"
 
@@ -11315,13 +11384,13 @@ msgstr "_Empty Trash"
 msgid "Copying `%s' to `%s'"
 msgstr "Copying `%s' to `%s'"
 
-#: mail/em-folder-utils.c:368 mail/em-folder-view.c:931
-#: mail/em-folder-view.c:946 mail/importers/evolution-mbox-importer.c:85
+#: mail/em-folder-utils.c:368 mail/em-folder-view.c:932
+#: mail/em-folder-view.c:947 mail/importers/evolution-mbox-importer.c:85
 #: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-utils.c:368 mail/em-folder-view.c:946
+#: mail/em-folder-utils.c:368 mail/em-folder-view.c:947
 msgid "C_opy"
 msgstr "C_opy"
 
@@ -11354,139 +11423,139 @@ msgstr "Create folder"
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: mail/em-folder-view.c:1039 mail/em-popup.c:558 mail/em-popup.c:569
+#: mail/em-folder-view.c:1040 mail/em-popup.c:558 mail/em-popup.c:569
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:1040 ui/evolution-mail-message.xml.h:121
+#: mail/em-folder-view.c:1041 ui/evolution-mail-message.xml.h:125
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:1041 mail/em-popup.c:560 mail/em-popup.c:571
-#: ui/evolution-mail-message.xml.h:107
+#: mail/em-folder-view.c:1042 mail/em-popup.c:560 mail/em-popup.c:571
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:1044 ui/evolution-mail-message.xml.h:105
+#: mail/em-folder-view.c:1045 ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:1050
+#: mail/em-folder-view.c:1051
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:1051 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:1052 ui/evolution-addressbook.xml.h:37
 msgid "_Move to Folder..."
 msgstr "_Move to Folder..."
 
-#: mail/em-folder-view.c:1052 ui/evolution-addressbook.xml.h:33
+#: mail/em-folder-view.c:1053 ui/evolution-addressbook.xml.h:33
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:1055
+#: mail/em-folder-view.c:1056
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: mail/em-folder-view.c:1056
+#: mail/em-folder-view.c:1057
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:1057
+#: mail/em-folder-view.c:1058
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:1058
+#: mail/em-folder-view.c:1059
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:1059
+#: mail/em-folder-view.c:1060
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:1060
+#: mail/em-folder-view.c:1061
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:1061
+#: mail/em-folder-view.c:1062
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Up..."
 
-#: mail/em-folder-view.c:1069
+#: mail/em-folder-view.c:1070
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:1070
+#: mail/em-folder-view.c:1071
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:1073
+#: mail/em-folder-view.c:1074
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:1074
+#: mail/em-folder-view.c:1075
 msgid "Search Folder from _Subject"
 msgstr "Search Folder from _Subject"
 
-#: mail/em-folder-view.c:1075
+#: mail/em-folder-view.c:1076
 msgid "Search Folder from Se_nder"
 msgstr "Search Folder from Se_nder"
 
-#: mail/em-folder-view.c:1076
+#: mail/em-folder-view.c:1077
 msgid "Search Folder from _Recipients"
 msgstr "Search Folder from _Recipients"
 
-#: mail/em-folder-view.c:1077
+#: mail/em-folder-view.c:1078
 msgid "Search Folder from Mailing _List"
 msgstr "Search Folder from Mailing _List"
 
-#: mail/em-folder-view.c:1081
+#: mail/em-folder-view.c:1082
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:1082
+#: mail/em-folder-view.c:1083
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:1083
+#: mail/em-folder-view.c:1084
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:1084
+#: mail/em-folder-view.c:1085
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1922 mail/em-folder-view.c:1966
+#: mail/em-folder-view.c:1923 mail/em-folder-view.c:1967
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:2065
+#: mail/em-folder-view.c:2066
 #: plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:2221
+#: mail/em-folder-view.c:2222
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
-#: mail/em-folder-view.c:2414
+#: mail/em-folder-view.c:2415
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2416
+#: mail/em-folder-view.c:2417
 msgid "Create _Search Folder"
 msgstr "Create _Search Folder"
 
-#: mail/em-folder-view.c:2417
+#: mail/em-folder-view.c:2418
 msgid "_From this Address"
 msgstr "_From this Address"
 
-#: mail/em-folder-view.c:2418
+#: mail/em-folder-view.c:2419
 msgid "_To this Address"
 msgstr "_To this Address"
 
-#: mail/em-folder-view.c:2699
+#: mail/em-folder-view.c:2723
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -11868,7 +11937,7 @@ msgstr ""
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: mail/em-popup.c:557 mail/em-popup.c:568 ui/evolution-mail-message.xml.h:83
+#: mail/em-popup.c:557 mail/em-popup.c:568 ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
@@ -13997,6 +14066,10 @@ msgid "Please check your account settings and try again."
 msgstr "Please check your account settings and try again."
 
 #: mail/mail.error.xml.h:71
+msgid "Please enable the account or send using another account."
+msgstr "Please enable the account or send using another account."
+
+#: mail/mail.error.xml.h:72
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14004,7 +14077,7 @@ msgstr ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 
-#: mail/mail.error.xml.h:72
+#: mail/mail.error.xml.h:73
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14016,47 +14089,47 @@ msgstr ""
 "{0}\n"
 "Send anyway?"
 
-#: mail/mail.error.xml.h:75
+#: mail/mail.error.xml.h:76
 msgid "Please provide an unique name to identify this signature."
 msgstr "Please provide an unique name to identify this signature."
 
-#: mail/mail.error.xml.h:76
+#: mail/mail.error.xml.h:77
 msgid "Please wait."
 msgstr "Please wait."
 
-#: mail/mail.error.xml.h:77
+#: mail/mail.error.xml.h:78
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem migrating old mail folder &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:78
+#: mail/mail.error.xml.h:79
 msgid "Querying server"
 msgstr "Querying server"
 
-#: mail/mail.error.xml.h:79
+#: mail/mail.error.xml.h:80
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Querying server for a list of supported authentication mechanisms."
 
-#: mail/mail.error.xml.h:80
+#: mail/mail.error.xml.h:81
 msgid "Read receipt requested."
 msgstr "Read receipt requested."
 
-#: mail/mail.error.xml.h:81
+#: mail/mail.error.xml.h:82
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 
-#: mail/mail.error.xml.h:82
+#: mail/mail.error.xml.h:83
 msgid "Search Folders automatically updated."
 msgstr "Search Folders automatically updated."
 
-#: mail/mail.error.xml.h:83
+#: mail/mail.error.xml.h:84
 msgid "Send Receipt"
 msgstr "Send Receipt"
 
-#: mail/mail.error.xml.h:84
+#: mail/mail.error.xml.h:85
 msgid "Signature Already Exists"
 msgstr "Signature Already Exists"
 
-#: mail/mail.error.xml.h:85
+#: mail/mail.error.xml.h:86
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14064,7 +14137,7 @@ msgstr ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
 
-#: mail/mail.error.xml.h:86
+#: mail/mail.error.xml.h:87
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14080,7 +14153,7 @@ msgstr ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 
-#: mail/mail.error.xml.h:89
+#: mail/mail.error.xml.h:90
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14094,7 +14167,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "and has been updated."
 
-#: mail/mail.error.xml.h:94
+#: mail/mail.error.xml.h:95
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14108,7 +14181,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 
-#: mail/mail.error.xml.h:99
+#: mail/mail.error.xml.h:100
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14120,11 +14193,11 @@ msgstr ""
 "The message is stored in the Outbox folder.  Check the message for errors "
 "and resend."
 
-#: mail/mail.error.xml.h:101
+#: mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "The script file must exist and be executable."
 
-#: mail/mail.error.xml.h:102
+#: mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14132,13 +14205,21 @@ msgstr ""
 "This folder may have been added implicitl.,\n"
 "Go to the Search Folder editor to add it explicitly, if required."
 
-#: mail/mail.error.xml.h:104
+#: mail/mail.error.xml.h:105
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+
+#: mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "This message cannot be sent because you have not specified any Recipients"
 
-#: mail/mail.error.xml.h:105
+#: mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14146,15 +14227,15 @@ msgstr ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 
-#: mail/mail.error.xml.h:106
+#: mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: mail/mail.error.xml.h:107
+#: mail/mail.error.xml.h:109
 msgid "Unable to connect to the GroupWise server."
 msgstr "Unable to connect to the GroupWise server."
 
-#: mail/mail.error.xml.h:108
+#: mail/mail.error.xml.h:110
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -14162,39 +14243,39 @@ msgstr ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 
-#: mail/mail.error.xml.h:109
+#: mail/mail.error.xml.h:111
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#: mail/mail.error.xml.h:110
+#: mail/mail.error.xml.h:112
 msgid "Use _Default"
 msgstr "Use _Default"
 
-#: mail/mail.error.xml.h:111
+#: mail/mail.error.xml.h:113
 msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
-#: mail/mail.error.xml.h:112
+#: mail/mail.error.xml.h:114
 msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
 
-#: mail/mail.error.xml.h:113
+#: mail/mail.error.xml.h:115
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: mail/mail.error.xml.h:114
+#: mail/mail.error.xml.h:116
 msgid "You may not create two accounts with the same name."
 msgstr "You may not create two accounts with the same name."
 
-#: mail/mail.error.xml.h:115
+#: mail/mail.error.xml.h:117
 msgid "You must name this Search Folder."
 msgstr "You must name this Search Folder."
 
-#: mail/mail.error.xml.h:116
+#: mail/mail.error.xml.h:118
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
-#: mail/mail.error.xml.h:117
+#: mail/mail.error.xml.h:119
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14204,28 +14285,28 @@ msgstr ""
 "Either select the folders individually, and/or by select all local folders, "
 "all remote folders, or both."
 
-#: mail/mail.error.xml.h:119
+#: mail/mail.error.xml.h:121
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Failed to log into your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 
-#: mail/mail.error.xml.h:120
+#: mail/mail.error.xml.h:122
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Your message with the subject &quot;{0}&quot; was not delivered."
 
-#: mail/mail.error.xml.h:121
+#: mail/mail.error.xml.h:123
 msgid "_Append"
 msgstr "_Append"
 
-#: mail/mail.error.xml.h:122
+#: mail/mail.error.xml.h:124
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
-#: mail/mail.error.xml.h:124
+#: mail/mail.error.xml.h:126
 msgid "_Expunge"
 msgstr "_Expunge"
 
-#: mail/mail.error.xml.h:125
+#: mail/mail.error.xml.h:127
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
@@ -14271,7 +14352,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: mail/message-list.c:1355 plugins/itip-formatter/itip-view.c:198
+#: mail/message-list.c:1355 plugins/itip-formatter/itip-view.c:197
 #: widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
@@ -14344,7 +14425,7 @@ msgstr "Follow-Up"
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:41
+#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Forward"
 
@@ -14352,11 +14433,11 @@ msgstr "Forward"
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:81
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:82
 msgid "Reply"
 msgstr "Reply"
 
-#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:82
+#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:83
 msgid "Reply to All"
 msgstr "Reply to All"
 
@@ -14722,11 +14803,11 @@ msgstr "_OWA URL:"
 msgid "A_uthenticate"
 msgstr "A_uthenticate"
 
-#: plugins/exchange-operations/exchange-account-setup.c:824
+#: plugins/exchange-operations/exchange-account-setup.c:823
 msgid "Authentication Type"
 msgstr "Authentication Type"
 
-#: plugins/exchange-operations/exchange-account-setup.c:838
+#: plugins/exchange-operations/exchange-account-setup.c:837
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
@@ -15465,7 +15546,7 @@ msgid "Subscribe to my _notifications"
 msgstr "Subscribe to my _notifications"
 
 #: plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Read"
 msgstr "_Read"
 
@@ -15703,256 +15784,256 @@ msgid "Conflict Search Table"
 msgstr "Conflict Search Table"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:184 ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:459
+#: plugins/itip-formatter/itip-view.c:183 ui/evolution-calendar.xml.h:34
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:466
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:189
+#: plugins/itip-formatter/itip-view.c:188
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:193
+#: plugins/itip-formatter/itip-view.c:192
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:202
+#: plugins/itip-formatter/itip-view.c:201
 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:212
+#: plugins/itip-formatter/itip-view.c:211
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:217
+#: plugins/itip-formatter/itip-view.c:216
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:221
+#: plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:226
+#: plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:230
+#: plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: plugins/itip-formatter/itip-view.c:249
+#: plugins/itip-formatter/itip-view.c:248
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:254
+#: plugins/itip-formatter/itip-view.c:253
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:258
+#: plugins/itip-formatter/itip-view.c:257
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:263
+#: plugins/itip-formatter/itip-view.c:262
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:267
+#: plugins/itip-formatter/itip-view.c:266
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: plugins/itip-formatter/itip-view.c:276
+#: plugins/itip-formatter/itip-view.c:275
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:282
+#: plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:286
+#: plugins/itip-formatter/itip-view.c:285
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:291
+#: plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:295
+#: plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: plugins/itip-formatter/itip-view.c:301
+#: plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:306
+#: plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: plugins/itip-formatter/itip-view.c:310
+#: plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: plugins/itip-formatter/itip-view.c:315
+#: plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: plugins/itip-formatter/itip-view.c:319
+#: plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: plugins/itip-formatter/itip-view.c:344
+#: plugins/itip-formatter/itip-view.c:343
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> through %s has published the following meeting information:"
 
-#: plugins/itip-formatter/itip-view.c:346
+#: plugins/itip-formatter/itip-view.c:345
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> has published the following meeting information:"
 
-#: plugins/itip-formatter/itip-view.c:351
+#: plugins/itip-formatter/itip-view.c:350
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> has delegated the following meeting to you:"
 
-#: plugins/itip-formatter/itip-view.c:354
+#: plugins/itip-formatter/itip-view.c:353
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> through %s requests your presence at the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:356
+#: plugins/itip-formatter/itip-view.c:355
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> requests your presence at the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:362
+#: plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> through %s wishes to add to an existing meeting:"
 
-#: plugins/itip-formatter/itip-view.c:364
+#: plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> wishes to add to an existing meeting:"
 
-#: plugins/itip-formatter/itip-view.c:367
+#: plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:370
+#: plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> has sent back the following meeting response:"
 
-#: plugins/itip-formatter/itip-view.c:374
+#: plugins/itip-formatter/itip-view.c:373
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> through %s has cancelled the following meeting:"
 
-#: plugins/itip-formatter/itip-view.c:376
+#: plugins/itip-formatter/itip-view.c:375
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> has cancelled the following meeting."
 
-#: plugins/itip-formatter/itip-view.c:379
+#: plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> has proposed the following meeting changes."
 
-#: plugins/itip-formatter/itip-view.c:383
+#: plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> through %s has declined the following meeting changes:"
 
-#: plugins/itip-formatter/itip-view.c:385
+#: plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> has declined the following meeting changes."
 
-#: plugins/itip-formatter/itip-view.c:412
+#: plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> through %s has published the following task:"
 
-#: plugins/itip-formatter/itip-view.c:414
+#: plugins/itip-formatter/itip-view.c:413
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> has published the following task:"
 
-#: plugins/itip-formatter/itip-view.c:419
+#: plugins/itip-formatter/itip-view.c:418
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> requests the assignment of %s to the following task:"
 
-#: plugins/itip-formatter/itip-view.c:422
+#: plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> through %s has assigned you a task:"
 
-#: plugins/itip-formatter/itip-view.c:424
+#: plugins/itip-formatter/itip-view.c:423
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> has assigned you a task:"
 
-#: plugins/itip-formatter/itip-view.c:430
+#: plugins/itip-formatter/itip-view.c:429
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> through %s wishes to add to an existing task:"
 
-#: plugins/itip-formatter/itip-view.c:432
+#: plugins/itip-formatter/itip-view.c:431
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> wishes to add to an existing task:"
 
-#: plugins/itip-formatter/itip-view.c:435
+#: plugins/itip-formatter/itip-view.c:434
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -15961,57 +16042,57 @@ msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 
-#: plugins/itip-formatter/itip-view.c:438
+#: plugins/itip-formatter/itip-view.c:437
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> has sent back the following assigned task response:"
 
-#: plugins/itip-formatter/itip-view.c:442
+#: plugins/itip-formatter/itip-view.c:441
 #, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
 
-#: plugins/itip-formatter/itip-view.c:444
+#: plugins/itip-formatter/itip-view.c:443
 #, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> has cancelled the following assigned task:"
 
-#: plugins/itip-formatter/itip-view.c:447
+#: plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> has proposed the following task assignment changes:"
 
-#: plugins/itip-formatter/itip-view.c:451
+#: plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> through %s has declined the following assigned task:"
 
-#: plugins/itip-formatter/itip-view.c:453
+#: plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> has declined the following assigned task:"
 
 #. Start time
-#: plugins/itip-formatter/itip-view.c:892
+#: plugins/itip-formatter/itip-view.c:891
 msgid "Start time:"
 msgstr "Start time:"
 
 #. End time
-#: plugins/itip-formatter/itip-view.c:901
+#: plugins/itip-formatter/itip-view.c:900
 msgid "End time:"
 msgstr "End time:"
 
 #. Comment
-#: plugins/itip-formatter/itip-view.c:917
-#: plugins/itip-formatter/itip-view.c:967
+#: plugins/itip-formatter/itip-view.c:916
+#: plugins/itip-formatter/itip-view.c:966
 msgid "Comment:"
 msgstr "Comment:"
 
-#: plugins/itip-formatter/itip-view.c:981
+#: plugins/itip-formatter/itip-view.c:980
 msgid "Send u_pdates to attendees"
 msgstr "Send u_pdates to attendees"
 
-#: plugins/itip-formatter/itip-view.c:990
+#: plugins/itip-formatter/itip-view.c:989
 msgid "A_pply to all instances"
 msgstr "A_pply to all instances"
 
@@ -16391,7 +16472,7 @@ msgstr "Gives an option to print mail from composer"
 
 #: plugins/print-message/org-gnome-print-message.xml.h:1
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail-message.xml.h:77 ui/evolution-memos.xml.h:12
+#: ui/evolution-mail-message.xml.h:78 ui/evolution-memos.xml.h:12
 #: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
@@ -16915,7 +16996,7 @@ msgstr "Uknown system error."
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:1257 widgets/misc/e-cell-date-edit.c:256
+#: shell/e-shell.c:1257 widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
@@ -17897,7 +17978,7 @@ msgstr "List"
 msgid "Month"
 msgstr "Month"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:59
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:60
 msgid "Next"
 msgstr "Next"
 
@@ -17905,7 +17986,7 @@ msgstr "Next"
 msgid "Previews the calendar to be printed"
 msgstr "Previews the calendar to be printed"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:75
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:76
 msgid "Previous"
 msgstr "Previous"
 
@@ -18092,71 +18173,67 @@ msgstr "Show Time _Zone"
 msgid "Show time as b_usy"
 msgstr "Show time as b_usy"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor.xml.h:11
-msgid "Time Zone"
-msgstr "Time Zone"
-
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-task-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "Toggles whether the Attendee Type field is displayed"
 
-#: ui/evolution-event-editor.xml.h:18 ui/evolution-task-editor.xml.h:13
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:18 ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor.xml.h:15
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ui/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:22
 msgid "Toggles whether to have All day Event"
 msgstr "Toggles whether to have All day Event"
 
-#: ui/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:23
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ui/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:24
 msgid "_Alarms"
 msgstr "_Alarms"
 
-#: ui/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:25
 msgid "_All day Event"
 msgstr "_All day Event"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor.xml.h:19
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor.xml.h:20
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "_Private"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor.xml.h:24
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor.xml.h:25
 msgid "_Type Field"
 msgstr "_Type Field"
 
@@ -18291,7 +18368,7 @@ msgstr ""
 msgid "Mar_k Messages as Read"
 msgstr "Mar_k Messages as Read"
 
-#: ui/evolution-mail-list.xml.h:13 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-list.xml.h:13 ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
 msgstr "Paste message(s) from the clipboard"
 
@@ -18343,7 +18420,7 @@ msgstr "Temporarily hide the selected messages"
 msgid "Threaded Message list"
 msgstr "Threaded Message list"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-mail-message.xml.h:115
 #: ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Message"
@@ -18461,298 +18538,314 @@ 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:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filter on Se_nder..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filter on _Recipients..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filter on _Subject..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: 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:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Flag selected message(s) for follow-up"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Follow _Up..."
 
-#: ui/evolution-mail-message.xml.h:40
+#: 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:42
+#: 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:43
+#: 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:44
+#: 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:45
+#: 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:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
 msgstr "Mar_k as"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
 msgstr "Mark the selected message(s) as having been read"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as important"
 msgstr "Mark the selected message(s) as important"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as junk"
 msgstr "Mark the selected message(s) as junk"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Mark the selected message(s) as not being junk"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Mark the selected message(s) as not having been read"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Mark the selected message(s) as unimportant"
 
-#: ui/evolution-mail-message.xml.h:55
+#: 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:56
+#: ui/evolution-mail-message.xml.h:57
 msgid "Message Source"
 msgstr "Message Source"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:58
 msgid "Move"
 msgstr "Move"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:59
 msgid "Move selected message(s) to another folder"
 msgstr "Move selected message(s) to another folder"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:62
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Not Junk"
 msgstr "Not Junk"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:65
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in a new window"
 msgstr "Open the selected message in a new window"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:67
 msgid "Open the selected message in the composer for editing"
 msgstr "Open the selected message in the composer for editing"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:68
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:70
 msgid "Pos_t New Message to Folder"
 msgstr "Pos_t New Message to Folder"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
 msgstr "Post a Repl_y"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:72
 msgid "Post a message to a Public folder"
 msgstr "Post a message to a Public folder"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:73
 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:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Save the message as a text file"
 msgstr "Save the message as a text file"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Mailing _List..."
 msgstr "Search Folder from Mailing _List..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from Recipients..."
 msgstr "Search Folder from Recipients..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from S_ubject..."
 msgstr "Search Folder from S_ubject..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "Search Folder from Sen_der..."
 msgstr "Search Folder from Sen_der..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:91
 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
+#: ui/evolution-mail-message.xml.h:92
 msgid "Select _All Text"
 msgstr "Select _All Text"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 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-mail-message.xml.h:94
 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
+#: ui/evolution-mail-message.xml.h:95
 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
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Show message in the normal style"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Show message with all email headers"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Show the raw email source of the message"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 msgid "Un-delete the selected messages"
 msgstr "Un-delete the selected messages"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
+msgid "_Attached"
+msgstr "_Attached"
+
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
 msgstr "_Find in Message..."
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Important"
 
-#: ui/evolution-mail-message.xml.h:110
+#: 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:111
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:123
+msgid "_Quoted"
+msgstr "_Quoted"
+
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save Message..."
 msgstr "_Save Message..."
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ui/evolution-mail-message.xml.h:124
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:129
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
@@ -19030,6 +19123,10 @@ msgstr "Click to change/view the status details of the task"
 msgid "Status Details"
 msgstr "Status Details"
 
+#: ui/evolution-task-editor.xml.h:11
+msgid "Time Zone"
+msgstr "Time Zone"
+
 #: ui/evolution-task-editor.xml.h:23
 msgid "_Status Details"
 msgstr "_Status Details"
@@ -19226,10 +19323,6 @@ msgstr "_New"
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ui/evolution.xml.h:41
-msgid "_Quit"
-msgstr "_Quit"
-
 #: ui/evolution.xml.h:42
 msgid "_Send / Receive"
 msgstr "_Send / Receive"
@@ -19518,11 +19611,11 @@ msgstr "Minimum Width"
 msgid "Spacing"
 msgstr "Spacing"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:460
 msgid "Now"
 msgstr "Now"
 
-#: widgets/misc/e-cell-date-edit.c:801
+#: widgets/misc/e-cell-date-edit.c:802
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
@@ -19618,31 +19711,31 @@ msgstr "Other..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:316
+#: widgets/misc/e-dateedit.c:320
 msgid "Date and Time Entry"
 msgstr "Date and Time Entry"
 
-#: widgets/misc/e-dateedit.c:335
+#: widgets/misc/e-dateedit.c:339
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: widgets/misc/e-dateedit.c:336
+#: widgets/misc/e-dateedit.c:340
 msgid "Text Date Entry"
 msgstr "Text Date Entry"
 
-#: widgets/misc/e-dateedit.c:354
+#: widgets/misc/e-dateedit.c:361
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: widgets/misc/e-dateedit.c:355
+#: widgets/misc/e-dateedit.c:362
 msgid "Date Button"
 msgstr "Date Button"
 
-#: widgets/misc/e-dateedit.c:376
+#: widgets/misc/e-dateedit.c:383
 msgid "Combo box to select time"
 msgstr "Combo box to select time"
 
-#: widgets/misc/e-dateedit.c:377
+#: widgets/misc/e-dateedit.c:384
 msgid "Time Combo Box"
 msgstr "Time Combo Box"