Updated British translation.

2004-09-06  David Lodge <dave@cirt.net>

        * en_GB.po: Updated British translation.

svn path=/trunk/; revision=27166

2 files changed, 1736 insertions, 4127 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index c80d841356..b4b139ef5b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-06  David Lodge <dave@cirt.net>
+
+	* en_GB.po: Updated British translation.
+
 2004-09-06  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
 	* da.po: Updated Danish translation.
diff --git a/po/en_GB.po b/po/en_GB.po
index 016e7aa903..19d62c1495 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,19 +1,18 @@
 # English (Commonwealth) translation
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Robert Brady <rwb197@zepler.org> 2000
+# Robert Brady <rwb197@zepler.org>, 2000.
+# Gareth Owen <gowen72@yahoo.com>, David Lodge <dave@cirt.net>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-13 14:55-0400\n"
-"PO-Revision-Date: 2004-09-03 15:47-0400\n"
-"Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
+"Project-Id-Version: evolution gnome-2.8\n"
+"POT-Creation-Date: 2004-09-06 21:04+0100\n"
+"PO-Revision-Date: 2004-09-06 21:07+0100\n"
+"Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
@@ -56,12 +55,8 @@ msgstr "This addressbook could not be opened."
 
 #. addressbook:ldap-init secondary
 #: addressbook/addressbook-errors.xml.h:4
-msgid ""
-"This addressbook server might unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+msgid "This addressbook server might unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
 
 #. addressbook:ldap-auth primary
 #: addressbook/addressbook-errors.xml.h:6
@@ -70,30 +65,18 @@ msgstr "Failed to authenticate with LDAP server."
 
 #. addressbook:ldap-auth secondary
 #: addressbook/addressbook-errors.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
 
 #. addressbook:ldap-search-base primary
 #: addressbook/addressbook-errors.xml.h:10
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "This addressbook server does not have any suggested search bases."
 
-#. addressbook:ldap-search-base secondary
+#  addressbook:ldap-search-base secondary
 #: addressbook/addressbook-errors.xml.h:12
-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 "
-"supported search bases."
-msgstr ""
-"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 "
-"supported search bases."
+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 supported search bases."
+msgstr "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 supported search bases."
 
 #. addressbook:ldap-v3-schema primary
 #: addressbook/addressbook-errors.xml.h:14
@@ -115,7 +98,11 @@ msgstr "LDAP server did not respond with valid schema information."
 msgid "Could not remove addressbook."
 msgstr "Could not remove addressbook."
 
-#. addressbook:remove-addressbook secondary
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:22
+msgid "Category editor not available."
+msgstr "Category editor not available."
+
 #. addressbook:generic-error primary
 #. addressbook:load-error secondary
 #. addressbook:search-error secondary
@@ -127,100 +114,87 @@ msgstr "Could not remove addressbook."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:22
-#: addressbook/addressbook-errors.xml.h:26
-#: addressbook/addressbook-errors.xml.h:34
-#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
-#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
-#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
-#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: addressbook/addressbook-errors.xml.h:24
+#: addressbook/addressbook-errors.xml.h:32
+#: addressbook/addressbook-errors.xml.h:36
+#: mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84
 #: mail/mail-errors.xml.h:88
 msgid "{0}"
 msgstr "{0}"
 
-#. addressbook:edit-categories primary
-#: addressbook/addressbook-errors.xml.h:24
-msgid "Category editor not available."
-msgstr "Category editor not available."
-
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:28
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+#: addressbook/addressbook-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:4
+#: mail/mail-errors.xml.h:92
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:30
+#: addressbook/addressbook-errors.xml.h:28
 msgid "Unable to open addressbook"
 msgstr "Unable to open addressbook"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:32
+#: addressbook/addressbook-errors.xml.h:30
 msgid "Error loading addressbook."
 msgstr "Error loading addressbook."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:34
 msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:40
+#: addressbook/addressbook-errors.xml.h:38
 msgid "Would you like to save your changes?"
 msgstr "Would you like to save your changes?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:42
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+#: addressbook/addressbook-errors.xml.h:40
+msgid "You have made modifications to this contact. Do you want to save these changes?"
+msgstr "You have made modifications to this contact. Do you want to save these changes?"
 
-#: addressbook/addressbook-errors.xml.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+#: addressbook/addressbook-errors.xml.h:41
 msgid "_Discard"
 msgstr "_Discard"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:45
+#: addressbook/addressbook-errors.xml.h:43
 msgid "Cannot move contact."
 msgstr "Cannot move contact."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:47
-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?"
-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-errors.xml.h:45
+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?"
+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:save-error primary
-#: addressbook/addressbook-errors.xml.h:49
+#: addressbook/addressbook-errors.xml.h:47
 msgid "Unable to save contact(s)."
 msgstr "Unable to save contact(s)."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:51
+#: addressbook/addressbook-errors.xml.h:49
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Error saving contacts to {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:53
+#: addressbook/addressbook-errors.xml.h:51
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "The Evolution addressbook has quit unexpectedly."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:55
-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-errors.xml.h:53
+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/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
@@ -237,61 +211,57 @@ msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autocompletion"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "C_ontacts"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Certificates"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Configure autocomplete here"
 
 #. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/gui/component/addressbook-view.c:1104
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/addressbook-view.c:1144
 #: calendar/gui/migration.c:377
 msgid "Contacts"
 msgstr "Contacts"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook"
 msgstr "Evolution Addressbook"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Evolution Addressbook address pop-up"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolution Addressbook address viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolution Addressbook card viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook component"
 msgstr "Evolution Addressbook component"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolution S/Mime Certificate Management Control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Evolution folder settings configuration control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr "Manage your S/MIME certificates here"
 
@@ -320,7 +290,7 @@ msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
 #: addressbook/gui/component/addressbook-component.c:109
-#: addressbook/gui/component/addressbook-view.c:773
+#: addressbook/gui/component/addressbook-view.c:813
 msgid "New Address Book"
 msgstr "New Address Book"
 
@@ -337,12 +307,14 @@ msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Failed upgrading Addressbook settings or folders."
 
 #: addressbook/gui/component/addressbook-migrate.c:72
-#: calendar/gui/migration.c:141 mail/em-migrate.c:1160
+#: calendar/gui/migration.c:141
+#: mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrating..."
 
 #: addressbook/gui/component/addressbook-migrate.c:124
-#: calendar/gui/migration.c:188 mail/em-migrate.c:1201
+#: calendar/gui/migration.c:188
+#: mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
@@ -350,9 +322,12 @@ msgstr "Migrating `%s':"
 #. create the local source group
 #. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: calendar/gui/migration.c:450
+#: calendar/gui/migration.c:532
+#: mail/em-folder-tree-model.c:196
+#: mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:249
+#: mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -362,8 +337,11 @@ msgstr "On This Computer"
 #. orange
 #: addressbook/gui/component/addressbook-migrate.c:501
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
-#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: calendar/gui/migration.c:458
+#: calendar/gui/migration.c:540
+#: filter/filter-label.c:123
+#: mail/em-migrate.c:1013
+#: mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personal"
@@ -383,13 +361,11 @@ msgstr "Autocompletion Settings"
 
 #: addressbook/gui/component/addressbook-migrate.c:1123
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
@@ -423,24 +399,29 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-view.c:671
+#: addressbook/gui/component/addressbook-view.c:711
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
 
-#: addressbook/gui/component/addressbook-view.c:774
+#: addressbook/gui/component/addressbook-view.c:814
 #: addressbook/gui/widgets/e-addressbook-view.c:1124
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:376
-#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: calendar/gui/calendar-component.c:430
+#: calendar/gui/tasks-component.c:376
+#: mail/em-filter-i18n.h:11
+#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-contact-list-editor.xml.h:3
+#: ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-view.c:775
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:378
+#: addressbook/gui/component/addressbook-view.c:815
+#: calendar/gui/calendar-component.c:431
+#: calendar/gui/tasks-component.c:378
 msgid "Properties..."
 msgstr "Properties..."
 
@@ -468,12 +449,8 @@ msgid "Position of the vertical pane in main view"
 msgstr "Position of the vertical pane in main view"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-msgid ""
-"The number of characters that must be typed before evolution will attempt to "
-"autocomplete"
-msgstr ""
-"The number of characters that must be typed before evolution will attempt to "
-"autocomplete"
+msgid "The number of characters that must be typed before evolution will attempt to autocomplete"
+msgstr "The number of characters that must be typed before evolution will attempt to autocomplete"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
@@ -494,8 +471,10 @@ msgstr "URI for the folder last used in the select names dialogue"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1
+#: mail/mail-config.glade.h:3
+#: mail/mail-dialogs.glade.h:6
+#: mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -553,7 +532,8 @@ msgstr "Add Address Book"
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15
+#: mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Always"
@@ -567,7 +547,8 @@ msgid "Basic"
 msgstr "Basic"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
@@ -580,10 +561,8 @@ msgid "Email address"
 msgstr "Email address"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution will use this email address to authenticate you with the server."
 
 #: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
@@ -591,7 +570,8 @@ msgstr "Find Possible Search Bases"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
@@ -599,7 +579,8 @@ msgstr "General"
 msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25
+#: mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Never"
@@ -613,34 +594,16 @@ msgid "Search _base:"
 msgstr "Search _base:"
 
 #: addressbook/gui/component/ldap-config.glade.h:28
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
-msgstr ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
+msgstr "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
 
 #: addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
-msgstr ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
+msgstr "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
 
 #: addressbook/gui/component/ldap-config.glade.h:30
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
-msgstr ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+msgid "Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
+msgstr "Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
 
 #: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
@@ -651,70 +614,32 @@ msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
 #: addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
+msgid "The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgstr "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 
 #: addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+msgstr "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 
 #: addressbook/gui/component/ldap-config.glade.h:36
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgstr "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
 
 #: addressbook/gui/component/ldap-config.glade.h:37
-msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
+msgid "This is the method evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
+msgstr "This is the method evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgstr "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
 
 #: addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 
 #: addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
@@ -724,15 +649,15 @@ msgstr "Using distinguished name (DN)"
 msgid "Using email address"
 msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:42
+#: mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
 #: addressbook/gui/component/ldap-config.glade.h:43
-#, fuzzy
 msgid "_Add Address Book"
-msgstr "Add Address Book"
+msgstr "_Add Address Book"
 
 #: addressbook/gui/component/ldap-config.glade.h:44
 msgid "_Download limit:"
@@ -747,7 +672,8 @@ msgid "_Log in method:"
 msgstr "_Log in method:"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+#: mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -777,7 +703,8 @@ msgstr "cards"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 #: calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#: filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutes"
@@ -1032,7 +959,9 @@ msgstr "Web Log:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: addressbook/gui/contact-editor/e-contact-editor.c:201
-#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: filter/filter-label.c:122
+#: mail/em-migrate.c:1012
+#: mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Work"
@@ -2121,20 +2050,19 @@ msgstr "Writable Fields"
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2428
+#: addressbook/gui/contact-editor/e-contact-editor.c:2456
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
-#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2505
+#: addressbook/gui/contact-editor/e-contact-editor.c:2549
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2509
+#: addressbook/gui/contact-editor/e-contact-editor.c:2550
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+#: addressbook/gui/contact-editor/e-contact-editor.c:2778
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2142,26 +2070,10 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: addressbook/gui/contact-editor/e-contact-editor.c:2806
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2799
-msgid ""
-"The contact cannot be saved to the selected address book. Do you want to "
-"discard changes?"
-msgstr ""
-"The contact cannot be saved to the selected address book. Do you want to "
-"discard changes?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2822
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
@@ -2425,17 +2337,12 @@ msgid "No contacts"
 msgstr "No contacts"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacts"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:491
+#, c-format
 msgid "Query"
 msgstr "Query"
 
@@ -2531,10 +2438,14 @@ msgstr "Forward Contact"
 msgid "Send Message to Contact"
 msgstr "Send Message to Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1111 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Print"
 
@@ -2551,19 +2462,23 @@ msgid "Move to Address Book..."
 msgstr "Move to Address Book..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1121
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1122
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:374
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: calendar/gui/calendar-component.c:428
+#: calendar/gui/tasks-component.c:374
+#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copy"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Paste"
 
@@ -2617,7 +2532,8 @@ msgid "Company Phone"
 msgstr "Company Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826
+#: addressbook/gui/widgets/eab-contact-display.c:547
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
@@ -2926,10 +2842,14 @@ msgstr "Protocol not supported"
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349
-#: camel/camel-service.c:724 camel/camel-service.c:762
-#: camel/camel-service.c:846 camel/camel-service.c:886
+#: calendar/gui/e-cal-model-tasks.c:353
+#: calendar/gui/e-cal-model-tasks.c:656
+#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/print.c:2349
+#: camel/camel-service.c:724
+#: camel/camel-service.c:762
+#: camel/camel-service.c:846
+#: camel/camel-service.c:886
 #: camel/providers/pop3/camel-pop3-store.c:456
 #: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
@@ -2967,38 +2887,20 @@ msgid "Other error"
 msgstr "Other error"
 
 #: addressbook/gui/widgets/eab-gui-util.c:91
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
+msgid "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
+msgstr "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
 
 #: addressbook/gui/widgets/eab-gui-util.c:98
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+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:103
-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 "
-"Evolution package."
-msgstr ""
-"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 "
-"Evolution package."
+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 Evolution package."
+msgstr "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 Evolution package."
 
 #: addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
+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:130
 msgid ""
@@ -3041,7 +2943,7 @@ msgid "Error adding list"
 msgstr "Error adding list"
 
 #: addressbook/gui/widgets/eab-gui-util.c:170
-#: addressbook/gui/widgets/eab-gui-util.c:640
+#: addressbook/gui/widgets/eab-gui-util.c:643
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
@@ -3058,20 +2960,12 @@ msgid "Error removing list"
 msgstr "Error removing list"
 
 #: addressbook/gui/widgets/eab-gui-util.c:193
-#: addressbook/gui/widgets/eab-gui-util.c:598
+#: addressbook/gui/widgets/eab-gui-util.c:601
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
 #: addressbook/gui/widgets/eab-gui-util.c:275
-#, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"Opening %d 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:301
+#: addressbook/gui/widgets/eab-gui-util.c:304
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3080,44 +2974,44 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:305
+#: addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Overwrite"
 msgstr "Overwrite"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:383
+#: addressbook/gui/widgets/eab-gui-util.c:386
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:545
+#: addressbook/gui/widgets/eab-gui-util.c:548
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:694
+#: addressbook/gui/widgets/eab-gui-util.c:697
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:696
+#: addressbook/gui/widgets/eab-gui-util.c:699
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:699
+#: addressbook/gui/widgets/eab-gui-util.c:702
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:701
+#: addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Select target addressbook."
 msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:927
+#: addressbook/gui/widgets/eab-gui-util.c:930
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:930
+#: addressbook/gui/widgets/eab-gui-util.c:933
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -3162,14 +3056,9 @@ msgid "Merge E-Mail Address"
 msgstr "Merge E-Mail Address"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "and %d other contact."
-msgstr[1] "and %d other contacts."
-
 #: addressbook/gui/widgets/eab-vcard-control.c:223
 #: addressbook/gui/widgets/eab-vcard-control.c:272
+#, c-format
 msgid "Show Full VCard"
 msgstr "Show Full VCard"
 
@@ -3460,20 +3349,16 @@ msgid "Export in asynchronous mode "
 msgstr "Export in asynchronous mode "
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-"The number of cards in one output file in asychronous mode,default size 100."
+msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgstr "The number of cards in one output file in asychronous mode,default size 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Command line arguments error, please use --help option to see the usage."
 
 #: addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
@@ -3509,27 +3394,28 @@ msgstr "Unnamed List"
 
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
-#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+#: calendar/calendar-errors.xml.h:2
+#: calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Would you like to send all the participants a cancellation notice?"
 
 #. calendar:prompt-cancel-meeting secondary
 #: calendar/calendar-errors.xml.h:4
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is cancelled."
-
-#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
-#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:87
-#: calendar/calendar-errors.xml.h:93 calendar/calendar-errors.xml.h:99
+msgid "If you don't send a cancellation notice, the other participants may not know the meeting is canceled."
+msgstr "If you don't send a cancellation notice, the other participants may not know the meeting is cancelled."
+
+#: calendar/calendar-errors.xml.h:5
+#: calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25
+#: calendar/calendar-errors.xml.h:87
+#: calendar/calendar-errors.xml.h:93
+#: calendar/calendar-errors.xml.h:99
 #: calendar/calendar-errors.xml.h:105
 msgid "Don't Send"
 msgstr "Don't Send"
 
-#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:6
+#: calendar/calendar-errors.xml.h:16
 #: calendar/calendar-errors.xml.h:26
 msgid "Send Notice"
 msgstr "Send Notice"
@@ -3541,29 +3427,25 @@ msgstr "Are you sure you want to delete this meeting?"
 
 #. calendar:prompt-delete-meeting secondary
 #: calendar/calendar-errors.xml.h:10
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
+msgstr "All information on this meeting will be deleted and can not be restored."
 
 #. calendar:prompt-cancel-task secondary
 #: calendar/calendar-errors.xml.h:14
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+msgid "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
+msgstr "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
 
 #. calendar:prompt-delete-task primary
-#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#: calendar/calendar-errors.xml.h:18
+#: calendar/calendar-errors.xml.h:44
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
 
 #. calendar:prompt-delete-task secondary
 #. calendar:prompt-delete-named-task secondary
 #. calendar:prompt-delete-task secondary
-#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:20
+#: calendar/calendar-errors.xml.h:42
 #: calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "All information on this task will be deleted and can not be restored."
@@ -3575,26 +3457,19 @@ msgstr "Would you like to send a cancellation notice for this journal entry?"
 
 #. calendar:prompt-cancel-journal secondary
 #: calendar/calendar-errors.xml.h:24
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+msgid "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
+msgstr "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
 
 #. calendar:prompt-delete-journal primary
-#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#: calendar/calendar-errors.xml.h:28
+#: calendar/calendar-errors.xml.h:52
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "Are you sure you want to delete this journal entry?"
 
 #. calendar:prompt-delete-journal secondary
 #: calendar/calendar-errors.xml.h:30
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
+msgid "All information on this journal entry will be deleted and can not be restored."
+msgstr "All information on this journal entry will be deleted and can not be restored."
 
 #. calendar:prompt-delete-titled-appointment primary
 #: calendar/calendar-errors.xml.h:32
@@ -3603,11 +3478,10 @@ msgstr "Are you sure you want to delete the appointment titled '{0}'?"
 
 #. calendar:prompt-delete-titled-appointment secondary
 #. calendar:prompt-delete-appointment secondary
-#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"All information on this appointment will be deleted and can not be restored."
+#: calendar/calendar-errors.xml.h:34
+#: calendar/calendar-errors.xml.h:38
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "All information on this appointment will be deleted and can not be restored."
 
 #. calendar:prompt-delete-appointment primary
 #: calendar/calendar-errors.xml.h:36
@@ -3626,11 +3500,10 @@ msgstr "Are you sure you want to delete the journal entry '{0}'?"
 
 #. calendar:prompt-delete-named-journal secondary
 #. calendar:prompt-delete-journal secondary
-#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr ""
-"All information in this journal will be deleted and can not be restored."
+#: calendar/calendar-errors.xml.h:50
+#: calendar/calendar-errors.xml.h:54
+msgid "All information in this journal will be deleted and can not be restored."
+msgstr "All information in this journal will be deleted and can not be restored."
 
 #. calendar:prompt-delete-appointments primary
 #: calendar/calendar-errors.xml.h:56
@@ -3639,12 +3512,8 @@ msgstr "Are you sure you want to delete these {0} appointments?"
 
 #. calendar:prompt-delete-appointments secondary
 #: calendar/calendar-errors.xml.h:58
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
+msgstr "All information on these appointments will be deleted and can not be restored."
 
 #. calendar:prompt-delete-tasks primary
 #: calendar/calendar-errors.xml.h:60
@@ -3654,8 +3523,7 @@ msgstr "Are you sure you want to delete these {0} tasks?"
 #. calendar:prompt-delete-tasks secondary
 #: calendar/calendar-errors.xml.h:62
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"All information on these tasks will be deleted and can not be restored."
+msgstr "All information on these tasks will be deleted and can not be restored."
 
 #. calendar:prompt-delete-journals primary
 #: calendar/calendar-errors.xml.h:64
@@ -3664,12 +3532,8 @@ msgstr "Are you sure you want to delete these {0} journal entries?"
 
 #. calendar:prompt-delete-journals secondary
 #: calendar/calendar-errors.xml.h:66
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
+msgid "All information in these journal entries will be deleted and can not be restored."
+msgstr "All information in these journal entries will be deleted and can not be restored."
 
 #. calendar:prompt-save-appointment title
 #: calendar/calendar-errors.xml.h:68
@@ -3686,32 +3550,31 @@ msgstr "Would you like to save your changes to this appointment?"
 msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "You have made changes to this appointment, but not yet saved them."
 
-#: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
+#: calendar/calendar-errors.xml.h:73
+#: calendar/calendar-errors.xml.h:81
 #: composer/mail-composer-errors.xml.h:33
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#: calendar/calendar-errors.xml.h:74 calendar/calendar-errors.xml.h:82
+#: calendar/calendar-errors.xml.h:74
+#: calendar/calendar-errors.xml.h:82
 msgid "Save Changes"
 msgstr "Save Changes"
 
-#. calendar:prompt-save-task title
+#  calendar:prompt-save-task title
 #: calendar/calendar-errors.xml.h:76
-#, fuzzy
 msgid "Save Task"
-msgstr "Save As"
+msgstr "Save Task"
 
-#. calendar:prompt-save-task primary
+#  calendar:prompt-save-task primary
 #: calendar/calendar-errors.xml.h:78
-#, fuzzy
 msgid "Would you like to save your changes to this task?"
-msgstr "Would you like to save your changes to this appointment?"
+msgstr "Would you like to save your changes to this task?"
 
-#. calendar:prompt-save-task secondary
+#  calendar:prompt-save-task secondary
 #: calendar/calendar-errors.xml.h:80
-#, fuzzy
 msgid "You have made changes to this task, but not yet saved them."
-msgstr "You have made changes to this appointment, but not yet saved them."
+msgstr "You have made changes to this task, but not yet saved them."
 
 #. calendar:prompt-meeting-invite primary
 #: calendar/calendar-errors.xml.h:84
@@ -3720,13 +3583,13 @@ msgstr "Would you like to send meeting invitations to participants?"
 
 #. calendar:prompt-meeting-invite secondary
 #: calendar/calendar-errors.xml.h:86
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
-msgstr ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+msgid "Email invitations will be sent to all participants and allow them to RSVP."
+msgstr "Email invitations will be sent to all participants and allow them to RSVP."
 
-#: calendar/calendar-errors.xml.h:88 calendar/calendar-errors.xml.h:94
-#: calendar/calendar-errors.xml.h:100 calendar/calendar-errors.xml.h:106
+#: calendar/calendar-errors.xml.h:88
+#: calendar/calendar-errors.xml.h:94
+#: calendar/calendar-errors.xml.h:100
+#: calendar/calendar-errors.xml.h:106
 #: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Send"
@@ -3738,12 +3601,8 @@ msgstr "Would you like to send updated meeting information to participants?"
 
 #. calendar:prompt-send-updated-meeting-info secondary
 #: calendar/calendar-errors.xml.h:92
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "Sending updated information allows other participants to keep their calendars up to date."
 
 #. calendar:prompt-send-task primary
 #: calendar/calendar-errors.xml.h:96
@@ -3752,12 +3611,8 @@ msgstr "Would you like to send this task to participants?"
 
 #. calendar:prompt-send-task secondary
 #: calendar/calendar-errors.xml.h:98
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Email invitations will be sent to all participants and allow them to accept this task."
 
 #. calendar:prompt-send-updated-task-info primary
 #: calendar/calendar-errors.xml.h:102
@@ -3766,12 +3621,8 @@ msgstr "Would you like to send updated task information to participants?"
 
 #. calendar:prompt-send-updated-task-info secondary
 #: calendar/calendar-errors.xml.h:104
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "Sending updated information allows other participants to keep their task lists up to date."
 
 #. calendar:tasks-crashed primary
 #: calendar/calendar-errors.xml.h:108
@@ -3793,7 +3644,8 @@ msgstr "The Evolution calendar has quit unexpectedly."
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Your calendars will not be available until Evolution is restarted."
 
-#: calendar/common/authentication.c:48 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:47
+#: calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Enter password"
@@ -3824,63 +3676,59 @@ msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 #: calendar/gui/calendar-component.c:1079
 msgid "Calendars"
 msgstr "Calendars"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configure your timezone, Calendar and Task List here "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution Calendar and Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolution Calendar configuration control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution Calendar scheduling message viewer"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolution Calendar/Task editor"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolution's Calendar component"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Evolution's Tasks component"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1198 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:889
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/e-tasks.c:1199
+#: calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:419
+#: calendar/gui/tasks-component.c:889
+#: calendar/gui/tasks-control.c:408
+#: calendar/importers/icalendar-importer.c:83
 #: calendar/importers/icalendar-importer.c:709
+#: camel/providers/groupwise/camel-gw-listener.c:332
 msgid "Tasks"
 msgstr "Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "_Calendars"
 msgstr "_Calendars"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasks"
@@ -3918,24 +3766,24 @@ msgstr "_Edit appointment"
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:904
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Open"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 msgid "Dismiss"
 msgstr "Dismiss"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:889
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss All"
 msgstr "Dismiss All"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:954
+#: calendar/gui/alarm-notify/alarm-queue.c:973
 msgid "No description available."
 msgstr "No description available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:974
+#: calendar/gui/alarm-notify/alarm-queue.c:992
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3948,12 +3796,12 @@ msgstr ""
 "Starting at %s\n"
 "Ending at %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1074
-#: calendar/gui/alarm-notify/alarm-queue.c:1098
+#: calendar/gui/alarm-notify/alarm-queue.c:1092
+#: calendar/gui/alarm-notify/alarm-queue.c:1116
 msgid "Warning"
 msgstr "Warning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1078
+#: calendar/gui/alarm-notify/alarm-queue.c:1096
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3965,24 +3813,22 @@ msgstr ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1122
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1118
+#: calendar/gui/alarm-notify/alarm-queue.c:1136
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
@@ -4142,27 +3988,23 @@ msgstr "Comment contains"
 msgid "Location contains"
 msgstr "Location contains"
 
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+#: calendar/gui/cal-search-bar.c:362
+#: camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
+#: calendar/gui/calendar-commands.c:117
+#: calendar/gui/calendar-component.c:564
 #: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1860
+#: calendar/gui/gnome-cal.c:1859
 #: camel/providers/groupwise/camel-gw-listener.c:331
 #: camel/providers/groupwise/camel-gw-listener.c:361
 msgid "Calendar"
 msgstr "Calendar"
 
 #: calendar/gui/calendar-commands.c:352
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 
 #: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
@@ -4170,7 +4012,8 @@ msgstr "Purge events older than"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
+#: filter/filter.glade.h:13
 msgid "days"
 msgstr "days"
 
@@ -4184,20 +4027,27 @@ msgstr "%A %d %B %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:519
-#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
+#: calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-component.c:519
+#: calendar/gui/e-day-view-top-item.c:714
+#: calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:521
-#: calendar/gui/calendar-component.c:526 calendar/gui/calendar-component.c:528
+#: calendar/gui/calendar-commands.c:437
+#: calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-component.c:521
+#: calendar/gui/calendar-component.c:526
+#: calendar/gui/calendar-component.c:528
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-commands.c:461
+#: calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473
+#: calendar/gui/calendar-commands.c:475
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
@@ -4205,7 +4055,8 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:465
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
+#: calendar/gui/e-week-view-main-item.c:337
+#: calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4222,8 +4073,10 @@ msgstr "New Calendar"
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:547
-#: calendar/gui/calendar-component.c:553 calendar/gui/calendar-component.c:555
+#: calendar/gui/calendar-component.c:540
+#: calendar/gui/calendar-component.c:547
+#: calendar/gui/calendar-component.c:553
+#: calendar/gui/calendar-component.c:555
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -4233,7 +4086,8 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-component.c:545
-#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
+#: calendar/gui/e-day-view-top-item.c:718
+#: calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
@@ -4370,7 +4224,8 @@ msgstr "Custom alarm sound"
 msgid "Mes_sage:"
 msgstr "Mes_sage:"
 
-#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Play a sound"
 
@@ -4435,7 +4290,8 @@ msgid "hour(s)"
 msgstr "hour(s)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: filter/filter.glade.h:14
 msgid "hours"
 msgstr "hours"
 
@@ -4461,8 +4317,10 @@ msgstr "Alarms"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567
+#: mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677
+#: mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -4476,18 +4334,24 @@ msgstr "Don't Remove"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844
+#: mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329
+#: mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596
+#: mail/em-composer-prefs.c:654
 #: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Disable"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846
+#: mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329
+#: mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596
+#: mail/em-composer-prefs.c:654
 #: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Enable"
@@ -4566,8 +4430,8 @@ msgid "Free/Busy Publishing"
 msgstr "Free/Busy Publishing"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:581
+#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/e-itip-control.c:751
 msgid "Friday"
 msgstr "Friday"
 
@@ -4580,8 +4444,8 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1034
-#: calendar/gui/e-itip-control.c:577
+#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/e-itip-control.c:747
 msgid "Monday"
 msgstr "Monday"
 
@@ -4590,8 +4454,8 @@ msgid "S_un"
 msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/e-itip-control.c:752
 msgid "Saturday"
 msgstr "Saturday"
 
@@ -4604,8 +4468,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:576
+#: calendar/gui/dialogs/recurrence-page.c:1051
+#: calendar/gui/e-itip-control.c:746
 msgid "Sunday"
 msgstr "Sunday"
 
@@ -4618,8 +4482,8 @@ msgid "T_hu"
 msgstr "T_hu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:580
+#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/e-itip-control.c:750
 msgid "Thursday"
 msgstr "Thursday"
 
@@ -4632,8 +4496,8 @@ msgid "Time format:"
 msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1035
-#: calendar/gui/e-itip-control.c:578
+#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/e-itip-control.c:748
 msgid "Tuesday"
 msgstr "Tuesday"
 
@@ -4642,8 +4506,8 @@ msgid "W_eek starts:"
 msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:579
+#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/e-itip-control.c:749
 msgid "Wednesday"
 msgstr "Wednesday"
 
@@ -4676,12 +4540,17 @@ msgid "_Day begins:"
 msgstr "_Day begins:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162
+#: ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24
+#: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:12
+#: ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:22
 msgid "_Edit"
 msgstr "_Edit"
@@ -4747,12 +4616,8 @@ msgstr "Source with name '%s' already exists in the selected group"
 
 #: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+msgid "The group '%s' is remote. You must specify a location to get the calendar from"
+msgstr "The group '%s' is remote. You must specify a location to get the calendar from"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
@@ -4766,7 +4631,8 @@ msgstr "Add Task List"
 msgid "C_olor:"
 msgstr "C_olour:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+#: mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Pick a colour"
 
@@ -4775,9 +4641,8 @@ msgid "_Add Calendar"
 msgstr "_Add Calendar"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
 msgid "_Add Task List"
-msgstr "Add Task List"
+msgstr "_Add Task List"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
@@ -4791,7 +4656,8 @@ msgstr "_Type:"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: filter/filter.glade.h:20
 msgid "weeks"
 msgstr "weeks"
 
@@ -4844,23 +4710,28 @@ msgstr "%s  You have made no changes, update the editor?"
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+#: calendar/gui/dialogs/comp-editor-util.c:187
+#: calendar/gui/print.c:2258
 msgid " to "
 msgstr " to "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+#: calendar/gui/dialogs/comp-editor-util.c:191
+#: calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Completed "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:193
+#: calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Completed "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+#: calendar/gui/dialogs/comp-editor-util.c:198
+#: calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (Due "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+#: calendar/gui/dialogs/comp-editor-util.c:200
+#: calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Due "
 
@@ -4978,7 +4849,8 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153
+#: calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Appointment"
 
@@ -5006,7 +4878,8 @@ msgstr "Event with no start date"
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
+#: calendar/gui/dialogs/event-page.c:855
+#: calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
@@ -5028,27 +4901,10 @@ msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
 #: calendar/gui/dialogs/event-page.c:1804
-#, 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:1812
-#, 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:1820
-#, c-format
-msgid "%d minute before appointement"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "%d minutes before appointment"
-msgstr[1] "%d minutes before appointment"
-
 #: calendar/gui/dialogs/event-page.glade.h:2
+#, c-format
 msgid "1 day before appointment"
 msgstr "1 day before appointment"
 
@@ -5091,8 +4947,10 @@ msgid "Classi_fication:"
 msgstr "Classi_fication:"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:355
+#: calendar/gui/e-calendar-table.c:377
 msgid "Confidential"
 msgstr "Confidential"
 
@@ -5101,14 +4959,18 @@ msgid "Locat_ion:"
 msgstr "Locat_ion:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:353
+#: calendar/gui/e-calendar-table.c:376
 msgid "Private"
 msgstr "Private"
 
 #: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:344
+#: calendar/gui/e-cal-model.c:351
 #: calendar/gui/e-calendar-table.c:375
 msgid "Public"
 msgstr "Public"
@@ -5123,9 +4985,8 @@ msgid "Su_mmary:"
 msgstr "Su_mmary:"
 
 #: calendar/gui/dialogs/event-page.glade.h:18
-#, fuzzy
 msgid "This appointment has customized alarms"
-msgstr "This appointment has customised alarms"
+msgstr "This appointment has customized alarms"
 
 #: calendar/gui/dialogs/event-page.glade.h:19
 msgid "_Alarm"
@@ -5153,14 +5014,20 @@ msgstr "_Start time:"
 #. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:316
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:953
-#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
-#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: calendar/gui/e-cal-model-tasks.c:648
+#: calendar/gui/e-itip-control.c:1123
+#: composer/e-msg-composer.c:2097
+#: filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:933
+#: mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967
 #: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+#: widgets/misc/e-cell-date-edit.c:257
+#: widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480
+#: widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "None"
 
@@ -5222,7 +5089,7 @@ msgid "Member"
 msgstr "Member"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -5231,7 +5098,8 @@ msgstr "RSVP"
 #: calendar/gui/dialogs/task-editor.c:158
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: mail/em-filter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -5303,24 +5171,22 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "You are modifying a recurring task, what would you like to modify?"
 
 #: calendar/gui/dialogs/recur-comp.c:59
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgstr "You are modifying a recurring journal entry, what would you like to modify?"
 
-#: calendar/gui/dialogs/recur-comp.c:85
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "This Instance Only"
 
-#: calendar/gui/dialogs/recur-comp.c:89
+#: calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "This and Prior Instances"
 
-#: calendar/gui/dialogs/recur-comp.c:95
+#: calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "This and Future Instances"
 
-#: calendar/gui/dialogs/recur-comp.c:100
+#: calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "All Instances"
 
@@ -5328,51 +5194,51 @@ msgstr "All Instances"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: calendar/gui/dialogs/recurrence-page.c:806
+#: calendar/gui/dialogs/recurrence-page.c:817
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "on"
 
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:989
 msgid "first"
 msgstr "first"
 
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:990
 msgid "second"
 msgstr "second"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:991
 msgid "third"
 msgstr "third"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:992
 msgid "fourth"
 msgstr "fourth"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:993
 msgid "last"
 msgstr "last"
 
-#: calendar/gui/dialogs/recurrence-page.c:1005
+#: calendar/gui/dialogs/recurrence-page.c:1016
 msgid "Other Date"
 msgstr "Other Date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/dialogs/recurrence-page.c:1044
 msgid "day"
 msgstr "day"
 
-#: calendar/gui/dialogs/recurrence-page.c:1170
+#: calendar/gui/dialogs/recurrence-page.c:1181
 msgid "on the"
 msgstr "on the"
 
-#: calendar/gui/dialogs/recurrence-page.c:1356
+#: calendar/gui/dialogs/recurrence-page.c:1367
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2309
+#: calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -5380,7 +5246,8 @@ msgstr "Date/Time"
 msgid "<b>Exceptions</b>"
 msgstr "<b>Exceptions</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Preview</b>"
 
@@ -5448,43 +5315,54 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:745
-#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/e-cal-model-tasks.c:351
+#: calendar/gui/e-cal-model-tasks.c:654
+#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Completed"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012
+#: calendar/gui/e-calendar-table.c:397
+#: mail/message-list.c:1012
 msgid "High"
 msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
-#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-cal-model-tasks.c:349
+#: calendar/gui/e-cal-model-tasks.c:652
+#: calendar/gui/e-cal-model-tasks.c:727
+#: calendar/gui/e-calendar-table.c:471
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "In Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010
+#: calendar/gui/e-calendar-table.c:399
+#: mail/message-list.c:1010
 msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-cal-model.c:943
+#: calendar/gui/e-calendar-table.c:398
+#: mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:347
+#: calendar/gui/e-cal-model-tasks.c:650
+#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -5513,7 +5391,8 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#: calendar/gui/dialogs/task-editor.c:149
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Task"
 
@@ -5597,41 +5476,12 @@ msgid "_Weekly"
 msgstr "_Weekly"
 
 #: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d day"
-msgstr[1] "%d days"
-
 #: calendar/gui/e-alarm-list.c:400
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d week"
-msgstr[1] "%d weeks"
-
 #: calendar/gui/e-alarm-list.c:405
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
-
 #: calendar/gui/e-alarm-list.c:410
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
 #: calendar/gui/e-alarm-list.c:415
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
-
 #: calendar/gui/e-alarm-list.c:462
+#, c-format
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
 
@@ -5675,17 +5525,20 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385
+#: calendar/gui/e-cal-component-preview.c:71
+#: mail/em-folder-view.c:2385
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:156
+#: filter/filter-rule.c:794
 msgid "Untitled"
 msgstr "Untitled"
 
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
 
@@ -5700,7 +5553,7 @@ msgstr "Due Date:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1151
 msgid "Status:"
 msgstr "Status:"
 
@@ -5709,8 +5562,10 @@ msgid "Priority:"
 msgstr "Priority:"
 
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
+#: mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Description:"
 
@@ -5727,36 +5582,40 @@ msgid "Start Date"
 msgstr "Start Date"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+#: calendar/gui/e-calendar-table.etspec.h:11
+#: mail/mail-dialogs.glade.h:22
 msgid "Summary"
 msgstr "Summary"
 
-#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-cal-model-calendar.c:175
+#: calendar/gui/e-calendar-table.c:449
 msgid "Free"
 msgstr "Free"
 
-#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-cal-model-calendar.c:178
+#: calendar/gui/e-calendar-table.c:450
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Busy"
 
-#: calendar/gui/e-cal-model-tasks.c:302
+#: calendar/gui/e-cal-model-tasks.c:303
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:302
+#: calendar/gui/e-cal-model-tasks.c:303
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+#: calendar/gui/e-cal-model-tasks.c:305
+#: smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/e-cal-model-tasks.c:304
+#: calendar/gui/e-cal-model-tasks.c:305
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:601
+#: calendar/gui/e-cal-model-tasks.c:602
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5766,24 +5625,34 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+#: calendar/gui/e-cal-model-tasks.c:1013
+#: calendar/gui/e-cal-model.c:949
+#: calendar/gui/e-meeting-list-view.c:146
+#: calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169
+#: calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Yes"
 
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model-tasks.c:1013
+#: calendar/gui/e-cal-model.c:949
+#: calendar/gui/e-meeting-list-view.c:147
+#: calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
-#: calendar/gui/e-itip-control.c:998 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-cal-model.c:357
+#: calendar/gui/e-cal-model.c:360
+#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1309
 #: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814
+#: calendar/gui/e-meeting-list-view.c:136
+#: calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150
+#: calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1763
+#: camel/camel-gpg-context.c:1814
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/imap4/camel-imap4-engine.c:1402
 #: camel/providers/imap4/camel-imap4-engine.c:1432
@@ -5792,8 +5661,10 @@ msgstr "No"
 #: camel/providers/imap4/camel-imap4-store.c:1223
 #: camel/providers/imap4/camel-imap4-utils.c:457
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155
-#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:227
+#: mail/em-utils.c:1155
+#: shell/e-component-registry.c:207
+#: shell/e-component-registry.c:211
 #: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Unknown"
@@ -5850,17 +5721,22 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:658
+#: calendar/gui/e-calendar-table.c:703
+#: calendar/gui/e-calendar-view.c:658
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:867
+#: calendar/gui/e-calendar-view.c:762
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
-#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1043
+#: calendar/gui/e-calendar-table.c:1084
+#: calendar/gui/e-calendar-view.c:1431
+#: calendar/gui/e-calendar-view.c:1512
+#: mail/em-folder-view.c:899
+#: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
@@ -5868,43 +5744,65 @@ msgstr "_Open"
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
-#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1045
+#: calendar/gui/e-calendar-table.c:1090
+#: calendar/gui/e-calendar-view.c:1432
+#: calendar/gui/e-calendar-view.c:1518
+#: mail/em-folder-view.c:901
+#: mail/em-popup.c:691
+#: mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
-#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-calendar-table.c:1088
+#: calendar/gui/e-calendar-view.c:1410
+#: calendar/gui/e-calendar-view.c:1433
+#: calendar/gui/e-calendar-view.c:1516
+#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17
+#: ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Print..."
 
-#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-calendar-table.c:1050
+#: calendar/gui/e-calendar-table.c:1079
+#: calendar/gui/e-calendar-view.c:1438
+#: calendar/gui/e-calendar-view.c:1482
+#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ut"
 
-#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
-#: mail/em-folder-tree.c:965 mail/message-list.c:1702
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1077
+#: calendar/gui/e-calendar-view.c:1439
+#: calendar/gui/e-calendar-view.c:1480
+#: mail/em-folder-tree.c:1013
+#: mail/message-list.c:1702
+#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copy"
 
-#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
-#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
+#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1086
+#: calendar/gui/e-calendar-view.c:1414
+#: calendar/gui/e-calendar-view.c:1440
+#: calendar/gui/e-calendar-view.c:1514
+#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43
+#: ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Paste"
 
@@ -5925,25 +5823,33 @@ msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark Selected Tasks as Complete"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
-#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:924
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:1063
+#: calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1451
+#: calendar/gui/e-calendar-view.c:1484
+#: mail/em-folder-tree.c:2710
+#: mail/em-folder-view.c:924
+#: ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Delete"
 
-#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-table.c:1082
 msgid "_Delete Selected Tasks"
 msgstr "_Delete Selected Tasks"
 
-#: calendar/gui/e-calendar-table.c:1196 calendar/gui/e-calendar-view.c:1060
+#: calendar/gui/e-calendar-table.c:1199
+#: calendar/gui/e-calendar-view.c:1060
 #: composer/e-msg-composer.c:1178
 msgid "Save as..."
 msgstr "Save as..."
 
-#: calendar/gui/e-calendar-table.c:1374
+#: calendar/gui/e-calendar-table.c:1377
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Click to add a task"
@@ -5953,8 +5859,10 @@ msgstr "Click to add a task"
 msgid "% Complete"
 msgstr "% Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
-#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5
+#: camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270
+#: mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Complete"
 
@@ -5986,23 +5894,28 @@ msgstr "Moving items"
 msgid "Copying items"
 msgstr "Copying items"
 
-#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
+#: calendar/gui/e-calendar-view.c:1403
+#: calendar/gui/e-calendar-view.c:1492
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
+#: calendar/gui/e-calendar-view.c:1404
+#: calendar/gui/e-calendar-view.c:1497
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
+#: calendar/gui/e-calendar-view.c:1405
+#: calendar/gui/e-calendar-view.c:1502
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
+#: calendar/gui/e-calendar-view.c:1406
+#: calendar/gui/e-calendar-view.c:1507
 msgid "New Task"
 msgstr "New Task"
 
-#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1420
+#: ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
@@ -6010,7 +5923,8 @@ msgstr "Select _Today"
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
-#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1425
+#: ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
@@ -6031,15 +5945,16 @@ msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
 #: calendar/gui/e-calendar-view.c:1452
-#, fuzzy
 msgid "Make this Occurrence _Movable"
-msgstr "Delete this Occurrence"
+msgstr "Make this Occurrence _Movable"
 
-#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
+#: calendar/gui/e-calendar-view.c:1453
+#: calendar/gui/e-calendar-view.c:1485
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
+#: calendar/gui/e-calendar-view.c:1454
+#: calendar/gui/e-calendar-view.c:1486
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
@@ -6051,7 +5966,8 @@ msgstr "Go to _Today"
 msgid "_Go to Date..."
 msgstr "_Go to Date..."
 
-#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1520
+#: ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Settings..."
 
@@ -6060,7 +5976,8 @@ msgstr "_Settings..."
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117
+#: e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -6070,7 +5987,8 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120
+#: e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -6097,418 +6015,385 @@ msgstr "%02i minute divisions"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
+#: calendar/gui/e-day-view-top-item.c:710
+#: calendar/gui/e-day-view.c:1571
+#: calendar/gui/e-week-view-main-item.c:320
+#: calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583
+#: calendar/gui/e-day-view.c:817
+#: calendar/gui/e-week-view.c:583
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
+#: calendar/gui/e-day-view.c:820
+#: calendar/gui/e-week-view.c:586
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:780
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: calendar/gui/e-itip-control.c:621
-#, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "Every day"
-msgstr[1] "Every %d days"
-
-#: calendar/gui/e-itip-control.c:626
-#, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "Every week"
-msgstr[1] "Every %d weeks"
-
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-itip-control.c:806
 #, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] "Every week on "
-msgstr[1] "Every %d weeks on "
-
-#: calendar/gui/e-itip-control.c:636
 msgid " and "
 msgstr " and "
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:813
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:826
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: calendar/gui/e-itip-control.c:663
-#, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "every %d month"
-msgstr[1] "every %d month"
-
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:857
 #, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "Every %d year"
-msgstr[1] "Every %d years"
-
-#: calendar/gui/e-itip-control.c:678
-#, c-format
-msgid "a total of %d time"
-msgid_plural " a total of %d times"
-msgstr[0] " a total of %d time"
-msgstr[1] " a total of %d times"
-
-#: calendar/gui/e-itip-control.c:687
 msgid ", ending on "
 msgstr ", ending on "
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:881
 msgid "Starts"
 msgstr "Starts"
 
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:894
 msgid "Ends"
 msgstr "Ends"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:928
 msgid "Due"
 msgstr "Due"
 
-#: calendar/gui/e-itip-control.c:798 calendar/gui/e-itip-control.c:855
+#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:1025
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:985
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: calendar/gui/e-itip-control.c:887 calendar/gui/e-itip-control.c:903
-#: calendar/gui/e-itip-control.c:914 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:1057
+#: calendar/gui/e-itip-control.c:1073
+#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1101
 msgid "An unknown person"
 msgstr "An unknown person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:938
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+#: calendar/gui/e-itip-control.c:1108
+msgid "<br> Please review the following information, and then select an action from the menu below."
+msgstr "<br> Please review the following information, and then select an action from the menu below."
 
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1137
 msgid "Location:"
 msgstr "Location:"
 
-#: calendar/gui/e-itip-control.c:986 calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
+#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-store.c:179
+#: calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Accepted"
 
-#: calendar/gui/e-itip-control.c:990 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:1160
+#: calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: calendar/gui/e-itip-control.c:994 calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
-#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
+#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-meeting-store.c:181
+#: calendar/gui/e-meeting-store.c:204
+#: calendar/gui/itip-utils.c:428
+#: calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Declined"
 
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1081
-#: calendar/gui/e-itip-control.c:1107 calendar/gui/e-itip-control.c:1120
-#: calendar/gui/e-itip-control.c:1133 calendar/gui/e-itip-control.c:1158
-msgid "Choose an action:"
-msgstr "Choose an action:"
-
-#: calendar/gui/e-itip-control.c:1054
-msgid "Update"
-msgstr "Update"
-
-#: calendar/gui/e-itip-control.c:1055 calendar/gui/e-itip-control.c:1086
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/e-itip-control.c:1122
-#: calendar/gui/e-itip-control.c:1135 calendar/gui/e-itip-control.c:1160
-#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
-msgid "OK"
-msgstr "OK"
-
-#: calendar/gui/e-itip-control.c:1082
-msgid "Accept"
-msgstr "Accept"
-
-#: calendar/gui/e-itip-control.c:1083
-msgid "Tentatively accept"
-msgstr "Tentatively accept"
-
-#: calendar/gui/e-itip-control.c:1084
-msgid "Decline"
-msgstr "Decline"
-
-#: calendar/gui/e-itip-control.c:1108
-msgid "Send Free/Busy Information"
-msgstr "Send Free/Busy Information"
-
-#: calendar/gui/e-itip-control.c:1121
-msgid "Update respondent status"
-msgstr "Update respondent status"
+#: calendar/gui/e-itip-control.c:1248
+msgid "The meeting has been cancelled, however it could not be found in your calendars"
+msgstr "The meeting has been cancelled, however it could not be found in your calendars"
 
-#: calendar/gui/e-itip-control.c:1134
-msgid "Send Latest Information"
-msgstr "Send Latest Information"
+#: calendar/gui/e-itip-control.c:1250
+msgid "The task has been cancelled, however it could not be found in your task lists"
+msgstr "The task has been cancelled, however it could not be found in your task lists"
 
-#: calendar/gui/e-itip-control.c:1144
-msgid ""
-"The meeting has been cancelled, however it could not be found in your "
-"calendars"
-msgstr ""
-"The meeting has been cancelled, however it could not be found in your "
-"calendars"
-
-#: calendar/gui/e-itip-control.c:1146
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
-msgstr ""
-"The task has been cancelled, however it could not be found in your task lists"
-
-#: calendar/gui/e-itip-control.c:1159 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancel"
-
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1329
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1330
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: calendar/gui/e-itip-control.c:1243
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: calendar/gui/e-itip-control.c:1244
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
-#: calendar/gui/e-itip-control.c:1265
+#. FIXME Whats going on here?
+#: calendar/gui/e-itip-control.c:1345
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wishes to add to an existing meeting."
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1346
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1350
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1351
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> has replied to a meeting request."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1359
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1366
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1367
 msgid "Meeting Cancellation"
 msgstr "Meeting Cancellation"
 
-#: calendar/gui/e-itip-control.c:1294 calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1377
+#: calendar/gui/e-itip-control.c:1454
+#: calendar/gui/e-itip-control.c:1494
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1378
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1406
 msgid "Task Information"
 msgstr "Task Information"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requests %s to perform a task."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requests you perform a task."
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
-#: calendar/gui/e-itip-control.c:1333
+#. FIXME Whats going on here?
+#: calendar/gui/e-itip-control.c:1422
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wishes to add to an existing task."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1423
 msgid "Task Update"
 msgstr "Task Update"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1427
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1428
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1435
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> has replied to a task assignment."
 
-#: calendar/gui/e-itip-control.c:1347
+#: calendar/gui/e-itip-control.c:1436
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1443
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1444
 msgid "Task Cancellation"
 msgstr "Task Cancellation"
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1455
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: calendar/gui/e-itip-control.c:1382
+#: calendar/gui/e-itip-control.c:1479
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> has published free/busy information."
 
-#: calendar/gui/e-itip-control.c:1383
+#: calendar/gui/e-itip-control.c:1480
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1387
+#: calendar/gui/e-itip-control.c:1484
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requests your free/busy information."
 
-#: calendar/gui/e-itip-control.c:1388
+#: calendar/gui/e-itip-control.c:1485
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1489
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1490
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1495
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1570
 msgid "The message does not appear to be properly formed"
 msgstr "The message does not appear to be properly formed"
 
-#: calendar/gui/e-itip-control.c:1532
+#: calendar/gui/e-itip-control.c:1629
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: calendar/gui/e-itip-control.c:1563
+#: calendar/gui/e-itip-control.c:1660
 msgid "The attachment does not contain a valid calendar message"
 msgstr "The attachment does not contain a valid calendar message"
 
-#: calendar/gui/e-itip-control.c:1595
+#: calendar/gui/e-itip-control.c:1692
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1829
+#: calendar/gui/e-itip-control.c:1926
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1857
+#: calendar/gui/e-itip-control.c:1954
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1964
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1976
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1993
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1996
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1926
+#: calendar/gui/e-itip-control.c:2023
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1949 calendar/gui/e-itip-control.c:1997
+#: calendar/gui/e-itip-control.c:2046
+#: calendar/gui/e-itip-control.c:2094
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1951 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2048
+#: calendar/gui/e-itip-control.c:2098
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
+#: calendar/gui/e-itip-control.c:2178
+msgid "Choose an action:"
+msgstr "Choose an action:"
+
+#: calendar/gui/e-itip-control.c:2249
+msgid "Update"
+msgstr "Update"
+
+#: calendar/gui/e-itip-control.c:2277
+msgid "Accept"
+msgstr "Accept"
+
+#: calendar/gui/e-itip-control.c:2278
+msgid "Tentatively accept"
+msgstr "Tentatively accept"
+
+#: calendar/gui/e-itip-control.c:2279
+msgid "Decline"
+msgstr "Decline"
+
+#: calendar/gui/e-itip-control.c:2308
+msgid "Send Free/Busy Information"
+msgstr "Send Free/Busy Information"
+
+#: calendar/gui/e-itip-control.c:2336
+msgid "Update respondent status"
+msgstr "Update respondent status"
+
+#: calendar/gui/e-itip-control.c:2364
+msgid "Send Latest Information"
+msgstr "Send Latest Information"
+
+#: calendar/gui/e-itip-control.c:2392
+#: calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410
+#: mail/mail-send-recv.c:464
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancel"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -6558,62 +6443,78 @@ msgstr "Optional Participants"
 msgid "Resources"
 msgstr "Resources"
 
-#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:118
+#: calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107
+#: calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119
+#: calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Group"
 
-#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120
+#: calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resource"
 
-#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121
+#: calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Room"
 
-#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132
+#: calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Chair"
 
-#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:133
+#: calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-store.c:144
+#: calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134
+#: calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135
+#: calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:157
+#: calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-store.c:200
+#: calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:160
+#: calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-store.c:206
+#: calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentative"
 
-#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161
+#: calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegated"
 
-#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:189
+#: calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "In Process"
 
@@ -6631,8 +6532,10 @@ msgstr "%A, %d %B, %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#: calendar/gui/e-meeting-time-sel.c:2102
+#: e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296
+#: e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -6642,12 +6545,15 @@ msgstr "%a %d/%m/%Y"
 #. This is the preferred date format for the locale.
 #. 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+#: calendar/gui/e-meeting-time-sel-item.c:460
+#: e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299
+#: widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:400
+#: designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Out of Office"
 
@@ -6704,7 +6610,8 @@ msgstr "Required people and _one resource"
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2263
+#: calendar/gui/e-tasks.c:744
+#: calendar/gui/gnome-cal.c:2262
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6717,20 +6624,20 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:873
+#: calendar/gui/e-tasks.c:874
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:1070
+#: calendar/gui/e-tasks.c:1071
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:1093
+#: calendar/gui/e-tasks.c:1094
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:1120
+#: calendar/gui/e-tasks.c:1121
 msgid "Expunging"
 msgstr "Expunging"
 
@@ -6738,22 +6645,22 @@ msgstr "Expunging"
 msgid "Updating query"
 msgstr "Updating query"
 
-#: calendar/gui/gnome-cal.c:2040
+#: calendar/gui/gnome-cal.c:2039
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:2059
+#: calendar/gui/gnome-cal.c:2058
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:2152
+#: calendar/gui/gnome-cal.c:2151
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:3122
+#: calendar/gui/gnome-cal.c:3120
 msgid "Purging"
 msgstr "Purging"
 
@@ -6813,7 +6720,8 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Select Today"
 
-#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:271
+#: calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
@@ -6822,19 +6730,23 @@ msgstr "An organiser must be set."
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:394
+#: calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Event information"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
+#: calendar/gui/itip-utils.c:396
+#: calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Task information"
 
-#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
+#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Journal information"
 
-#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
+#: calendar/gui/itip-utils.c:400
+#: calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
@@ -6869,25 +6781,21 @@ msgstr "You must be an attendee of the event."
 
 #: calendar/gui/migration.c:150
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
 #: calendar/gui/migration.c:154
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
@@ -6896,12 +6804,14 @@ msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:466 calendar/gui/migration.c:548
+#: calendar/gui/migration.c:466
+#: calendar/gui/migration.c:548
 msgid "On The Web"
 msgstr "On The Web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:712 calendar/gui/migration.c:864
+#: calendar/gui/migration.c:712
+#: calendar/gui/migration.c:864
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Unable to migrate old settings from evolution/config.xmldb"
 
@@ -7074,7 +6984,8 @@ msgstr "Sa"
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Selected day (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
+#: calendar/gui/print.c:1939
+#: calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
@@ -7082,7 +6993,8 @@ msgstr "%a %d %b"
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1946
 #: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
@@ -7131,8 +7043,10 @@ msgstr "Categories: %s"
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
+#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737
+#: mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Print Preview"
 
@@ -7154,20 +7068,10 @@ msgid "New Task List"
 msgstr "New Task List"
 
 #: calendar/gui/tasks-component.c:415
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d task"
-msgstr[1] "%d tasks"
-
-#: calendar/gui/tasks-component.c:417 mail/mail-component.c:498
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d selected"
-msgstr[1] ", %d selected"
-
+#: calendar/gui/tasks-component.c:417
+#: mail/mail-component.c:502
 #: calendar/gui/tasks-component.c:464
+#, c-format
 msgid "Failed upgrading tasks."
 msgstr "Failed upgrading tasks."
 
@@ -7218,13 +7122,11 @@ msgstr "Create a new task list"
 
 #: calendar/gui/tasks-control.c:370
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 
@@ -8905,13 +8807,15 @@ msgstr "Preparing folder '%s' for offline"
 msgid "You must be working online to complete this operation"
 msgstr "You must be working online to complete this operation"
 
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669
+#: camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Failed to create pipe to '%s': %s"
 
-#: camel/camel-filter-driver.c:713 camel/camel-process.c:90
+#: camel/camel-filter-driver.c:713
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Failed to create child process '%s': %s"
@@ -8921,16 +8825,19 @@ msgstr "Failed to create child process '%s': %s"
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
+#: camel/camel-filter-driver.c:945
+#: camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Syncing folders"
 
-#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
+#: camel/camel-filter-driver.c:1043
+#: camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
+#: camel/camel-filter-driver.c:1052
+#: camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
@@ -8952,12 +8859,14 @@ msgstr "Getting message %d (%d%%)"
 msgid "Cannot open message"
 msgstr "Cannot open message"
 
-#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
+#: camel/camel-filter-driver.c:1148
+#: camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Failed on message %d"
 
-#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
+#: camel/camel-filter-driver.c:1174
+#: camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Syncing folder"
 
@@ -8989,12 +8898,14 @@ msgid "Failed to create create child process '%s': %s"
 msgstr "Failed to create create child process '%s': %s"
 
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679
+#: camel/camel-filter-search.c:671
+#: camel/camel-filter-search.c:679
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#: camel/camel-folder-search.c:355
+#: camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -9003,7 +8914,8 @@ msgstr ""
 "Cannot parse search expression: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#: camel/camel-folder-search.c:365
+#: camel/camel-folder-search.c:486
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -9012,7 +8924,8 @@ msgstr ""
 "Error executing search expression: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+#: camel/camel-folder-search.c:672
+#: camel/camel-folder-search.c:705
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) requires a single bool result"
 
@@ -9020,7 +8933,8 @@ msgstr "(match-all) requires a single bool result"
 msgid "(match-threads) not allowed inside match-all"
 msgstr "(match-threads) not allowed inside match-all"
 
-#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+#: camel/camel-folder-search.c:758
+#: camel/camel-folder-search.c:762
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) requires a match type string"
 
@@ -9100,10 +9014,14 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:804
+#: camel/camel-gpg-context.c:1314
+#: camel/camel-gpg-context.c:1498
+#: camel/camel-gpg-context.c:1589
+#: camel/camel-gpg-context.c:1697
+#: camel/providers/nntp/camel-nntp-store.c:1234
+#: camel/providers/nntp/camel-nntp-store.c:1332
+#: mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
@@ -9137,21 +9055,27 @@ msgstr ""
 msgid "Failed to GPG %s: %s\n"
 msgstr "Failed to GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1275
+#: camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1762
+#: camel/camel-gpg-context.c:1307
+#: camel/camel-gpg-context.c:1762
 #: camel/camel-gpg-context.c:1813
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1690 camel/camel-gpg-context.c:1714
-#: camel/camel-gpg-context.c:1784 camel/camel-gpg-context.c:1835
+#: camel/camel-gpg-context.c:1331
+#: camel/camel-gpg-context.c:1491
+#: camel/camel-gpg-context.c:1582
+#: camel/camel-gpg-context.c:1605
+#: camel/camel-gpg-context.c:1690
+#: camel/camel-gpg-context.c:1714
+#: camel/camel-gpg-context.c:1784
+#: camel/camel-gpg-context.c:1835
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
@@ -9159,9 +9083,12 @@ msgstr "Failed to execute gpg."
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:721
-#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1431
+#: camel/camel-gpg-context.c:1437
+#: camel/camel-gpg-context.c:1443
+#: camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732
+#: camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
@@ -9179,7 +9106,8 @@ msgstr "Could not generate encrypting data: %s"
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:995
+#: camel/camel-gpg-context.c:1721
+#: camel/camel-smime-context.c:995
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
@@ -9197,7 +9125,8 @@ msgstr "Cannot build locking helper pipe: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "Cannot fork locking helper: %s"
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock-client.c:191
+#: camel/camel-lock-client.c:214
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Could not lock '%s': protocol error with lock-helper"
@@ -9207,7 +9136,8 @@ msgstr "Could not lock '%s': protocol error with lock-helper"
 msgid "Could not lock '%s'"
 msgstr "Could not lock '%s'"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock.c:92
+#: camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Could not create lock file for %s: %s"
@@ -9276,12 +9206,14 @@ msgstr "Error reading mail file: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "Error writing mail temp file: %s"
 
-#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#: camel/camel-movemail.c:465
+#: camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copying mail temp file: %s"
 
-#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
+#: camel/camel-multipart-encrypted.c:229
+#: camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Failed to decrypt MIME part: protocol error"
 
@@ -9289,7 +9221,8 @@ msgstr "Failed to decrypt MIME part: protocol error"
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Failed to decrypt MIME part: invalid structure"
 
-#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:673
+#: camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "parse error"
 
@@ -9316,7 +9249,8 @@ msgstr "Could not load %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Could not load %s: No initialisation code in module."
 
-#: camel/camel-provider.c:356 camel/camel-session.c:160
+#: camel/camel-provider.c:356
+#: camel/camel-session.c:160
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No provider available for protocol `%s'"
@@ -9329,7 +9263,8 @@ msgstr "Anonymous"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "This option will connect to the server using an anonymous login."
 
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112
+#: camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
@@ -9365,24 +9300,16 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:50
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
+msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgstr "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -9414,52 +9341,31 @@ msgstr "GSSAPI"
 
 #: camel/camel-sasl-gssapi.c:54
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr ""
-"This option will connect to the server using Kerberos 5 authentication."
+msgstr "This option will connect to the server using Kerberos 5 authentication."
 
 #: camel/camel-sasl-gssapi.c:152
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognised by the implementation."
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgstr "The specified mechanism is not supported by the provided credential, or is unrecognised by the implementation."
 
 #: camel/camel-sasl-gssapi.c:157
 msgid "The provided target_name parameter was ill-formed."
 msgstr "The provided target_name parameter was ill-formed."
 
 #: camel/camel-sasl-gssapi.c:160
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-msgstr ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgstr "The provided target_name parameter contained an invalid or unsupported type of name."
 
 #: camel/camel-sasl-gssapi.c:164
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-msgstr ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgstr "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
 
 #: camel/camel-sasl-gssapi.c:169
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgstr "The input_token contains an invalid signature, or a signature that could not be verified."
 
 #: camel/camel-sasl-gssapi.c:173
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
-msgstr ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
+msgstr "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
 
 #: camel/camel-sasl-gssapi.c:178
 msgid "The supplied context handle did not refer to a valid context."
@@ -9477,8 +9383,10 @@ msgstr "The consistency checks performed on the credential failed."
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
-#: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
+#: camel/camel-sasl-gssapi.c:193
+#: camel/camel-sasl-gssapi.c:242
+#: camel/camel-sasl-gssapi.c:278
+#: camel/camel-sasl-gssapi.c:293
 #: camel/camel-sasl-kerberos4.c:219
 #: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
@@ -9499,8 +9407,7 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr ""
-"This option will connect to the server using Kerberos 4 authentication."
+msgstr "This option will connect to the server using Kerberos 4 authentication."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -9515,7 +9422,8 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:34
+#: camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "This option will connect to the server using a simple password."
 
@@ -9528,12 +9436,8 @@ msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 #: camel/camel-sasl-ntlm.c:33
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgstr "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
@@ -9584,12 +9488,14 @@ msgstr "URL '%s' needs a path component"
 msgid "Resolving: %s"
 msgstr "Resolving: %s"
 
-#: camel/camel-service.c:760 camel/camel-service.c:884
+#: camel/camel-service.c:760
+#: camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Failure in name lookup: %s"
 
-#: camel/camel-service.c:781 camel/camel-service.c:905
+#: camel/camel-service.c:781
+#: camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Host lookup failed: cannot create thread: %s"
@@ -9663,7 +9569,8 @@ msgstr "Cannot find cert chain"
 msgid "Cannot add CMS SigningTime"
 msgstr "Cannot add CMS SigningTime"
 
-#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#: camel/camel-smime-context.c:325
+#: camel/camel-smime-context.c:337
 #, c-format
 msgid "Encryption cert for '%s' does not exist"
 msgstr "Encryption cert for '%s' does not exist"
@@ -9684,7 +9591,8 @@ msgstr "Cannot add encryption certificate"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Cannot add CMS SignerInfo"
 
-#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
+#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Cannot create encoder context"
 
@@ -9692,7 +9600,8 @@ msgstr "Cannot create encoder context"
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#: camel/camel-smime-context.c:441
+#: camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
@@ -9744,7 +9653,8 @@ msgstr "No signedData in signature"
 msgid "Digests missing from enveloped data"
 msgstr "Digests missing from enveloped data"
 
-#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#: camel/camel-smime-context.c:589
+#: camel/camel-smime-context.c:599
 msgid "Cannot calculate digests"
 msgstr "Cannot calculate digests"
 
@@ -9752,7 +9662,8 @@ msgstr "Cannot calculate digests"
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
@@ -9854,12 +9765,14 @@ msgstr "Cannot create folder: Invalid operation on this store"
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: camel/camel-store.c:389 camel/camel-vee-store.c:351
+#: camel/camel-store.c:389
+#: camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/camel-store.c:439
+#: camel/camel-vee-store.c:388
 #: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -9869,8 +9782,10 @@ msgstr "Cannot rename folder: %s: Invalid operation"
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779
+#: mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
@@ -9990,7 +9905,8 @@ msgstr "Key usage does not support certificate signing"
 msgid "Error in application verification"
 msgstr "Error in application verification"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
+#: camel/camel-tcp-stream-openssl.c:696
+#: camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10003,11 +9919,13 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Signature:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "BAD"
 
@@ -10097,7 +10015,8 @@ msgstr "Error storing `%s': %s"
 msgid "No such message %s in %s"
 msgstr "No such message %s in %s"
 
-#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
+#: camel/camel-vee-folder.c:841
+#: camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
@@ -10150,9 +10069,8 @@ msgid "Automatically synchronize remote mail locally"
 msgstr "Automatically synchronise remote mail locally"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
-#, fuzzy
 msgid "Address Book and Calendar"
-msgstr "Address Book And Calendar"
+msgstr "Address Book and Calendar"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "Post Office Agent:"
@@ -10163,9 +10081,8 @@ msgid "Post Office Agent SOAP Port:"
 msgstr "Post Office Agent SOAP Port:"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:78
-#, fuzzy
 msgid "Use Secure Connection (SSL)"
-msgstr "_Use Secure Connection (SSL):"
+msgstr "Use Secure Connection (SSL)"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:92
 msgid "Novell GroupWise"
@@ -10180,7 +10097,8 @@ msgstr "For accessing Novell Groupwise servers"
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+#: camel/providers/pop3/camel-pop3-provider.c:71
+#: mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Password"
 
@@ -10188,10 +10106,8 @@ msgstr "Password"
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAP server using a plaintext password."
+msgstr "This option will connect to the IMAP server using a plaintext password."
 
-#: camel/providers/groupwise/camel-gw-listener.c:332
 #: camel/providers/groupwise/camel-gw-listener.c:362
 msgid "Checklist"
 msgstr "Checklist"
@@ -10199,12 +10115,12 @@ msgstr "Checklist"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3191
+#: camel/providers/imap/camel-imap-store.c:3220
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3223
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
@@ -10214,7 +10130,8 @@ msgstr "Server unexpectedly disconnected: %s"
 #: camel/providers/imap4/camel-imap4-store.c:283
 #: camel/providers/pop3/camel-pop3-store.c:543
 #: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
+#: camel/providers/pop3/camel-pop3-store.c:556
+#: shell/e-shell.c:1226
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -10315,10 +10232,8 @@ msgstr "Incomplete server response: no UID provided for message %d"
 
 #: camel/providers/imap/camel-imap-folder.c:2482
 #, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr "Unexpected server response: Identical UIDs provided for messages %d and %d"
 
 #: camel/providers/imap/camel-imap-folder.c:2658
 msgid "Could not find message body in FETCH response."
@@ -10497,10 +10412,8 @@ msgstr "No such folder %s"
 #: camel/providers/imap/camel-imap-store.c:2259
 #: camel/providers/imap4/camel-imap4-store.c:764
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "The folder name \"%s\" is invalid because it contains the character \"%c\""
 
 #: camel/providers/imap/camel-imap-store.c:1939
 #: camel/providers/imap/camel-imap-store.c:2320
@@ -10623,26 +10536,18 @@ msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 
 #: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "This option will connect to the IMAPv4rev1 server using a plaintext password."
 
 #: camel/providers/imap4/camel-imap4-store.c:257
 #, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
+msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
+msgstr "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:363
 #, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 
 #: camel/providers/imap4/camel-imap4-store.c:408
 #, c-format
@@ -10808,12 +10713,8 @@ msgid "Local delivery"
 msgstr "Local delivery"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
-msgstr ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
+msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
+msgstr "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -10914,7 +10815,8 @@ msgstr "Unable to add message to summary: unknown reason"
 #: camel/providers/local/camel-maildir-folder.c:74
 #: camel/providers/local/camel-maildir-store.c:232
 #: camel/providers/local/camel-maildir-store.c:248
-#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+#: mail/em-folder-tree-model.c:212
+#: mail/em-folder-tree-model.c:214
 msgid "Inbox"
 msgstr "Inbox"
 
@@ -11366,10 +11268,8 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "Unable to save grouplist file for %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -11384,16 +11284,12 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "This is a provider for reading from and posting to USENET newsgroups."
 
 #: camel/providers/nntp/camel-nntp-provider.c:73
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgstr "This option will authenticate with the NNTP server using a plaintext password."
 
 #: camel/providers/nntp/camel-nntp-store.c:118
-#: camel/providers/nntp/camel-nntp-store.c:1233
-#: camel/providers/nntp/camel-nntp-store.c:1331
+#: camel/providers/nntp/camel-nntp-store.c:1236
+#: camel/providers/nntp/camel-nntp-store.c:1334
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP Command failed: %s"
@@ -11460,16 +11356,16 @@ msgstr "You cannot remove a folder in a News store: unsubscribe instead."
 msgid "Authentication requested but not username provided"
 msgstr "Authentication requested but not username provided"
 
-#: camel/providers/nntp/camel-nntp-store.c:1146
+#: camel/providers/nntp/camel-nntp-store.c:1148
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Cannot authenticate to server: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1262
+#: camel/providers/nntp/camel-nntp-store.c:1265
 msgid "Not connected."
 msgstr "Not connected."
 
-#: camel/providers/nntp/camel-nntp-store.c:1311
+#: camel/providers/nntp/camel-nntp-store.c:1314
 #, c-format
 msgid "No such folder: %s"
 msgstr "No such folder: %s"
@@ -11524,7 +11420,8 @@ msgstr "No message with uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: composer/e-msg-composer.c:1210
 #: composer/e-msg-composer.c:1231
 msgid "Unknown reason"
 msgstr "Unknown reason"
@@ -11542,7 +11439,8 @@ msgstr "Delete after %s day(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Disable support for all POP3 extensions"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
+#: camel/providers/pop3/camel-pop3-provider.c:54
+#: mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11551,22 +11449,12 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "For connecting to and downloading mail from POP servers."
 
 #: camel/providers/pop3/camel-pop3-provider.c:73
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgstr "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgstr "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
 
 #: camel/providers/pop3/camel-pop3-store.c:195
 #, c-format
@@ -11593,12 +11481,8 @@ msgstr "Could not connect to POP server %s"
 #: camel/providers/pop3/camel-pop3-store.c:412
 #: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+msgstr "Unable to connect to POP server %s: No support for requested authentication mechanism."
 
 #: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
@@ -11650,12 +11534,8 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgstr "For delivering mail by passing it to the \"sendmail\" program on the local system."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -11699,7 +11579,8 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail delivery via the sendmail program"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
+#: camel/providers/smtp/camel-smtp-provider.c:37
+#: mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11983,7 +11864,8 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436
+#: composer/e-msg-composer-attachment-bar.c:298
+#: mail/em-utils.c:436
 msgid "attachment"
 msgstr "attachment"
 
@@ -12086,12 +11968,8 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #: composer/e-msg-composer-hdrs.c:607
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+msgstr "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
 
 #.
 #. * Post-To
@@ -12109,18 +11987,12 @@ msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
 #: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Cannot sign outgoing message: No signing certificate set for this account"
 
 #: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Cannot encrypt outgoing message: No encryption certificate set for this account"
 
 #: composer/e-msg-composer.c:1268
 msgid "Could not open file"
@@ -12138,7 +12010,8 @@ msgstr "Untitled Message"
 msgid "Open file"
 msgstr "Open file"
 
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491
+#: composer/e-msg-composer.c:1983
+#: mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
@@ -12147,21 +12020,18 @@ msgid "Signature:"
 msgstr "Signature:"
 
 #: composer/e-msg-composer.c:2283
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> File Attached"
-msgstr[1] "<b>%d</b> Files Attached"
-
 #: composer/e-msg-composer.c:2312
+#, c-format
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Hide _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271
+#: composer/e-msg-composer.c:2315
+#: composer/e-msg-composer.c:3271
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Show _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163
+#: composer/e-msg-composer.c:2332
+#: composer/e-msg-composer.c:3163
 #: composer/e-msg-composer.c:3164
 msgid "Compose a message"
 msgstr "Compose a message"
@@ -12172,20 +12042,12 @@ msgid "Attached message - %s"
 msgstr "Attached message - %s"
 
 #. translators, this count will always be >1
-#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Attached message"
-msgstr[1] "%d attached messages"
-
+#: composer/e-msg-composer.c:2639
+#: composer/e-msg-composer.c:2783
 #: composer/e-msg-composer.c:4341
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#, c-format
+msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+msgstr "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
@@ -12204,12 +12066,8 @@ msgstr "Directories can not be attached to Messages."
 
 #. mail-composer:attach-directory secondary
 #: composer/mail-composer-errors.xml.h:10
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
 
 #. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
@@ -12223,8 +12081,10 @@ msgstr "Could not retrieve messages to attach from {0}."
 #. system:no-save-file secondary
 #. system:no-load-file secondary
 #: composer/mail-composer-errors.xml.h:14
-#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: composer/mail-composer-errors.xml.h:42
+#: mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11
 #: widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "Because \"{1}\"."
@@ -12241,12 +12101,8 @@ msgstr "Do you want to recover unfinished messages?"
 
 #. mail-composer:recover-autosave secondary
 #: composer/mail-composer-errors.xml.h:20
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
 
 #: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
@@ -12273,23 +12129,13 @@ msgstr "Warning: Modified Message"
 
 #. mail-composer:exit-unsaved primary
 #: composer/mail-composer-errors.xml.h:30
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgstr "Are you sure you want to discard the message, titled '{0}', you are composing?"
 
 #. mail-composer:exit-unsaved secondary
 #: composer/mail-composer-errors.xml.h:32
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
-msgstr ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
 
 #: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
@@ -12337,22 +12183,20 @@ msgstr "Unable to activate the address selector control."
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+#: data/evolution.desktop.in.in.h:1
+#: shell/main.c:503
 msgid "Evolution"
 msgstr "Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-#, fuzzy
 msgid "The Evolution Groupware Suite"
-msgstr "The Ximian Evolution Groupware Suite"
+msgstr "The Evolution Groupware Suite"
 
 #: data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -12382,12 +12226,10 @@ msgstr "<b>Status:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 
 #: designs/OOA/ooa.glade.h:8
@@ -12424,15 +12266,11 @@ msgstr "<b>Sending Email:</b>"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
 msgstr ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
 
 #: designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
@@ -12459,14 +12297,10 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Unless the message is sent to a mailing list, and not to me personally"
 
 #: designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
+msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgstr "When you receive an email with a read receipt request, what should Evolution do?"
 
-#: e-util/e-dialog-utils.c:265
+#: e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -12475,15 +12309,16 @@ msgstr ""
 "Overwrite it?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:267 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:269
+#: widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
-#: e-util/e-passwords.c:460
+#: e-util/e-passwords.c:464
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: e-util/e-passwords.c:461
+#: e-util/e-passwords.c:465
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
@@ -12491,7 +12326,8 @@ msgstr "_Remember this password for the remainder of this session"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:185
+#: e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -12499,7 +12335,8 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -12551,13 +12388,15 @@ msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:339
+#: e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -12566,8 +12405,10 @@ msgstr "%H:%M:%S"
 #. strftime format of a time in 12-hour format,
 #. 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:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:348
+#: e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1414
+#: widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -12575,8 +12416,10 @@ msgstr "%I:%M %p"
 #. strftime format of a time in 24-hour format,
 #. 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:1411 widgets/misc/e-dateedit.c:1636
+#: e-util/e-time-utils.c:352
+#: e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1411
+#: widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12586,59 +12429,19 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:73
-#, c-format
-msgid "1 second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d second ago"
-msgstr[1] "%d seconds ago"
-
 #: filter/filter-datespec.c:74
-#, c-format
-msgid "1 minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minute ago"
-msgstr[1] "%d minutes ago"
-
 #: filter/filter-datespec.c:75
-#, c-format
-msgid "1 hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d hour ago"
-msgstr[1] "%d hours ago"
-
 #: filter/filter-datespec.c:76
-#, c-format
-msgid "1 day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d day ago"
-msgstr[1] "%d days ago"
-
 #: filter/filter-datespec.c:77
-#, c-format
-msgid "1 week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d week ago"
-msgstr[1] "%d weeks ago"
-
 #: filter/filter-datespec.c:78
-#, c-format
-msgid "1 month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d month ago"
-msgstr[1] "%d months ago"
-
 #: filter/filter-datespec.c:79
-#, c-format
-msgid "1 year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d year ago"
-msgstr[1] "%d years ago"
-
 #: filter/filter-datespec.c:280
+#, c-format
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+#: filter/filter-datespec.c:283
+#: filter/filter-datespec.c:294
 msgid "now"
 msgstr "now"
 
@@ -12668,7 +12471,8 @@ msgstr "Missing file name."
 
 #. filter:no-file secondary
 #. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+#: filter/filter-errors.xml.h:8
+#: filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "You must specify a file name."
 
@@ -12689,7 +12493,8 @@ msgstr "Could not compile regular expression \"{1}\"."
 
 #. filter:no-name primary
 #. mail:no-name-vfolder primary
-#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+#: filter/filter-errors.xml.h:18
+#: mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Missing name."
 
@@ -12712,24 +12517,32 @@ msgstr "Please choose another name."
 msgid "Choose a file"
 msgstr "Choose a file"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121
+#: mail/em-filter-i18n.h:26
+#: mail/em-migrate.c:1011
+#: mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: filter/filter-label.c:124
+#: mail/em-migrate.c:1014
+#: mail/mail-config.c:79
 #: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "To Do"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: filter/filter-label.c:125
+#: mail/em-migrate.c:1015
+#: mail/mail-config.c:80
 #: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Later"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532
+#: shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -12825,7 +12638,8 @@ msgstr "ago"
 msgid "months"
 msgstr "months"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:17
+#: mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "seconds"
 
@@ -12854,67 +12668,65 @@ msgid "Rule name"
 msgstr "Rule name"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure mail preferences, including security and message display, here"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Configure mail preferences, including security and message display, here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Configure spell-checking, signatures, and the message composer here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Configure your email accounts here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolution Mail"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolution Mail accounts configuration control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Evolution Mail component"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Evolution Mail composer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolution Mail composer configuration control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Mail preferences control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:419
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:557
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/em-folder-view.c:419
+#: mail/importers/elm-importer.c:418
+#: mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474
+#: mail/mail-component.c:510
+#: mail/mail-component.c:561
 msgid "Mail"
 msgstr "Mail"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
 msgstr "_Mail"
 
@@ -12931,7 +12743,8 @@ msgstr "Account name"
 msgid "Protocol"
 msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/em-composer-prefs.c:305
+#: mail/em-composer-prefs.c:424
 #: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Unnamed"
@@ -12960,18 +12773,15 @@ msgstr "an unknown sender"
 #. * 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:1549
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 
 #: mail/em-filter-editor.c:147
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/em-filter-folder-element.c:237
+#: mail/em-vfolder-rule.c:494
 #: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Select Folder"
@@ -13105,7 +12915,8 @@ msgstr "is not Flagged"
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:932
+#: mail/em-filter-i18n.h:37
+#: mail/em-folder-view.c:932
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -13142,7 +12953,8 @@ msgstr "Pipe to Program"
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+#: mail/em-filter-i18n.h:46
+#: mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Read"
 
@@ -13174,7 +12986,8 @@ msgstr "returns less than"
 msgid "Run Program"
 msgstr "Run Program"
 
-#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:54
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
@@ -13210,9 +13023,13 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1550
-#: mail/em-format-quote.c:305 mail/em-format.c:805 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: mail/em-filter-i18n.h:64
+#: mail/em-format-html.c:1550
+#: mail/em-format-quote.c:305
+#: mail/em-format.c:808
+#: mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Subject"
@@ -13236,17 +13053,7 @@ msgstr "Folder Properties"
 
 #. TODO: can this be done in a loop?
 #: mail/em-folder-properties.c:161
-msgid "Total message:"
-msgid_plural "Total messages:"
-msgstr[0] "Total message"
-msgstr[1] "Total messages"
-
 #: mail/em-folder-properties.c:173
-msgid "Unread message:"
-msgid_plural "Unread messages:"
-msgstr[0] "Unread message"
-msgstr[1] "Unread messages"
-
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
@@ -13255,136 +13062,156 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
-#: mail/mail-component.c:707
+#: mail/em-folder-selector.c:166
+#: mail/em-folder-tree.c:2430
+#: mail/mail-component.c:711
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: mail/em-folder-selector.c:300
+#: mail/em-folder-selector.c:304
 msgid "Create"
 msgstr "Create"
 
-#: mail/em-folder-selector.c:304
+#: mail/em-folder-selector.c:308
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/em-folder-tree-model.c:200
+#: mail/em-folder-tree-model.c:202
 #: mail/mail-vfolder.c:872
 msgid "VFolders"
 msgstr "VFolders"
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#: mail/em-folder-tree-model.c:206
+#: mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+#: mail/em-folder-tree-model.c:476
+#: mail/em-folder-tree-model.c:780
 msgid "Loading..."
 msgstr "Loading..."
 
-#: mail/em-folder-tree.c:846
+#: mail/em-folder-tree.c:894
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:848
+#: mail/em-folder-tree.c:896
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:855 mail/message-list.c:1613
+#: mail/em-folder-tree.c:903
+#: mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:857 mail/message-list.c:1615
+#: mail/em-folder-tree.c:905
+#: mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:873
+#: mail/em-folder-tree.c:921
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1011
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1012
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/message-list.c:1703
+#: mail/em-folder-tree.c:1014
+#: mail/em-folder-tree.c:2216
+#: mail/em-folder-view.c:803
+#: mail/message-list.c:1703
 msgid "_Move"
 msgstr "_Move"
 
-#: mail/em-folder-tree.c:968 mail/message-list.c:1705
+#: mail/em-folder-tree.c:1016
+#: mail/message-list.c:1705
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/em-folder-view.c:817
+#: mail/em-folder-tree.c:2203
+#: mail/em-folder-tree.c:2216
+#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:817
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:817
+#: mail/em-folder-tree.c:2203
+#: mail/em-folder-view.c:817
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2243
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2330 mail/mail-component.c:707
+#: mail/em-folder-tree.c:2430
+#: mail/mail-component.c:711
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2621
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2623
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+#: mail/em-folder-tree.c:2698
+#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2604
+#: mail/em-folder-tree.c:2699
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2703
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: mail/em-folder-tree.c:2609
+#: mail/em-folder-tree.c:2704
 msgid "_Move..."
 msgstr "_Move..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2613
+#: mail/em-folder-tree.c:2708
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2616
+#: mail/em-folder-tree.c:2711
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2714
+#: ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Properties"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:900 mail/em-popup.c:690
+#: mail/em-folder-view.c:900
+#: mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
@@ -13393,21 +13220,25 @@ msgstr "_Edit as New Message..."
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:905 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:905
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:906 mail/em-popup.c:811
+#: mail/em-folder-view.c:906
+#: mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:907 mail/em-popup.c:812
+#: mail/em-folder-view.c:907
+#: mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:908 mail/em-popup.c:814
+#: mail/em-folder-view.c:908
+#: mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Forward"
@@ -13424,7 +13255,8 @@ msgstr "Fla_g Completed"
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:916
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
@@ -13440,11 +13272,13 @@ msgstr "Mark as _Important"
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:920
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:921 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:921
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
@@ -13456,7 +13290,8 @@ msgstr "U_ndelete"
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:929 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:929
+#: ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
@@ -13509,7 +13344,8 @@ msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751
+#: mail/em-folder-view.c:1711
+#: mail/em-folder-view.c:1751
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Default"
@@ -13533,132 +13369,103 @@ msgstr "Click to mail %s"
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:582
+#: mail/em-format-html-display.c:643
+#: mail/em-format-html.c:582
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: mail/em-format-html-display.c:641
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: mail/em-format-html-display.c:643
+msgid "This message is not signed. There is no guarantee that this message is authentic."
+msgstr "This message is not signed. There is no guarantee that this message is authentic."
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:583
+#: mail/em-format-html-display.c:644
+#: mail/em-format-html.c:583
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: mail/em-format-html-display.c:642
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: mail/em-format-html-display.c:644
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+msgstr "This message is signed and is valid meaning that it is very likely that this message is authentic."
 
-#: mail/em-format-html-display.c:643 mail/em-format-html.c:584
+#: mail/em-format-html-display.c:645
+#: mail/em-format-html.c:584
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: mail/em-format-html-display.c:643
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format-html-display.c:645
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgstr "The signature of this message cannot be verified, it may have been altered in transit."
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:646
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format-html-display.c:646
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgstr "This message is signed with a valid signature, but the sender of the message cannot be verified."
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:591
+#: mail/em-format-html-display.c:652
+#: mail/em-format-html.c:591
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: mail/em-format-html-display.c:650
-#, fuzzy
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format-html-display.c:652
+msgid "This message is not encrypted.  Its content may be viewed in transit across the Internet."
+msgstr "This message is not encrypted.  Its content may be viewed in transit across the Internet."
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:592
+#: mail/em-format-html-display.c:653
+#: mail/em-format-html.c:592
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: mail/em-format-html-display.c:651
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
+#: mail/em-format-html-display.c:653
+msgid "This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
 
-#: mail/em-format-html-display.c:652 mail/em-format-html.c:593
+#: mail/em-format-html-display.c:654
+#: mail/em-format-html.c:593
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: mail/em-format-html-display.c:652
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format-html-display.c:654
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgstr "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 
-#: mail/em-format-html-display.c:653 mail/em-format-html.c:594
+#: mail/em-format-html-display.c:655
+#: mail/em-format-html.c:594
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
+#: mail/em-format-html-display.c:655
+msgid "This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr "This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time."
 
-#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:756
+#: smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:769
+#: mail/em-format-html-display.c:771
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1004
+#: mail/em-format-html-display.c:1006
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %d %B, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1012
+#: mail/em-format-html-display.c:1014
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1017
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %d %B, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1056
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1057
 msgid "_Hide"
 msgstr "_Hide"
 
@@ -13667,7 +13474,8 @@ msgstr "_Hide"
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: mail/em-format-html.c:475 mail/em-format-html.c:477
+#: mail/em-format-html.c:475
+#: mail/em-format-html.c:477
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Retrieving `%s'"
@@ -13709,34 +13517,47 @@ msgstr "Pointer to unknown external data (\"%s\" type)"
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:800
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/em-format-html.c:1441
+#: mail/em-format-quote.c:192
+#: mail/em-format.c:803
+#: mail/em-mailer-prefs.c:82
+#: mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:325
 msgid "From"
 msgstr "From"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:801
+#: mail/em-format-html.c:1441
+#: mail/em-format-quote.c:192
+#: mail/em-format.c:804
 #: mail/em-mailer-prefs.c:83
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:802
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1441
+#: mail/em-format-quote.c:192
+#: mail/em-format.c:805
+#: mail/em-mailer-prefs.c:84
+#: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "To"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:803
+#: mail/em-format-html.c:1441
+#: mail/em-format-quote.c:192
+#: mail/em-format.c:806
 #: mail/em-mailer-prefs.c:85
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:804
+#: mail/em-format-html.c:1441
+#: mail/em-format-quote.c:192
+#: mail/em-format.c:807
 #: mail/em-mailer-prefs.c:86
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: mail/em-format-html.c:1554 mail/em-format-quote.c:314
+#: mail/em-format-html.c:1554
+#: mail/em-format-quote.c:314
 #: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Mailer"
@@ -13751,41 +13572,47 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:806
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1594
+#: mail/em-format-quote.c:321
+#: mail/em-format.c:809
+#: mail/em-mailer-prefs.c:88
+#: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/em-format-html.c:1617 mail/em-format.c:807 mail/em-mailer-prefs.c:89
+#: mail/em-format-html.c:1617
+#: mail/em-format.c:810
+#: mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: mail/em-format.c:1056
+#: mail/em-format.c:1059
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: mail/em-format.c:1095 mail/em-format.c:1228
+#: mail/em-format.c:1098
+#: mail/em-format.c:1231
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: mail/em-format.c:1218
+#: mail/em-format.c:1221
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: mail/em-format.c:1379
+#: mail/em-format.c:1382
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: mail/em-format.c:1398
+#: mail/em-format.c:1401
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: mail/em-format.c:1406
+#: mail/em-format.c:1409
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: mail/em-format.c:1406
+#: mail/em-format.c:1409
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
@@ -13811,13 +13638,11 @@ msgstr "Once per month"
 
 #: mail/em-migrate.c:1168
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
@@ -13851,7 +13676,8 @@ msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
 
-#: mail/em-migrate.c:2415 mail/em-migrate.c:2427
+#: mail/em-migrate.c:2415
+#: mail/em-migrate.c:2427
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Failed to create local mail storage `%s': %s"
@@ -13862,12 +13688,8 @@ msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Unable to create local mail folders at `%s': %s"
 
 #: mail/em-migrate.c:2596
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 
 #: mail/em-popup.c:700
 msgid "Save As..."
@@ -14067,14 +13889,8 @@ msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
 #: mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
-msgstr ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
+msgstr "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
 
 #: mail/evolution-mail.schemas.in.in.h:28
 msgid "Last time empty trash was run"
@@ -14093,24 +13909,16 @@ msgid "List of accounts"
 msgstr "List of accounts"
 
 #: mail/evolution-mail.schemas.in.in.h:32
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
 #: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
 #: mail/evolution-mail.schemas.in.in.h:34
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "List of labels known to the mail component of Evolution. The list contains strings containing name:colour where colour uses the HTML hex encoding."
 
 #: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
@@ -14125,14 +13933,8 @@ msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
 #: mail/evolution-mail.schemas.in.in.h:38
-msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images if sender is in the addressbook 2 - "
-"Always load images off the net"
-msgstr ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images if sender is in the addressbook 2 - "
-"Always load images off the net"
+msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images if sender is in the addressbook 2 - Always load images off the net"
+msgstr "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images if sender is in the addressbook 2 - Always load images off the net"
 
 #: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
@@ -14203,10 +14005,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Prompt the user when he or she tries to send a message without a Subject."
 
 #: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
@@ -14217,12 +14017,8 @@ msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
 #: mail/evolution-mail.schemas.in.in.h:59
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgstr "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 
 #: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
@@ -14313,16 +14109,8 @@ msgid "The variable width font for mail display"
 msgstr "The variable width font for mail display"
 
 #: mail/evolution-mail.schemas.in.in.h:82
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 
 #: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
@@ -14417,12 +14205,8 @@ msgid "View/ReplyTo menu item is checked."
 msgstr "View/ReplyTo menu item is checked."
 
 #: mail/evolution-mail.schemas.in.in.h:106
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 
 #: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
@@ -14465,16 +14249,18 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is importing your old Elm mail"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:221
-#: mail/importers/evolution-outlook-importer.c:255
-#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-mbox-importer.c:224
+#: mail/importers/evolution-outlook-importer.c:258
+#: mail/importers/netscape-importer.c:1251
+#: mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importing..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:223
-#: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-mbox-importer.c:226
+#: mail/importers/evolution-outlook-importer.c:260
+#: mail/importers/netscape-importer.c:1253
+#: mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
 
@@ -14504,19 +14290,19 @@ msgstr "Destination folder:"
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:254
+#: mail/importers/evolution-mbox-importer.c:222
+#: mail/importers/evolution-outlook-importer.c:256
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:301
+#: mail/importers/evolution-outlook-importer.c:304
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: mail/importers/mail-importer.c:360
+#: mail/importers/mail-importer.c:361
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
@@ -14649,15 +14435,18 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "%s Licence Agreement"
 
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957
+#: mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961
+#: mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "User_name:"
 
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965
+#: mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Path:"
 
@@ -14685,153 +14474,94 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:459
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d deleted"
-msgstr[1] "%d deleted"
-
-#: mail/mail-component.c:461
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d junk"
-msgstr[1] "%d junk"
-
-#: mail/mail-component.c:484
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d draft"
-msgstr[1] "%d drafts"
-
-#: mail/mail-component.c:486
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d sent"
-msgstr[1] "%d sent"
-
+#: mail/mail-component.c:463
+#: mail/mail-component.c:465
 #: mail/mail-component.c:488
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d unsent"
-msgstr[1] "%d unsent"
-
+#: mail/mail-component.c:490
 #: mail/mail-component.c:492
+#: mail/mail-component.c:496
+#: mail/mail-component.c:498
+#: mail/mail-component.c:663
 #, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d total"
-msgstr[1] "%d total"
-
-#: mail/mail-component.c:494
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ", %d unread"
-msgstr[1] ", %d unread"
-
-#: mail/mail-component.c:659
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:664
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:665
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:671
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:672
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:669
+#: mail/mail-component.c:673
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:801
+#: mail/mail-component.c:805
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
+#: mail/mail-config-druid.c:362
+#: mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identity"
 
 #: mail/mail-config-druid.c:364
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
 
-#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:370
+#: mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Receiving Mail"
 
 #: mail/mail-config-druid.c:372
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
+msgid "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
 
 #: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Please select among the following options"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
+#: mail/mail-config-druid.c:382
+#: mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
 #: mail/mail-config-druid.c:384
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
+#: mail/mail-config-druid.c:389
+#: mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Account Management"
 
 #: mail/mail-config-druid.c:391
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
+msgstr "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
 
 #: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "Checking Service"
 
-#: mail/mail-config.c:973 mail/mail-config.c:977
+#: mail/mail-config.c:973
+#: mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "Connecting to server..."
 
-#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#: mail/mail-config.glade.h:1
+#: mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
 
@@ -14999,7 +14729,8 @@ msgstr "Always _trust keys in my keyring when encrypting"
 msgid "Attach original message"
 msgstr "Attach original message"
 
-#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47
+#: mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Attachment"
 
@@ -15091,7 +14822,8 @@ msgstr "Do not quote original message"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Don't sign _meeting requests (for Outlook compatibility)"
 
-#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74
+#: shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Done"
 
@@ -15176,12 +14908,8 @@ msgid "Message Composer"
 msgstr "Message Composer"
 
 #: mail/mail-config.glade.h:104
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgstr "Note: you will not be prompted for a password until you connect for the first time"
 
 #: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
@@ -15318,14 +15046,8 @@ msgstr ""
 "for display purposes only. "
 
 #: mail/mail-config.glade.h:147
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "This page allows you to configure spell checking behavior and language. The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "This page allows you to configure spell checking behavior and language. The list of languages here reflects only the languages for which you have a dictionary installed."
 
 #: mail/mail-config.glade.h:149
 msgid ""
@@ -15455,7 +15177,8 @@ msgstr "<span weight=\"bold\">Encryption</span>"
 msgid "Accept License"
 msgstr "Accept Licence"
 
-#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#: mail/mail-dialogs.glade.h:11
+#: mail/message-tags.glade.h:2
 msgid "C_ompleted"
 msgstr "C_ompleted"
 
@@ -15471,7 +15194,8 @@ msgstr "Find in Message"
 msgid "Find:"
 msgstr "Find:"
 
-#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/mail-dialogs.glade.h:16
+#: mail/message-tag-followup.c:294
 #: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
@@ -15496,7 +15220,8 @@ msgstr "S_erver:"
 msgid "Security Information"
 msgstr "Security Information"
 
-#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+#: mail/mail-dialogs.glade.h:23
+#: mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15508,11 +15233,13 @@ msgstr ""
 msgid "Tick this to accept the license agreement"
 msgstr "Tick this to accept the licence agreement"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#: mail/mail-dialogs.glade.h:26
+#: mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#: mail/mail-dialogs.glade.h:27
+#: mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flag:"
 
@@ -15547,12 +15274,8 @@ msgstr "Invalid authentication"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "This server does not support this type of authentication and may not support authentication at all."
 
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
@@ -15561,12 +15284,8 @@ msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
 
 #. mail:ask-send-html primary
 #: mail/mail-errors.xml.h:10
@@ -15576,18 +15295,18 @@ msgstr "Are you sure you want to send a message in HTML format?"
 #. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}\n"
 "Send anyway?"
 
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#: mail/mail-errors.xml.h:15
+#: mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27
+#: mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "_Send"
 
@@ -15598,16 +15317,13 @@ msgstr "Are you sure you want to send a message without a subject?"
 
 #. mail:ask-send-no-subject secondary
 #: mail/mail-errors.xml.h:19
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
 
 #. mail:ask-send-only-bcc-contact primary
 #. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#: mail/mail-errors.xml.h:22
+#: mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only BCC recipients?"
 
@@ -15616,46 +15332,26 @@ msgstr "Are you sure you want to send a message with only BCC recipients?"
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 
 #. mail:ask-send-only-bcc secondary
 #: mail/mail-errors.xml.h:31
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-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"
+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:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
-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."
-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."
+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."
+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:ask-default-drafts primary
 #: mail/mail-errors.xml.h:38
@@ -15664,12 +15360,8 @@ msgstr "Use default drafts folder?"
 
 #. mail:ask-default-drafts secondary
 #: mail/mail-errors.xml.h:40
-msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
-msgstr ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
+msgid "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
+msgstr "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
 
 #: mail/mail-errors.xml.h:41
 msgid "Use _Default"
@@ -15677,16 +15369,13 @@ msgstr "Use _Default"
 
 #. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+msgid "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
+msgstr "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
 
 #. mail:ask-expunge secondary
 #. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+#: mail/mail-errors.xml.h:45
+#: mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
 
@@ -15696,12 +15385,8 @@ msgstr "_Expunge"
 
 #. mail:ask-empty-trash primary
 #: mail/mail-errors.xml.h:48
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Are you sure you want to permanently remove all the deleted messages in all folders?"
 
 #: mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
@@ -15714,12 +15399,8 @@ msgstr "You have unsent messages, do you wish to quit anyway?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "If you quit, these messages will not be sent until Evolution is started again."
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
@@ -15729,15 +15410,11 @@ msgstr "Your message with the subject \"{0}\" was not delivered."
 #. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message was sent via the \"sendmail\" external application.  Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors and resend."
 msgstr ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message was sent via the \"sendmail\" external application.  Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors and resend."
 
 #. mail:async-error primary
 #: mail/mail-errors.xml.h:62
@@ -15777,7 +15454,8 @@ msgstr "Cannot save to directory \"{0}\"."
 #. mail:no-create-path primary
 #. mail:no-write-path-exists primary
 #. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:94
+#: mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
 msgstr "Cannot save to file \"{0}\"."
@@ -15807,22 +15485,19 @@ msgstr "File exists but is not a regular file."
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Cannot delete folder \"{0}\"."
 
-#. mail:no-delete-spethal-folder primary
+#. mail:no-delete-special-folder primary
 #: mail/mail-errors.xml.h:114
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
-#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
-#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:no-delete-special-folder secondary
+#. mail:no-rename-special-folder secondary
+#: mail/mail-errors.xml.h:116
+#: mail/mail-errors.xml.h:120
+msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
 
-#. mail:no-rename-spethal-folder primary
+#. mail:no-rename-special-folder primary
 #: mail/mail-errors.xml.h:118
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Cannot rename or move system folder \"{0}\"."
@@ -15839,22 +15514,20 @@ msgstr "Really delete folder \"{0}\" and all of its subfolders?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgstr "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
 
 #. mail:no-rename-folder-exists primary
 #. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#: mail/mail-errors.xml.h:128
+#: mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
 #. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#: mail/mail-errors.xml.h:130
+#: mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "A folder named \"{1}\" already exists. Please use a different name."
 
@@ -15865,25 +15538,29 @@ msgstr "Because \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#: mail/mail-errors.xml.h:136
+#: mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
 #. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#: mail/mail-errors.xml.h:138
+#: mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
 #. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#: mail/mail-errors.xml.h:142
+#: mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
 #. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#: mail/mail-errors.xml.h:144
+#: mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
@@ -15899,7 +15576,8 @@ msgstr "Cannot open source \"{1}\""
 
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
-#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#: mail/mail-errors.xml.h:156
+#: mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
@@ -15978,12 +15656,8 @@ msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
 
 #. mail:vfolder-notexist secondary
 #: mail/mail-errors.xml.h:188
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
-msgstr ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+msgid "This folder may have been added implictly, go to the virtual folder editor to add it explictly, if required."
+msgstr "This folder may have been added implictly, go to the virtual folder editor to add it explictly, if required."
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
@@ -16071,19 +15745,18 @@ msgstr "Problem migrating old mail folder \"{0}\"."
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
 msgstr ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
 
 #: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Ignore"
 
-#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231
+#: widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
@@ -16091,12 +15764,23 @@ msgstr "_Overwrite"
 msgid "_Append"
 msgstr "_Append"
 
-#. mail:gw-accountsetup-error primary
+#  mail:gw-accountsetup-error primary
 #: mail/mail-errors.xml.h:234
 msgid ""
-"Could not connect to {0}. Groupwise account setup is incomplete. You may "
-"need to setup  the account again"
+"Unable to connect to the GroupWise\n"
+"server."
+msgstr ""
+"Unable to connect to the GroupWise\n"
+"server."
+
+#  mail:gw-accountsetup-error secondary
+#: mail/mail-errors.xml.h:237
+msgid ""
+"\n"
+"Please check your account settings and try again.\n"
 msgstr ""
+"\n"
+"Please check your account settings and try again.\n"
 
 #: mail/mail-folder-cache.c:795
 #, c-format
@@ -16201,7 +15885,8 @@ msgstr "Storing account '%s'"
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
+#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
@@ -16220,19 +15905,7 @@ msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
 #: mail/mail-ops.c:1763
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Retrieving %d message"
-msgstr[1] "Retreiving %d messages"
-
 #: mail/mail-ops.c:1849
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Saving %d message"
-msgstr[1] "Saving %d messages"
-
 #: mail/mail-ops.c:1899
 #, c-format
 msgid ""
@@ -16310,7 +15983,8 @@ msgstr "Cancel _All"
 msgid "Updating..."
 msgstr "Updating..."
 
-#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
+#: mail/mail-send-recv.c:412
+#: mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "Waiting..."
 
@@ -16450,7 +16124,7 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3376
+#: mail/message-list.c:3384
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -16498,7 +16172,8 @@ msgstr "Follow-Up"
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77
+#: ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Forward"
 
@@ -16506,11 +16181,13 @@ msgstr "Forward"
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Reply"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Reply to All"
 
@@ -16563,69 +16240,54 @@ msgid "Evolution Test component"
 msgstr "Evolution Test component"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "480"
-msgstr "480"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Default width of the folder bar pane"
 msgstr "Default width of the folder bar pane"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Default window height"
 msgstr "Default window height"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window width"
 msgstr "Default window width"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Evolution configuration version"
 msgstr "Evolution configuration version"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID or alias of the component to be shown by default at start-up."
 
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+msgid "If set to true, Evolution will start up in offline mode instead of online mode."
+msgstr "If set to true, Evolution will start up in offline mode instead of online mode."
+
 #: shell/apps_evolution_shell.schemas.in.in.h:7
-msgid ""
-"If set to true, Evolution will start up in offline mode instead of online "
-"mode."
-msgstr ""
-"If set to true, Evolution will start up in offline mode instead of online "
-"mode."
+msgid "If set to true, the warning dialog in development versions of Evolution is not displayed."
+msgstr "If set to true, the warning dialog in development versions of Evolution is not displayed."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"If set to true, the warning dialog in development versions of Evolution is "
-"not displayed."
-msgstr ""
-"If set to true, the warning dialog in development versions of Evolution is "
-"not displayed."
+msgid "Last upgraded Evolution configuration version"
+msgstr "Last upgraded Evolution configuration version"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-#, fuzzy
-msgid "Last upgraded Evolution configuration version"
-msgstr "Evolution configuration version"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "List of paths for the folders to be synchronised to disk for offline usage"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"List of paths for the folders to be synchronised to disk for offline usage"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Whether Evolution should start up in offline mode"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Whether to skip the development warning dialogue"
 
@@ -16641,7 +16303,8 @@ msgstr "Active Connections"
 msgid "Click OK to close these connections and go offline"
 msgstr "Click OK to close these connections and go offline"
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell-folder-title-bar.c:592
+#: shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Untitled)"
 
@@ -16651,23 +16314,20 @@ msgstr "Choose the type of importer to run:"
 
 #: shell/e-shell-importer.c:149
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 
 #: shell/e-shell-importer.c:155
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
+#: shell/e-shell-importer.c:158
+#: shell/e-shell-startup-wizard.c:750
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
@@ -16683,7 +16343,8 @@ msgstr ""
 "that could be imported where found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 
-#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
+#: shell/e-shell-importer.c:232
+#: shell/e-shell-importer.c:266
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16692,30 +16353,32 @@ msgstr ""
 "Importing %s\n"
 "Importing item %d."
 
-#: shell/e-shell-importer.c:333
+#: shell/e-shell-importer.c:340
 msgid "Select importer"
 msgstr "Select importer"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:461
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "File %s does not exist"
 msgstr "File %s does not exist"
 
-#: shell/e-shell-importer.c:459
+#: shell/e-shell-importer.c:469
 msgid "Importing"
 msgstr "Importing"
 
-#: shell/e-shell-importer.c:467
+#: shell/e-shell-importer.c:477
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importing %s.\n"
 
-#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
+#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:488
 #, c-format
 msgid "Error loading %s"
 msgstr "Error loading %s"
 
-#: shell/e-shell-importer.c:495
+#: shell/e-shell-importer.c:506
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16724,31 +16387,32 @@ msgstr ""
 "Importing %s\n"
 "Importing item 1."
 
-#: shell/e-shell-importer.c:570
+#: shell/e-shell-importer.c:582
 msgid "Automatic"
 msgstr "Automatic"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:638
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
-#: shell/e-shell-importer.c:631
+#: shell/e-shell-importer.c:643
 msgid "Select a file"
 msgstr "Select a file"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:655
 msgid "File _type:"
 msgstr "File _type:"
 
-#: shell/e-shell-importer.c:682
+#: shell/e-shell-importer.c:694
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: shell/e-shell-importer.c:685
+#: shell/e-shell-importer.c:697
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: shell/e-shell-importer.c:753 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:765
+#: shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16756,25 +16420,26 @@ msgstr ""
 "Please wait...\n"
 "Scanning for existing setups"
 
-#: shell/e-shell-importer.c:757
+#: shell/e-shell-importer.c:772
 msgid "Starting Intelligent Importers"
 msgstr "Starting Intelligent Importers"
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:898
+#: shell/e-shell-startup-wizard.c:700
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: shell/e-shell-importer.c:1074
+#: shell/e-shell-importer.c:1092
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No importer available for file %s"
 
-#: shell/e-shell-importer.c:1086
+#: shell/e-shell-importer.c:1106
 msgid "Unable to execute importer"
 msgstr "Unable to execute importer"
 
-#: shell/e-shell-importer.c:1200
+#: shell/e-shell-importer.c:1220
 msgid "_Import"
 msgstr "_Import"
 
@@ -16786,21 +16451,17 @@ msgstr "Closing connections..."
 msgid "Evolution Settings"
 msgstr "Evolution Settings"
 
-#: shell/e-shell-startup-wizard.c:575
+#: shell/e-shell-startup-wizard.c:577
 msgid "Starting import"
 msgstr "Starting import"
 
-#: shell/e-shell-startup-wizard.c:795
+#: shell/e-shell-startup-wizard.c:797
 msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
+"If you quit the Evolution Setup Assistant now, all of the information that you have entered will be forgotten. You will need to run this assistant again before using Evolution.\n"
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
+"If you quit the Evolution Setup Assistant now, all of the information that you have entered will be forgotten. You will need to run this assistant again before using Evolution.\n"
 "\n"
 "Do you want to quit using the Assistant now?"
 
@@ -16849,11 +16510,13 @@ msgstr "Groupware Suite"
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:576
+#: ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:589
+#: ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Work Offline"
 
@@ -16874,28 +16537,34 @@ msgstr "Evolution is currently offline.  Click on this button to work online."
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: shell/e-shell.c:585
+#: shell/e-shell.c:589
 msgid "Uknown system error."
 msgstr "Uknown system error."
 
-#: shell/e-shell.c:789 shell/e-shell.c:790
+#: shell/e-shell.c:795
+#: shell/e-shell.c:796
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1216
+#: widgets/misc/e-cell-date-edit.c:265
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1218
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#: shell/e-shell.c:1214
+#: shell/e-shell.c:1220
 msgid "Cannot register on OAF"
 msgstr "Cannot register on OAF"
 
-#: shell/e-shell.c:1216
+#: shell/e-shell.c:1222
 msgid "Configuration Database not found"
 msgstr "Configuration Database not found"
 
-#: shell/e-shell.c:1218
+#: shell/e-shell.c:1224
 msgid "Generic error"
 msgstr "Generic error"
 
@@ -16999,7 +16668,8 @@ msgstr ""
 msgid "Importers"
 msgstr "Importers"
 
-#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195
+#: smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Import"
 
@@ -17104,17 +16774,13 @@ msgstr "Insufficient disk space for upgrade."
 #. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 
 #. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
@@ -17130,73 +16796,75 @@ msgstr ""
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 
 #: shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Continue"
 
-#. shell:upgrade-remove-1-4 title
-#. shell:upgrade-remove-1-4 primary
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+#  shell:upgrade-remove-1-4 title
+#  shell:upgrade-remove-1-4 primary
+#: shell/shell-errors.xml.h:17
+#: shell/shell-errors.xml.h:19
 msgid "Delete old data from version {0}?"
-msgstr ""
+msgstr "Delete old data from version {0}?"
 
-#. shell:upgrade-remove-1-4 secondary
+#  shell:upgrade-remove-1-4 secondary
 #: shell/shell-errors.xml.h:21
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the \"evolution\" "
-"directory will be removed permanently.  If you choose to keep this data, "
-"then you may manually remove the contents of \"evolution\" at your "
-"convenience.\n"
+"If you choose to remove this data, the entire contents of the \"evolution\" directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of \"evolution\" at your convenience.\n"
 msgstr ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the \"evolution\" directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of \"evolution\" at your convenience.\n"
 
 #: shell/shell-errors.xml.h:25
-#, fuzzy
 msgid "_Remind Me Later"
-msgstr "Reminder"
+msgstr "_Remind Me Later"
 
 #: shell/shell-errors.xml.h:26
 msgid "_Keep Data"
-msgstr ""
+msgstr "_Keep Data"
 
-#. shell:upgrade-remove-1-4-confirm title
-#. shell:upgrade-remove-1-4-confirm primary
-#: shell/shell-errors.xml.h:28 shell/shell-errors.xml.h:30
+#  shell:upgrade-remove-1-4-confirm title
+#  shell:upgrade-remove-1-4-confirm primary
+#: shell/shell-errors.xml.h:28
+#: shell/shell-errors.xml.h:30
 msgid "Really delete old data?"
-msgstr ""
+msgstr "Really delete old data?"
 
-#. shell:upgrade-remove-1-4-confirm secondary
+#  shell:upgrade-remove-1-4-confirm secondary
 #: shell/shell-errors.xml.h:32
 msgid ""
-"The entire contents of the \"evolution\" directory is about to be be "
-"permanently removed.\n"
+"The entire contents of the \"evolution\" directory is about to be be permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
+"The entire contents of the \"evolution\" directory is about to be be permanently removed.\n"
+"\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
+"\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 
 #. shell:noshell title
 #. shell:noshell-reason title
-#: shell/shell-errors.xml.h:39 shell/shell-errors.xml.h:47
+#: shell/shell-errors.xml.h:39
+#: shell/shell-errors.xml.h:47
 msgid "Cannot start Evolution"
 msgstr "Cannot start Evolution"
 
 #. shell:noshell primary
 #. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:41 shell/shell-errors.xml.h:49
+#: shell/shell-errors.xml.h:41
+#: shell/shell-errors.xml.h:49
 msgid "Evolution can not start."
 msgstr "Evolution can not start."
 
@@ -17238,41 +16906,35 @@ msgstr ""
 "Edit trust settings:"
 
 #: smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
 
 #: smime/gui/cert-trust-dialog.c:149
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
-#: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
-#: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+
+#: smime/gui/certificate-manager.c:134
+#: smime/gui/certificate-manager.c:142
+#: smime/gui/certificate-manager.c:375
+#: smime/gui/certificate-manager.c:383
+#: smime/gui/certificate-manager.c:595
+#: smime/gui/certificate-manager.c:603
 msgid "Select a cert to import..."
 msgstr "Select a cert to import..."
 
-#: smime/gui/certificate-manager.c:263 smime/gui/certificate-manager.c:472
+#: smime/gui/certificate-manager.c:263
+#: smime/gui/certificate-manager.c:472
 #: smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: smime/gui/certificate-manager.c:272 smime/gui/certificate-manager.c:490
+#: smime/gui/certificate-manager.c:272
+#: smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "Purposes"
 
-#: smime/gui/certificate-manager.c:281 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:281
+#: smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serial Number"
@@ -17376,14 +17038,11 @@ msgid "Backup All"
 msgstr "Backup All"
 
 #: smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#: smime/gui/smime-ui.glade.h:14
+#: smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificate"
 
@@ -17451,11 +17110,13 @@ msgstr "Organisational Unit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+#: smime/gui/smime-ui.glade.h:34
+#: smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL Client Certificate"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+#: smime/gui/smime-ui.glade.h:35
+#: smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL Server Certificate"
 
@@ -17484,10 +17145,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organisations that identify you:"
 
 #: smime/gui/smime-ui.glade.h:43
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "You have certificates on file that identify these certificate authorities:"
 
 #: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
@@ -17506,7 +17165,8 @@ msgstr "_Edit CA Trust"
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
-#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#: smime/lib/e-cert.c:238
+#: smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -17624,11 +17284,13 @@ msgstr "Subject Public Key Algorithm"
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Object Signer"
 
@@ -17672,7 +17334,8 @@ msgstr "CRL Signer"
 msgid "Critical"
 msgstr "Critical"
 
-#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#: smime/lib/e-cert.c:940
+#: smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Not Critical"
 
@@ -17685,7 +17348,8 @@ msgstr "Extensions"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+#: smime/lib/e-cert.c:1091
+#: smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
@@ -17705,15 +17369,15 @@ msgstr "Subject Unique ID"
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
-#: smime/lib/e-pkcs12.c:263
+#: smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
 
-#: smime/lib/e-pkcs12.c:263
+#: smime/lib/e-pkcs12.c:264
 msgid "Enter password for PKCS12 file:"
 msgstr "Enter password for PKCS12 file:"
 
-#: smime/lib/e-pkcs12.c:362
+#: smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
@@ -17758,7 +17422,8 @@ msgstr "Shutting down %s (%s)\n"
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Copy Contact(s) to Another Folder..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
@@ -17766,7 +17431,8 @@ msgstr "Copy the selection"
 msgid "Copy to Folder..."
 msgstr "Copy to Folder..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
@@ -17782,7 +17448,8 @@ msgstr "Move Contact(s) to Another Folder..."
 msgid "Move to Folder..."
 msgstr "Move to Folder..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
@@ -17790,8 +17457,10 @@ msgstr "Paste the clipboard"
 msgid "Previews the contacts to be printed"
 msgstr "Previews the contacts to be printed"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-mail-message.xml.h:81
 #: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
@@ -17840,17 +17509,24 @@ msgstr "Stop Loading"
 msgid "View the current contact"
 msgstr "View the current contact"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19
+#: ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35
+#: ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Forward Contact..."
 
@@ -17858,7 +17534,8 @@ msgstr "_Forward Contact..."
 msgid "_Move to Folder..."
 msgstr "_Move to Folder..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Preview Pane"
 
@@ -17914,7 +17591,8 @@ msgstr "List"
 msgid "Month"
 msgstr "Month"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Next"
 
@@ -17922,7 +17600,8 @@ 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:79
+#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Previous"
 
@@ -17934,7 +17613,8 @@ msgstr "Print this calendar"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publish Free/Busy information for this calendar"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Purg_e"
 
@@ -17974,7 +17654,8 @@ msgstr "Show one week"
 msgid "Show the working week"
 msgstr "Show the working week"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: ui/evolution-calendar.xml.h:34
+#: widgets/misc/e-cell-date-edit.c:249
 #: widgets/misc/e-dateedit.c:435
 msgid "Today"
 msgstr "Today"
@@ -17995,16 +17676,19 @@ msgstr "Work Week"
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "C_lose"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3
+#: ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Close"
@@ -18013,12 +17697,15 @@ msgstr "Close"
 msgid "Close this item"
 msgstr "Close this item"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5
+#: ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Delete this item"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
+#: ui/evolution-comp-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3
+#: ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Main toolbar"
 
@@ -18026,23 +17713,27 @@ msgstr "Main toolbar"
 msgid "Preview the printed item"
 msgstr "Preview the printed item"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Print this item"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Save _As..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Save and Close"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-comp-editor.xml.h:13
+#: ui/evolution-contact-editor.xml.h:10
 #: ui/evolution-contact-list-editor.xml.h:7
 #: ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
@@ -18056,11 +17747,13 @@ msgstr "Save the item and close the dialogue box"
 msgid "Save this item to disk"
 msgstr "Save this item to disk"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_File"
@@ -18069,7 +17762,8 @@ msgstr "_File"
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2
+#: ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Cu_t"
 
@@ -18081,7 +17775,8 @@ msgstr "Cut selected text to the clipboard"
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
+#: ui/evolution-composer-entries.xml.h:5
+#: ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Select _All"
@@ -18137,11 +17832,13 @@ msgstr "Cancel Mee_ting"
 msgid "Cancel the meeting for this item"
 msgstr "Cancel the meeting for this item"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:3
+#: ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "Forward as i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4
+#: ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Forward this item via email"
 
@@ -18229,11 +17926,13 @@ msgstr "_Filters..."
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copy selected message(s) to the clipboard"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:3
+#: ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Cut selected message(s) to the clipboard"
 
@@ -18254,10 +17953,8 @@ msgid "Hide _Read Messages"
 msgstr "Hide _Read Messages"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "Hide deleted messages rather than displaying them with a line through them"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -18267,7 +17964,8 @@ msgstr "Mark All as _Read"
 msgid "Mark all visible messages as read"
 msgstr "Mark all visible messages as read"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-list.xml.h:11
+#: ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Paste message(s) from the clipboard"
 
@@ -18315,7 +18013,8 @@ msgstr "Threaded Message list"
 msgid "_Folder"
 msgstr "_Folder"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Invert Selection"
 
@@ -18715,7 +18414,8 @@ msgstr "_Previous Message"
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129
+#: ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Tools"
 
@@ -18723,12 +18423,14 @@ msgstr "_Tools"
 msgid "_Undelete"
 msgstr "_Undelete"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2
+#: ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Close this window"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Close"
@@ -18741,7 +18443,8 @@ msgstr "Attach"
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Close the current file"
 
@@ -18757,7 +18460,8 @@ msgstr "Encrypt this message with PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Encrypt this message with your S/MIME Encryption Cetificate"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_mat"
 
@@ -19212,12 +18916,10 @@ msgstr "Select a Time Zone"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 
 #: widgets/menus/gal-view-menus.c:292
@@ -19248,7 +18950,8 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:241
+#: widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "Now"
 
@@ -19309,13 +19012,16 @@ msgstr "Western European"
 msgid "Western European, New"
 msgstr "Western European, New"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Traditional"
 
-#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Simplified"
 
@@ -19332,7 +19038,8 @@ msgstr "Visual"
 msgid "Unknown character set: %s"
 msgstr "Unknown character set: %s"
 
-#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+#: widgets/misc/e-charset-picker.c:216
+#: widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Character Encoding"
 
@@ -19348,12 +19055,14 @@ msgstr "Other..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84
+#: widgets/misc/e-error.c:83
+#: widgets/misc/e-error.c:84
 #: widgets/misc/e-error.c:126
 msgid "Evolution Error"
 msgstr "Evolution Error"
 
-#: widgets/misc/e-error.c:85 widgets/misc/e-error.c:86
+#: widgets/misc/e-error.c:85
+#: widgets/misc/e-error.c:86
 #: widgets/misc/e-error.c:124
 msgid "Evolution Warning"
 msgstr "Evolution Warning"
@@ -19369,10 +19078,8 @@ msgstr "Evolution Query"
 #. setup a dummy error
 #: widgets/misc/e-error.c:421
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -19391,12 +19098,8 @@ msgid "Use underline"
 msgstr "Use underline"
 
 #: widgets/misc/e-expander.c:198
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgstr "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 
 #: widgets/misc/e-expander.c:205
 msgid "Spacing"
@@ -19443,15 +19146,18 @@ msgstr "Search Editor"
 msgid "Save Search"
 msgstr "Save Search"
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92
+#: widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Save Search..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93
+#: widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searches..."
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Advanced..."
 
@@ -19460,9 +19166,8 @@ msgid "Choose Image"
 msgstr "Choose Image"
 
 #: widgets/misc/e-pilot-settings.c:103
-#, fuzzy
 msgid "Sync with:"
-msgstr "ends with"
+msgstr "Sync with:"
 
 #: widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
@@ -19480,7 +19185,8 @@ msgstr "_Search"
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547
+#: widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Clear"
 
@@ -19530,2104 +19236,3 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
-#~ msgid "_Add Group"
-#~ msgstr "_Add Group"
-
-#~ msgid "Use ssl"
-#~ msgstr "Use ssl"
-
-#~ msgid "Ximian Evolution (Unstable)"
-#~ msgstr "Ximian Evolution (Unstable)"
-
-#~ msgid "Remember this password"
-#~ msgstr "Remember this password"
-
-#~ msgid "Remember this password for the remainder of this session"
-#~ msgstr "Remember this password for the remainder of this session"
-
-#, fuzzy
-#~ msgid "Keep"
-#~ msgstr "Beep"
-
-#~ msgid "_Add Contacts Group"
-#~ msgstr "_Add Contacts Group"
-
-#~ msgid "New Contacts Group"
-#~ msgstr "New Contacts Group"
-
-#~ msgid "Contacts Grou_p"
-#~ msgstr "Contacts Grou_p"
-
-#~ msgid "Create a new contacts group"
-#~ msgstr "Create a new contacts group"
-
-#~ msgid "Add Contacts Group"
-#~ msgstr "Add Contacts Group"
-
-#~ msgid "Download limit:"
-#~ msgstr "Download limit:"
-
-#~ msgid "Only locations within starting point"
-#~ msgstr "Only locations within starting point"
-
-#~ msgid "Search base only"
-#~ msgstr "Search base only"
-
-#~ msgid "Search base:"
-#~ msgstr "Search base:"
-
-#~ msgid "Search scope:"
-#~ msgstr "Search scope:"
-
-#~ msgid "Starting point and locations within it"
-#~ msgstr "Starting point and locations within it"
-
-#~ msgid "Timeout:"
-#~ msgstr "Timeout:"
-
-#~ msgid "_Email address:"
-#~ msgstr "_Email address:"
-
-#~ msgid "_Log in:"
-#~ msgstr "_Log in:"
-
-#~ msgid "Add Tasks Group"
-#~ msgstr "_Tasks Group"
-
-#~ msgid "L_ocation:"
-#~ msgstr "L_ocation:"
-
-#~ msgid "<b>Organizer</b>"
-#~ msgstr "<b>Organiser</b>"
-
-#~ msgid "_Organizer:"
-#~ msgstr "_Organiser:"
-
-#~ msgid "New tasks group"
-#~ msgstr "New tasks group"
-
-#~ msgid "Tasks Gro_up"
-#~ msgstr "Tasks Gro_up"
-
-#~ msgid "Create a new tasks group"
-#~ msgstr "Create a new tasks group"
-
-#~ msgid "Got BYE response"
-#~ msgstr "Got BYE response"
-
-#~ msgid "mail"
-#~ msgstr "mail"
-
-#~ msgid "Authentication Credentials for HTTP Server"
-#~ msgstr "Authentication Credentials for HTTP Server"
-
-#~ msgid "Calendars selected for publishing"
-#~ msgstr "Calendars selected for publishing"
-
-#~ msgid "Login name:"
-#~ msgstr "Login name:"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "User Publishes"
-#~ msgstr "User Publishes"
-
-#~ msgid "Could not start wombat"
-#~ msgstr "Could not start wombat"
-
-#~ msgid ""
-#~ "Selected calendar is read-only, events cannot be created. Please select a "
-#~ "read-write calendar."
-#~ msgstr ""
-#~ "Selected calendar is read-only, events cannot be created. Please select a "
-#~ "read-write calendar."
-
-#~ msgid "C_alendar"
-#~ msgstr "C_alendar"
-
-#~ msgid "Audio Alarm Options"
-#~ msgstr "Audio Alarm Options"
-
-#~ msgid "Message Alarm Options"
-#~ msgstr "Message Alarm Options"
-
-#~ msgid "Email Alarm Options"
-#~ msgstr "Email Alarm Options"
-
-#~ msgid "Program Alarm Options"
-#~ msgstr "Program Alarm Options"
-
-#~ msgid "Unknown Alarm Options"
-#~ msgstr "Unknown Alarm Options"
-
-#~ msgid "Alarm Repeat"
-#~ msgstr "Alarm Repeat"
-
-#~ msgid "Message to Display:"
-#~ msgstr "Message to Display:"
-
-#~ msgid "Message to Send"
-#~ msgstr "Message to Send"
-
-#~ msgid "Play sound:"
-#~ msgstr "Play sound:"
-
-#~ msgid "Run program:"
-#~ msgstr "Run program:"
-
-#~ msgid "With these arguments:"
-#~ msgstr "With these arguments:"
-
-#~ msgid "Basics"
-#~ msgstr "Basics"
-
-#~ msgid "Date/Time:"
-#~ msgstr "Date/Time:"
-
-#~ msgid "Reminders"
-#~ msgstr "Reminders"
-
-#~ msgid "_Options..."
-#~ msgstr "_Options..."
-
-#~ msgid "Addressbook..."
-#~ msgstr "Addressbook..."
-
-#~ msgid "B_usy"
-#~ msgstr "B_usy"
-
-#~ msgid "Co_nfidential"
-#~ msgstr "Co_nfidential"
-
-#~ msgid "Date & Time"
-#~ msgstr "Date & Time"
-
-#~ msgid "F_ree"
-#~ msgstr "F_ree"
-
-#~ msgid "Pri_vate"
-#~ msgstr "Pri_vate"
-
-#~ msgid "Pu_blic"
-#~ msgstr "Pu_blic"
-
-#~ msgid "Add A_ttendee"
-#~ msgstr "Add A_ttendee"
-
-#~ msgid "Add attendees from addressbook."
-#~ msgstr "Add attendees from addressbook."
-
-#~ msgid "Preview"
-#~ msgstr "Preview"
-
-#~ msgid "Recurrence Rule"
-#~ msgstr "Recurrence Rule"
-
-#~ msgid "_Custom recurrence"
-#~ msgstr "_Custom recurrence"
-
-#~ msgid "_Modify"
-#~ msgstr "_Modify"
-
-#~ msgid "_No recurrence"
-#~ msgstr "_No recurrence"
-
-#~ msgid "_Simple recurrence"
-#~ msgstr "_Simple recurrence"
-
-#~ msgid "% _Complete"
-#~ msgstr "% _Complete"
-
-#~ msgid "Progress"
-#~ msgstr "Progress"
-
-#~ msgid "Con_fidential"
-#~ msgstr "Con_fidential"
-
-#~ msgid "Folder:"
-#~ msgstr "Folder:"
-
-#~ msgid "There was an error on the CORBA system\n"
-#~ msgstr "There was an error on the CORBA system\n"
-
-#~ msgid "Object could not be found\n"
-#~ msgstr "Object could not be found\n"
-
-#~ msgid "You don't have the right permissions to update the calendar\n"
-#~ msgstr "You don't have the right permissions to update the calendar\n"
-
-#~ msgid "Attendee status could not be updated!\n"
-#~ msgstr "Attendee status could not be updated!\n"
-
-#~ msgid "Add attendees from addressbook"
-#~ msgstr "Add attendees from addressbook"
-
-#~ msgid "_Options"
-#~ msgstr "_Options"
-
-#~ msgid "Meeting _start time:"
-#~ msgstr "Meeting _start time:"
-
-#~ msgid "Meeting _end time:"
-#~ msgstr "Meeting _end time:"
-
-#~ msgid ""
-#~ "Selected task list is read-only, events cannot be created. Please select "
-#~ "a read-write calendar."
-#~ msgstr ""
-#~ "Selected task list is read-only, events cannot be created. Please select "
-#~ "a read-write calendar."
-
-#~ msgid "Can't find certificate for `%s'"
-#~ msgstr "Can't find certificate for `%s'"
-
-#~ msgid "Can't create CMS Message"
-#~ msgstr "Can't create CMS Message"
-
-#~ msgid "Can't create encoder context"
-#~ msgstr "Can't create encoder context"
-
-#~ msgid "_Score Rules"
-#~ msgstr "_Score Rules"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-#~ msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-
-#~ msgid "Properties"
-#~ msgstr "Properties"
-
-#~ msgid "Folder Name"
-#~ msgstr "Folder Name"
-
-#~ msgid "contact-list-editor"
-#~ msgstr "contact-list-editor"
-
-#~ msgid "Save List as VCard"
-#~ msgstr "Save List as VCard"
-
-#~ msgid "Groupwise"
-#~ msgstr "Groupwise"
-
-#~ msgid "<b>Starts:</b> "
-#~ msgstr "<b>Starts:</b> "
-
-#~ msgid "<b>Ends:</b> "
-#~ msgstr "<b>Ends:</b> "
-
-#~ msgid "<b>Completed:</b> "
-#~ msgstr "<b>Completed:</b> "
-
-#~ msgid "<b>Due:</b> "
-#~ msgstr "<b>Due:</b> "
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>None</i>"
-
-#~ msgid ""
-#~ "Error opening %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Error opening %s:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not create composer window:\n"
-#~ "Unable to activate HTML editor component."
-#~ msgstr ""
-#~ "Could not create composer window:\n"
-#~ "Unable to activate HTML editor component."
-
-#~ msgid "_Properties..."
-#~ msgstr "_Properties..."
-
-#~ msgid "Checkbox"
-#~ msgstr "Checkbox"
-
-#~ msgid "C_alendar:"
-#~ msgstr "C_alendar:"
-
-#~ msgid "_Contacts:"
-#~ msgstr "_Contacts:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Mail:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Tasks:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Folder _type:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Open Other User's Folder"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Folder Name:"
-
-#~ msgid "_User:"
-#~ msgstr "_User:"
-
-#~ msgid ""
-#~ "Some fields are no longer representable in the contact editor. Please "
-#~ "wait while Evolution copies those fields to the 'Notes' field..."
-#~ msgstr ""
-#~ "Some fields are no longer representable in the contact editor. Please "
-#~ "wait while Evolution copies those fields to the 'Notes' field..."
-
-#~ msgid "  S_how Supported Bases "
-#~ msgstr "  S_how Supported Bases "
-
-#~ msgid "1:00"
-#~ msgstr "1:00"
-
-#~ msgid "5:00"
-#~ msgstr "5:00"
-
-#~ msgid "Connecting"
-#~ msgstr "Connecting"
-
-#~ msgid "Distinguished _name:"
-#~ msgstr "Distinguished _name:"
-
-#~ msgid "Email address:"
-#~ msgstr "Email address:"
-
-#~ msgid "Evolution will use this DN to authenticate you with the server"
-#~ msgstr "Evolution will use this DN to authenticate you with the server"
-
-#~ msgid "S_earch scope: "
-#~ msgstr "S_earch scope: "
-
-#~ msgid "Searching"
-#~ msgstr "Searching"
-
-#~ msgid "This option controls how long a search will be run."
-#~ msgstr "This option controls how long a search will be run."
-
-#~ msgid "U_se SSL/TLS:"
-#~ msgstr "U_se SSL/TLS:"
-
-#~ msgid "_Display name:"
-#~ msgstr "_Display name:"
-
-#~ msgid "_Port number:"
-#~ msgstr "_Port number:"
-
-#~ msgid "_Search base:"
-#~ msgstr "_Search base:"
-
-#~ msgid "_Server name:"
-#~ msgstr "_Server name:"
-
-#~ msgid "_Timeout (minutes):"
-#~ msgstr "_Timeout (minutes):"
-
-#~ msgid "connecting-tab"
-#~ msgstr "connecting-tab"
-
-#~ msgid "general-tab"
-#~ msgstr "general-tab"
-
-#~ msgid "searching-tab"
-#~ msgstr "searching-tab"
-
-#~ msgid "Webcam:"
-#~ msgstr "Webcam:"
-
-#~ msgid "item7"
-#~ msgstr "item7"
-
-#~ msgid "item8"
-#~ msgstr "item8"
-
-#~ msgid "Calendar Properties"
-#~ msgstr "Calendar Properties"
-
-#~ msgid "Remote"
-#~ msgstr "Remote"
-
-#~ msgid "Task List Properties"
-#~ msgstr "Task List Properties"
-
-#~ msgid "_Refresh Interval:"
-#~ msgstr "_Refresh Interval:"
-
-#~ msgid "_Source URL:"
-#~ msgstr "_Source URL:"
-
-#~ msgid "_Invite Others..."
-#~ msgstr "_Invite Others..."
-
-#~ msgid "Posting not allowed by news server"
-#~ msgstr "Posting not allowed by news server"
-
-#~ msgid "Failed to send newsgroups header: %s: message not posted"
-#~ msgstr "Failed to send newsgroups header: %s: message not posted"
-
-#~ msgid "Error posting to newsgroup: %s: message not posted"
-#~ msgstr "Error posting to newsgroup: %s: message not posted"
-
-#~ msgid "Error reading response to posted message: message not posted"
-#~ msgstr "Error reading response to posted message: message not posted"
-
-#~ msgid "Error posting message: %s: message not posted"
-#~ msgstr "Error posting message: %s: message not posted"
-
-#~ msgid "Stream error"
-#~ msgstr "Stream error"
-
-#~ msgid "Connection error: %s"
-#~ msgstr "Connection error: %s"
-
-#~ msgid "Could not get group: %s"
-#~ msgstr "Could not get group: %s"
-
-#~ msgid "Could not get messages: unspecified error"
-#~ msgstr "Could not get messages: unspecified error"
-
-#~ msgid "Unknown server response: %s"
-#~ msgstr "Unknown server response: %s"
-
-#~ msgid "${1}"
-#~ msgstr "${1}"
-
-#~ msgid "Because \"${1}\"."
-#~ msgstr "Because \"${1}\"."
-
-#~ msgid "Brought to you by"
-#~ msgstr "Brought to you by"
-
-#~ msgid "_Filename:"
-#~ msgstr "_Filename:"
-
-#~ msgid "Do you want to trust \"%s\" for the following purposes?"
-#~ msgstr "Do you want to trust \"%s\" for the following purposes?"
-
-#~ msgid "View Certificate"
-#~ msgstr "View Certificate"
-
-#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
-#~ msgstr "You have been asked to trust a new Certificate Authority (CA)."
-
-#~ msgid "About Ximian Evolution..."
-#~ msgstr "About Ximian Evolution..."
-
-#~ msgid "_About Ximian Evolution..."
-#~ msgstr "_About Ximian Evolution..."
-
-#~ msgid "Failed to connect to LDAP server"
-#~ msgstr "Failed to connect to LDAP server"
-
-#~ msgid "Could not perform query on Root DSE"
-#~ msgstr "Could not perform query on Root DSE"
-
-#~ msgid "Error retrieving schema information"
-#~ msgstr "Error retrieving schema information"
-
-#~ msgid "Job title:"
-#~ msgstr "Job title:"
-
-#~ msgid "Do you want to save changes?"
-#~ msgstr "Do you want to save changes?"
-
-#~ msgid "Error saving %s: %s"
-#~ msgstr "Error saving %s: %s"
-
-#~ msgid ""
-#~ "The addressbook backend for\n"
-#~ "%s\n"
-#~ "has crashed. You will have to restart Evolution in order to use it again"
-#~ msgstr ""
-#~ "The addressbook backend for\n"
-#~ "%s\n"
-#~ "has crashed. You will have to restart Evolution in order to use it again"
-
-#~ msgid "Can not load URI"
-#~ msgstr "Can not load URI"
-
-#~ msgid ""
-#~ "The event being deleted is a meeting, would you like to send a "
-#~ "cancellation notice?"
-#~ msgstr ""
-#~ "The event being deleted is a meeting, would you like to send a "
-#~ "cancellation notice?"
-
-#~ msgid ""
-#~ "The task being deleted is assigned, would you like to send a cancellation "
-#~ "notice?"
-#~ msgstr ""
-#~ "The task being deleted is assigned, would you like to send a cancellation "
-#~ "notice?"
-
-#~ msgid "Are you sure you want to cancel and delete this task?"
-#~ msgstr "Are you sure you want to cancel and delete this task?"
-
-#~ msgid ""
-#~ "The journal entry being deleted is published, would you like to send a "
-#~ "cancellation notice?"
-#~ msgstr ""
-#~ "The journal entry being deleted is published, would you like to send a "
-#~ "cancellation notice?"
-
-#~ msgid "Are you sure you want to delete this untitled appointment?"
-#~ msgstr "Are you sure you want to delete this untitled appointment?"
-
-#~ msgid "Are you sure you want to delete this untitled task?"
-#~ msgstr "Are you sure you want to delete this untitled task?"
-
-#~ msgid "Are you sure want to delete this untitled journal entry?"
-#~ msgstr "Are you sure want to delete this untitled journal entry?"
-
-#~ msgid ""
-#~ "This event has been changed, but has not been saved.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "This event has been changed, but has not been saved.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-
-#~ msgid "_Discard Changes"
-#~ msgstr "_Discard Changes"
-
-#~ msgid "Save Event"
-#~ msgstr "Save Event"
-
-#~ msgid "The meeting information has been created. Send it?"
-#~ msgstr "The meeting information has been created. Send it?"
-
-#~ msgid "The meeting information has changed. Send an updated version?"
-#~ msgstr "The meeting information has changed. Send an updated version?"
-
-#~ msgid "The task assignment information has been created. Send it?"
-#~ msgstr "The task assignment information has been created. Send it?"
-
-#~ msgid "The task information has changed. Send an updated version?"
-#~ msgstr "The task information has changed. Send an updated version?"
-
-#~ msgid "The task backend for '%s' has crashed."
-#~ msgstr "The task backend for '%s' has crashed."
-
-#~ msgid "The calendar backend for '%s' has crashed."
-#~ msgstr "The calendar backend for '%s' has crashed."
-
-#~ msgid "Learning junk and/or non junk message(s)"
-#~ msgstr "Learning junk and/or non junk message(s)"
-
-#~ msgid "Check _Incoming Mail"
-#~ msgstr "Check _Incoming Mail"
-
-#~ msgid "Use _Daemon"
-#~ msgstr "Use _Daemon"
-
-#~ msgid "_Local Tests Only"
-#~ msgstr "_Local Tests Only"
-
-#~ msgid "Working"
-#~ msgstr "Working"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Unknown error."
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Unknown error."
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "The error from the component system is:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "The error from the component system is:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "The error from the activation system is:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "The error from the activation system is:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid ""
-#~ "The following entries are invalid:\n"
-#~ "\n"
-#~ msgstr "The following connections are currently active:"
-
-#~ msgid "Could not find widget for a field: `%s'"
-#~ msgstr "Could not find widget for a field: `%s'"
-
-#~ msgid "UID of the contacts source that the view will display"
-#~ msgstr "UID of the contacts source that the view will display"
-
-#~ msgid "The URI that the address book will display"
-#~ msgstr "The URI that the address book will display"
-
-#~ msgid "Evolution Addressbook folder viewer"
-#~ msgstr "Evolution Addressbook folder viewer"
-
-#~ msgid "Address 2:"
-#~ msgstr "Address 2:"
-
-#~ msgid "Blog:"
-#~ msgstr "Blog:"
-
-#~ msgid "Could not initialize gnome-vfs"
-#~ msgstr "Could not initialise gnome-vfs"
-
-#~ msgid "Could not open the folder in '%s'"
-#~ msgstr "Could not open the folder in '%s'"
-
-#~ msgid "The URI that the calendar will display"
-#~ msgstr "The URI that the calendar will display"
-
-#~ msgid "The type of view to show"
-#~ msgstr "The type of view to show"
-
-#~ msgid "Display a message"
-#~ msgstr "Display a message"
-
-#~ msgid "Select source"
-#~ msgstr "Select source"
-
-#~ msgid "Calendar file could not be updated!\n"
-#~ msgstr "Calendar file could not be updated!\n"
-
-#~ msgid "Evolution Calendar viewer"
-#~ msgstr "Evolution Calendar viewer"
-
-#~ msgid "Evolution Tasks viewer"
-#~ msgstr "Evolution Tasks viewer"
-
-#~ msgid "The URI of the tasks folder to display"
-#~ msgstr "The URI of the tasks folder to display"
-
-#~ msgid "Could not load the tasks in `%s'"
-#~ msgstr "Could not load the tasks in `%s'"
-
-#~ msgid ""
-#~ "The folder name \"%s\" is invalid because it containes the character \"%c"
-#~ "\""
-#~ msgstr ""
-#~ "The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#~ msgid "VFolder on Thread"
-#~ msgstr "VFolder on Thread"
-
-#~ msgid "Filter on Thread"
-#~ msgstr "Filter on Thread"
-
-#~ msgid "Failed to migrate pop3 uid caches: %s"
-#~ msgstr "Failed to migrate pop3 uid caches: %s"
-
-#~ msgid "Failed to migrate folder expand state: %s"
-#~ msgstr "Failed to migrate folder expand state: %s"
-
-#~ msgid "Failed to open store for `%s': %s"
-#~ msgstr "Failed to open store for `%s': %s"
-
-#~ msgid "S3kr3t 0pt10n"
-#~ msgstr "S3kr3t 0pt10n"
-
-#~ msgid "S3kr3t 0pt10n."
-#~ msgstr "S3kr3t 0pt10n."
-
-#~ msgid "Evolution Mail folder viewer"
-#~ msgstr "Evolution Mail folder viewer"
-
-#~ msgid "URI of the mail source that the view will display"
-#~ msgstr "URI of the mail source that the view will display"
-
-#~ msgid ""
-#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
-#~ "d.\n"
-#~ "The data hasn't been deleted, but it will not be seen by this version of "
-#~ "Evolution.\n"
-#~ msgstr ""
-#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
-#~ "d.\n"
-#~ "The data hasn't been deleted, but it will not be seen by this version of "
-#~ "Evolution.\n"
-
-#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
-#~ msgstr "Cannot initialise the Ximian Evolution shell: %s"
-
-#~ msgid "_Resend..."
-#~ msgstr "_Resend..."
-
-#~ msgid "Because \"{1}\""
-#~ msgstr "Because \"{1}\""
-
-#~ msgid "calendar"
-#~ msgstr "calendar"
-
-#~ msgid "Alerts"
-#~ msgstr "Alerts"
-
-#~ msgid "Time"
-#~ msgstr "Time"
-
-#~ msgid "_General"
-#~ msgstr "_General"
-
-#~ msgid ""
-#~ "The task backend for\n"
-#~ "%s\n"
-#~ " has crashed."
-#~ msgstr ""
-#~ "The task backend for\n"
-#~ "%s\n"
-#~ " has crashed."
-
-#~ msgid "Default shortcut group"
-#~ msgstr "Default shortcut group"
-
-#~ msgid "Default width of the shortcut bar pane"
-#~ msgstr "Default width of the shortcut bar pane"
-
-#~ msgid "Path to the default calendar folder"
-#~ msgstr "Path to the default calendar folder"
-
-#~ msgid "Path to the default contacts folder"
-#~ msgstr "Path to the default contacts folder"
-
-#~ msgid "Path to the default mail folder"
-#~ msgstr "Path to the default mail folder"
-
-#~ msgid "Path to the default tasks folder"
-#~ msgstr "Path to the default tasks folder"
-
-#~ msgid "Physical URI to the default calendar folder"
-#~ msgstr "Physical URI to the default calendar folder"
-
-#~ msgid "Physical URI to the default contacts folder"
-#~ msgstr "Physical URI to the default contacts folder"
-
-#~ msgid "Physical URI to the default mail folder"
-#~ msgstr "Physical URI to the default mail folder"
-
-#~ msgid "Physical URI to the default tasks folder"
-#~ msgstr "Physical URI to the default tasks folder"
-
-#~ msgid "Whether to show the folder bar"
-#~ msgstr "Whether to show the folder bar"
-
-#~ msgid "Whether to show the shortcut bar"
-#~ msgstr "Whether to show the shortcut bar"
-
-#~ msgid "Due date is before start date!"
-#~ msgstr "Due date is before start date!"
-
-#~ msgid ""
-#~ "Error while reading file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Error while reading file %s:\n"
-#~ "%s"
-
-#~ msgid "Error saving file: %s"
-#~ msgstr "Error saving file: %s"
-
-#~ msgid "Error loading file: %s"
-#~ msgstr "Error loading file: %s"
-
-#~ msgid "Error accessing file: %s"
-#~ msgstr "Error accessing file: %s"
-
-#~ msgid ""
-#~ "Unable to seek on file: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Unable to seek on file: %s\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Unable to truncate file: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Unable to truncate file: %s\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Error autosaving message: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Error autosaving message: %s\n"
-#~ " %s"
-
-#~ msgid ""
-#~ "Ximian Evolution has found unsaved messages from a previous session.\n"
-#~ "Would you like to try to recover them?"
-#~ msgstr ""
-#~ "Ximian Evolution has found unsaved messages from a previous session.\n"
-#~ "Would you like to try to recover them?"
-
-#~ msgid ""
-#~ "The message \"%s\" has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "The message \"%s\" has not been sent.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-
-#~ msgid "Rule name '%s' is not unique, choose another."
-#~ msgstr "Rule name '%s' is not unique, choose another."
-
-#~ msgid "You need to to specify at least one folder as a source."
-#~ msgstr "You need to to specify at least one folder as a source."
-
-#~ msgid "You must specify a valid script name."
-#~ msgstr "You must specify a valid script name."
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "This message contains only Bcc recipients."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "You must specify recipients in order to send this message."
-
-#~ msgid "Cannot move folder `%s': illegal operation"
-#~ msgstr "Cannot move folder `%s': illegal operation"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "Could not delete folder: %s"
-#~ msgstr "Could not delete folder: %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-
-#~ msgid "Error: '%s' exists and is not a regular file"
-#~ msgstr "Error: '%s' exists and is not a regular file"
-
-#~ msgid ""
-#~ "This operation will permanently remove all deleted messages in the folder "
-#~ "`%s'. If you continue, you will not be able to recover these messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "This operation will permanently remove all deleted messages in the folder "
-#~ "`%s'. If you continue, you will not be able to recover these messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-
-#~ msgid ""
-#~ "This operation will permanently remove all deleted messages in all "
-#~ "folders. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "This operation will permanently remove all deleted messages in all "
-#~ "folders. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-
-#~ msgid "The following filter rule(s):\n"
-#~ msgstr "The following filter rule(s):\n"
-
-#~ msgid ""
-#~ "Used the removed folder:\n"
-#~ "    '%s'\n"
-#~ "And have been updated."
-#~ msgstr ""
-#~ "Used the removed folder:\n"
-#~ "    '%s'\n"
-#~ "And have been updated."
-
-#~ msgid "Save signature"
-#~ msgstr "Save signature"
-
-#~ msgid "Trying to edit a vfolder '%s' which doesn't exist."
-#~ msgstr "Trying to edit a vfolder '%s' which doesn't exist."
-
-#~ msgid "Address Book Creation Assistant"
-#~ msgstr "Address Book Creation Assistant"
-
-#~ msgid ""
-#~ "Congratulations, you are\n"
-#~ "\t      finished setting up this address book.\n"
-#~ "\n"
-#~ "Please click the \"Apply\" button to save the settings you have entered "
-#~ "here."
-#~ msgstr ""
-#~ "Congratulations, you are\n"
-#~ "\t      finished setting up this address book.\n"
-#~ "\n"
-#~ "Please click the \"Apply\" button to save the settings you have entered "
-#~ "here."
-
-#~ msgid "Finished"
-#~ msgstr "Finished"
-
-#~ msgid ""
-#~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
-#~ "(Secure Sockets Layer)\n"
-#~ "and TLS (Transport Layer Security) protocols are used by some servers to "
-#~ "cryptographically protect\n"
-#~ "your connection. Ask your system administrator if your LDAP server uses "
-#~ "these protocols."
-#~ msgstr ""
-#~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
-#~ "(Secure Sockets Layer)\n"
-#~ "and TLS (Transport Layer Security) protocols are used by some servers to "
-#~ "cryptographically protect\n"
-#~ "your connection. Ask your system administrator if your LDAP server uses "
-#~ "these protocols."
-
-#~ msgid ""
-#~ "Selecting this option will let you change Evolution's default settings "
-#~ "for LDAP\n"
-#~ "searches, and for creating and editing contacts. "
-#~ msgstr ""
-#~ "Selecting this option will let you change Evolution's default settings "
-#~ "for LDAP\n"
-#~ "searches, and for creating and editing contacts. "
-
-#~ msgid ""
-#~ "Specifying a\n"
-#~ "\t\t\t  display name and group is the first step in setting\n"
-#~ "\t\t\t  up an address book."
-#~ msgstr ""
-#~ "Specifying a\n"
-#~ "\t\t\t  display name and group is the first step in setting\n"
-#~ "\t\t\t  up an address book."
-
-#~ msgid "Step 1: Folder Characteristics"
-#~ msgstr "Step 1: Folder Characteristics"
-
-#~ msgid "Step 3: Connecting to Server"
-#~ msgstr "Step 3: Connecting to Server"
-
-#~ msgid "Step 4: Searching the Directory"
-#~ msgstr "Step 4: Searching the Directory"
-
-#~ msgid ""
-#~ "The options on this page control how many entries should be included in "
-#~ "your\n"
-#~ "searches, and how long a search should take. Ask your system "
-#~ "administrator if you\n"
-#~ "need to change these options."
-#~ msgstr ""
-#~ "The options on this page control how many entries should be included in "
-#~ "your\n"
-#~ "searches, and how long a search should take. Ask your system "
-#~ "administrator if you\n"
-#~ "need to change these options."
-
-#~ msgid ""
-#~ "This assistant will help you\n"
-#~ "\t      create a new address book. \n"
-#~ "\n"
-#~ "Depending on the type of address book you create, additional\n"
-#~ "parameters may be required. Please contact your system\n"
-#~ "administrator if you need help finding this information."
-#~ msgstr ""
-#~ "This assistant will help you\n"
-#~ "\t      create a new address book. \n"
-#~ "\n"
-#~ "Depending on the type of address book you create, additional\n"
-#~ "parameters may be required. Please contact your system\n"
-#~ "administrator if you need help finding this information."
-
-#~ msgid ""
-#~ "This is the name that will appear in your Evolution folder list. It is "
-#~ "for display purposes only. "
-#~ msgstr ""
-#~ "This is the name that will appear in your Evolution folder list. It is "
-#~ "for display purposes only. "
-
-#~ msgid ""
-#~ "You have decided to configure an LDAP server. The first step in doing "
-#~ "this is to provide its name and your\n"
-#~ "log in information. Please ask your system administrator if you are "
-#~ "unsure of this information."
-#~ msgstr ""
-#~ "You have decided to configure an LDAP server. The first step in doing "
-#~ "this is to provide its name and your\n"
-#~ "log in information. Please ask your system administrator if you are "
-#~ "unsure of this information."
-
-#~ msgid "Chillonia"
-#~ msgstr "Chillonia"
-
-#~ msgid "Business _fax:"
-#~ msgstr "Business _fax:"
-
-#~ msgid "_Business:"
-#~ msgstr "_Business:"
-
-#~ msgid "_Home:"
-#~ msgstr "_Home:"
-
-#~ msgid "_Mobile:"
-#~ msgstr "_Mobile:"
-
-#~ msgid "Save Contact as VCard"
-#~ msgstr "Save Contact as VCard"
-
-#~ msgid " B_usiness:"
-#~ msgstr " B_usiness:"
-
-#~ msgid "A_ddress..."
-#~ msgstr "A_ddress..."
-
-#~ msgid "A_ssistant's name:"
-#~ msgstr "A_ssistant's name:"
-
-#~ msgid "Addressbook:"
-#~ msgstr "Addressbook:"
-
-#~ msgid "Blog address:"
-#~ msgstr "Blog address:"
-
-#~ msgid "Collaboration"
-#~ msgstr "Collaboration"
-
-#~ msgid "Enter the person's instant messenger accounts here."
-#~ msgstr "Enter the person's instant messenger accounts here."
-
-#~ msgid "File a_s:"
-#~ msgstr "File a_s:"
-
-#~ msgid ""
-#~ "If this person has the ability to participate in a video conference, "
-#~ "enter their address here."
-#~ msgstr ""
-#~ "If this person has the ability to participate in a video conference, "
-#~ "enter their address here."
-
-#~ msgid ""
-#~ "If this person publishes free/busy or other calendar information on the "
-#~ "Internet, enter the address\n"
-#~ "of that information here."
-#~ msgstr ""
-#~ "If this person publishes free/busy or other calendar information on the "
-#~ "Internet, enter the address\n"
-#~ "of that information here."
-
-#~ msgid "New phone type"
-#~ msgstr "New phone type"
-
-#~ msgid "Organi_zation:"
-#~ msgstr "Organi_sation:"
-
-#~ msgid "Primary _email:"
-#~ msgstr "Primary _email:"
-
-#~ msgid "_Categories..."
-#~ msgstr "_Categories..."
-
-#~ msgid "_Manager's name:"
-#~ msgstr "_Manager's name:"
-
-#~ msgid "_Public Calendar URL:"
-#~ msgstr "_Public Calendar URL:"
-
-#~ msgid "_This is the mailing address"
-#~ msgstr "_This is the mailing address"
-
-#~ msgid "_Video Conferencing URL:"
-#~ msgstr "_Video Conferencing URL:"
-
-#~ msgid "_Web page address:"
-#~ msgstr "_Web page address:"
-
-#~ msgid "Account Name"
-#~ msgstr "Account Name"
-
-#~ msgid "Business"
-#~ msgstr "Business"
-
-#~ msgid "Calendar Creation Assistant"
-#~ msgstr "Calendar Creation Assistant"
-
-#~ msgid ""
-#~ "Congratulations, you are finished setting up this calendar.\n"
-#~ "\n"
-#~ "Please click the \"Apply\" button to save the settings you have entered "
-#~ "here."
-#~ msgstr ""
-#~ "Congratulations, you are finished setting up this calendar.\n"
-#~ "\n"
-#~ "Please click the \"Apply\" button to save the settings you have entered "
-#~ "here."
-
-#~ msgid ""
-#~ "Congratulations, you are finished setting up this task list.\n"
-#~ "\n"
-#~ "Please click the \"Apply\" button to save the settings you have entered "
-#~ "here."
-#~ msgstr ""
-#~ "Congratulations, you are finished setting up this task list.\n"
-#~ "\n"
-#~ "Please click the \"Apply\" button to save the settings you have entered "
-#~ "here."
-
-#~ msgid ""
-#~ "Specifying a display name and group is the first step in setting up a "
-#~ "calendar."
-#~ msgstr ""
-#~ "Specifying a display name and group is the first step in setting up a "
-#~ "calendar."
-
-#~ msgid ""
-#~ "Specifying a display name and group is the first step in setting up a "
-#~ "task list."
-#~ msgstr ""
-#~ "Specifying a display name and group is the first step in setting up a "
-#~ "task list."
-
-#~ msgid "Step 2: Remote Folder Parameters"
-#~ msgstr "Step 2: Remote Folder Parameters"
-
-#~ msgid "Task List Creation Assistant"
-#~ msgstr "Task List Creation Assistant"
-
-#~ msgid ""
-#~ "This assistant will help you create a new calendar. \n"
-#~ "\n"
-#~ "Depending on the type of calendar you create, additional\n"
-#~ "parameters may be required. Please contact your system\n"
-#~ "administrator if you need help finding this information."
-#~ msgstr ""
-#~ "This assistant will help you create a new calendar. \n"
-#~ "\n"
-#~ "Depending on the type of calendar you create, additional\n"
-#~ "parameters may be required. Please contact your system\n"
-#~ "administrator if you need help finding this information."
-
-#~ msgid ""
-#~ "This assistant will help you create a new task list.\n"
-#~ "\n"
-#~ "Depending on the type of task list you create, additional\n"
-#~ "parameters may be required. Please contact your system\n"
-#~ "administrator if you need help finding this information."
-#~ msgstr ""
-#~ "This assistant will help you create a new task list.\n"
-#~ "\n"
-#~ "Depending on the type of task list you create, additional\n"
-#~ "parameters may be required. Please contact your system\n"
-#~ "administrator if you need help finding this information."
-
-#~ msgid ""
-#~ "You're creating a folder in a group that's stored in a remote location. "
-#~ "This requires you\n"
-#~ "to specify additional parameters."
-#~ msgstr ""
-#~ "You're creating a folder in a group that's stored in a remote location. "
-#~ "This requires you\n"
-#~ "to specify additional parameters."
-
-#~ msgid "Internal error: expecting CamelMultipart, got \"%s\""
-#~ msgstr "Internal error: expecting CamelMultipart, got \"%s\""
-
-#~ msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
-#~ msgstr "Internal error: expecting CamelMimeMessage, got \"%s\""
-
-#~ msgid "New Addressbook Book"
-#~ msgstr "New Addressbook Book"
-
-#~ msgid "_Address Book"
-#~ msgstr "_Address Book"
-
-#~ msgid "The view showing when the calendar starts"
-#~ msgstr "The view showing when the calendar starts"
-
-#~ msgid "_Task List"
-#~ msgstr "_Task List"
-
-#~ msgid "_minute(s)"
-#~ msgstr "_minute(s)"
-
-#~ msgid "Extra Completion folders"
-#~ msgstr "Extra Completion folders"
-
-#~ msgid "Select Default Folder"
-#~ msgstr "Select Default Folder"
-
-#~ msgid "Default Folders"
-#~ msgstr "Default Folders"
-
-#~ msgid "Offline Folders"
-#~ msgstr "Offline Folders"
-
-#~ msgid "Autocompletion Folders"
-#~ msgstr "Autocompletion Folders"
-
-#~ msgid ""
-#~ "Cannot create the specified folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Cannot create the specified folder:\n"
-#~ "%s"
-
-#~ msgid "The specified folder name is not valid: %s"
-#~ msgstr "The specified folder name is not valid: %s"
-
-#~ msgid "Please select a user."
-#~ msgstr "Please select a user."
-
-#~ msgid "Opening Folder"
-#~ msgstr "Opening Folder"
-
-#~ msgid "Opening Folder \"%s\""
-#~ msgstr "Opening Folder \"%s\""
-
-#~ msgid "in \"%s\" ..."
-#~ msgstr "in \"%s\" ..."
-
-#~ msgid "Could not open shared folder: %s."
-#~ msgstr "Could not open shared folder: %s."
-
-#~ msgid "Cannot find the specified shared folder."
-#~ msgstr "Cannot find the specified shared folder."
-
-#~ msgid "Create a new window"
-#~ msgstr "Create a new window"
-
-#~ msgid "Open a new window"
-#~ msgstr "Open a new window"
-
-#~ msgid "2:30"
-#~ msgstr "2:30"
-
-#~ msgid "Selected:"
-#~ msgstr "Selected:"
-
-#~ msgid "[script]"
-#~ msgstr "[script]"
-
-#~ msgid "With _Category"
-#~ msgstr "With _Category"
-
-#~ msgid "Address Book Sources"
-#~ msgstr "Address Book Sources"
-
-#~ msgid "<b>Filter Rules</b>"
-#~ msgstr "<b>Filter Rules</b>"
-
-#~ msgid "Edit Filters"
-#~ msgstr "Edit Filters"
-
-#~ msgid "Edit VFolders"
-#~ msgstr "Edit VFolders"
-
-#~ msgid "Outgoing"
-#~ msgstr "Outgoing"
-
-#~ msgid "_Search for Contacts"
-#~ msgstr "_Search for Contacts"
-
-#, fuzzy
-#~ msgid "1 contact"
-#~ msgstr "Organisation:"
-
-#, fuzzy
-#~ msgid "and %d other contacts."
-#~ msgstr "Organisation:"
-
-#, fuzzy
-#~ msgid "Description"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "LDAP Server Name:"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Shell Command"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Message Fonts"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Restore Defaults"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Encryption"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Quit Assistant"
-#~ msgstr "Cannot initialise the Evolution shell."
-
-#, fuzzy
-#~ msgid ""
-#~ "Could not create directory `%s':\n"
-#~ "%s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Scanning mail filters"
-#~ msgstr "Synchronise \"%s\""
-
-#, fuzzy
-#~ msgid "Scanning directory"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Copy Folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot rename folder:\n"
-#~ "%s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot remove folder:\n"
-#~ "%s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Create New Shortcut Group"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Rename Shortcut"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Copy to folder..."
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Work Address"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Could not open '%s': %s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Could not create temporary mbox store: %s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Could not create temporary mbox folder: %s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Could not copy messages to temporary mbox folder: %s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Session not initialised"
-#~ msgstr "Could not initialise Bonobo"
-
-#, fuzzy
-#~ msgid "Could not create a directory for the new addressbook."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Birthdays"
-#~ msgstr "Organisation:"
-
-#, fuzzy
-#~ msgid "Could not create directory for new calendar"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Failed to migrate `%s': %s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Could not create cache for new calendar"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Could not create directory for new task list"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "You don't have permission to open the folder in `%s'"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Adding %s"
-#~ msgstr "Synchronise \"%s\""
-
-#, fuzzy
-#~ msgid "Select Calendar Folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Adding alarms for %s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Folder Settings"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "New _Calendar"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Other Contacts"
-#~ msgstr "Organisation:"
-
-#, fuzzy
-#~ msgid "Evolution Addressbook LDAP Configuration Control"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Add a Folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Sent"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Syncing Folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Cannot create a folder with that name"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Has subfolders"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Organizational Unit"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Logo"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "ICS Calendar"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Evolution LDIF importer factory"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Using Email Address"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Reconnecting to LDAP server..."
-#~ msgstr "Synchronise \"%s\""
-
-#, fuzzy
-#~ msgid "Adding contact to LDAP server..."
-#~ msgstr "Synchronise \"%s\""
-
-#, fuzzy
-#~ msgid "Removing contact from LDAP server..."
-#~ msgstr "Synchronise \"%s\""
-
-#, fuzzy
-#~ msgid "Modifying contact from LDAP server..."
-#~ msgstr "Synchronise \"%s\""
-
-#, fuzzy
-#~ msgid "No such calendar"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Evolution Addressbook local backend"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Comp"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "ECard"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Related Contacts"
-#~ msgstr "Organisation:"
-
-#, fuzzy
-#~ msgid "Public Calendar"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Could not update invalid object"
-#~ msgstr "Could not initialise Bonobo"
-
-#, fuzzy
-#~ msgid "You do not have the right permissions to update the calendar\n"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Could not create a PGP signature context"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Local folders/%s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Reconfiguring folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Reconfigure /%s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Scanning folders ..."
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Configure the appearance of the Evolution Summary here"
-#~ msgstr "Cannot initialise Evolution's mail summary component."
-
-#, fuzzy
-#~ msgid "Evolution Summary component"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Evolution Summary configuration control"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Agen"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Antigua"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Arizona"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Arlington"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Artigas"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Athinai"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Benina"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Boise"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Cagliari"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Cairo"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Calgary"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Campo"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Carlisle"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Chandler"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Cheju"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Chiclayo"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Chievres"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Childress"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Chino"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Chita"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Clarinda"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Clarion"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Colima"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Colorado"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Colville"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Comox"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Conroe"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Coro"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Homer"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Matamoros"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "McComb"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Morgantown"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Nanning"
-#~ msgstr "Synchronise \"%s\""
-
-#, fuzzy
-#~ msgid "Ontario"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Pristina"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Rifle"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Roros"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Scranton"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Springfield"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Tabatinga"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Tallinn"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Tatalina"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Toulouse"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Trenton"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Tyler"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Vaerlose"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Wooster"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Weather Settings"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "_New Feed"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "_Show full path for folders"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Copy this folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "_Folder..."
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Configure the fonts used by Evolution here"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Evolution Mail font configuration control"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "_Clear Flag"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "Factory to import LDIF files into Evolution."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Configuration control for the Evolution Addressbook Storages."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory for the Addressbook Minicard control"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid ""
-#~ "Factory for the configuration controls for the Evolution Addressbook."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Evolution Attribute"
-#~ msgstr "Cannot initialise the Evolution shell."
-
-#, fuzzy
-#~ msgid "_Evolution attribute:"
-#~ msgstr "Cannot initialise the Evolution shell."
-
-#, fuzzy
-#~ msgid "Display Cards?"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Display Cards"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Configuration control for the Evolution Calendar."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory for the Evolution Tasks control"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory for the calendar iTip view control"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory for the sample Calendar control"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory to centralize calendar component editor dialogs"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory to create a component editor factory"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Could not activate Bonobo"
-#~ msgstr "Could not initialise Bonobo"
-
-#, fuzzy
-#~ msgid "Factory to import iCalendar files into Evolution"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Imports iCalendar files into Evolution"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Imports vCalendar files into Evolution"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Cannot initialize the Evolution composer."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Configuration control for the Evolution Display Fonts."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Configuration control for the Evolution Mail Accounts."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Configuration control for the Evolution Mailer."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Configuration control for the Evolution Message Composer."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Evolution mail folder factory component."
-#~ msgstr "Cannot initialise Evolution's mail summary component."
-
-#, fuzzy
-#~ msgid "Factory for the Evolution composer."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory for the Mail Summary component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Cannot initialize the Evolution mail component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's mail config component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's folder info component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory to import mbox into Evolution"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "All folders"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Apri file"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Configuration control for the Evolution Summary."
-#~ msgstr "Cannot initialise Evolution's mail summary component."
-
-#, fuzzy
-#~ msgid "Factory for the Evolution Summary component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Executive summary component could not initialize Bonobo.\n"
-#~ msgstr "Could not initialise Bonobo"
-
-#, fuzzy
-#~ msgid "Configuration control for Evolution folder settings."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid ""
-#~ "Could not start the Evolution Mailer Assistant interface\n"
-#~ "(%s)"
-#~ msgstr "Cannot initialise Evolution's mail storage hash."
-
-#, fuzzy
-#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
-#~ msgstr "Cannot initialise Evolution's mail storage hash."
-
-#~ msgid "Cannot initialize the Bonobo component system."
-#~ msgstr "Cannot initialise the Bonobo component system."
-
-#, fuzzy
-#~ msgid "Pilot Con_duit Settings..."
-#~ msgstr "Cannot initialise the Evolution shell."
-
-#, fuzzy
-#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
-#~ msgstr "Could not initialise Bonobo"
-
-#, fuzzy
-#~ msgid "init_corba(): could not initialize GNOME"
-#~ msgstr "Could not initialise Bonobo"
-
-#, fuzzy
-#~ msgid "init_bonobo(): could not initialize Bonobo"
-#~ msgstr "Could not initialise Bonobo"
-
-#, fuzzy
-#~ msgid "en"
-#~ msgstr "Organisation"
-
-#, fuzzy
-#~ msgid "Configuration control for the Evolution Addressbook."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Factory for the Calendar Summary component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "_Other Organizer"
-#~ msgstr "Organisation:"
-
-#, fuzzy
-#~ msgid "_Organization:"
-#~ msgstr "Organisation:"
-
-#, fuzzy
-#~ msgid "Evolution does not recognize this type of signed message."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's Summary component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#~ msgid "All _folders:"
-#~ msgstr "Synchronising \"%s\""
-
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#~ msgid "Colors for Tasks"
-#~ msgstr "Colours for display"
-
-#~ msgid "Organizer: "
-#~ msgstr "Organisation:"
-
-#~ msgid "Factory for the test bonobo component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#~ msgid "Factory for the test component."
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#~ msgid "Synchronize"
-#~ msgstr "Synchronise"
-
-#~ msgid "Synchronize Action"
-#~ msgstr "Synchronise Action"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mr.\n"
-#~ "Mrs.\n"
-#~ "Ms.\n"
-#~ "Miss\n"
-#~ "Dr.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Mr\n"
-#~ "Ms\n"
-#~ "Miss\n"
-#~ "Mrs\n"
-#~ "Dr\n"
-#~ "Prof\n"
-#~ "Rev\n"
-
-#~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may "
-#~ "also, optionally, enter the name of your organization, and the name of a "
-#~ "file to read your signature from."
-#~ msgstr ""
-#~ "Enter your name and email address to be used in outgoing mail. You may "
-#~ "also, optionally, enter the name of your organisation, and the name of a "
-#~ "file to read your signature from."
-
-#~ msgid "Querying authorization capabilities of \"%s\""
-#~ msgstr "Querying authorisation capabilities of \"%s\""
-
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Query authorisation at \"%s\""