Updated British English translation

svn path=/trunk/; revision=25272
author: Gareth Owen <gowen@src.gnome.org> 2004-04-01 07:55:17 +0800
committer: Gareth Owen <gowen@src.gnome.org> 2004-04-01 07:55:17 +0800
commit: 052b3979aea1184559f66cf914aa2da27a3345d3 (patch)
tree: 677993523954661029f916e044aa2b1fc81ed796 /po
parent: 16a061d1bf45a585189e91b82e95eabe2e0d33d6 (diff)
download: gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar
gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.gz
gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.bz2
gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.lz
gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.xz
gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.zst
gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.zip
2 files changed, 6518 insertions, 6015 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index e1f7ae51aa..f860137d7c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-31  Gareth Owen  <gowen72@yahoo.com>
+
+	* en_GB.po: Updaed British English translation
+
 2004-03-31  Miloslav Trmac  <mitr@volny.cz>
 
 	* cs.po: Updated Czech translation.
diff --git a/po/en_GB.po b/po/en_GB.po
index a90f03147f..02c614fc3a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,41 +5,75 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
-"PO-Revision-Date: 2000-10-22 16:19+0100\n"
-"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-31 18:53-0500\n"
+"PO-Revision-Date: 2004-03-31 18:55-0500\n"
+"Last-Translator: Gareth Owen <gowen72@yahoo.com>\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
+#: a11y/addressbook/ea-minicard-view.c:119
+msgid "evolution addressbook"
+msgstr "evolution addressbook"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+msgid "current addressbook folder "
+msgstr "current addressbook folder "
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "have "
+msgstr "have "
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr "has "
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " cards"
+msgstr " cards"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " card"
+msgstr " card"
+
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "contact's header: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minicard"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
-msgstr ""
+msgstr "Default Sync Address:"
 
 #: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
-#, fuzzy
 msgid "Could not load addressbook"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Could not load addressbook"
 
 #: addressbook/conduit/address-conduit.c:1214
 #: addressbook/conduit/address-conduit.c:1217
 msgid "Could not read pilot's Address application block"
-msgstr ""
+msgstr "Could not read pilot's Address application block"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
 msgid "Autocompletion"
-msgstr "Synchronising \"%s\""
+msgstr "Autocompletion"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
-msgstr ""
+msgstr "Certificates"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Configure autocomple here"
-msgstr ""
+msgstr "Configure autocomple here"
 
 #. Fix me *
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
@@ -49,137 +83,138 @@ msgstr ""
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:363
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
 msgid "Evolution Addressbook"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Addressbook"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Addressbook address pop-up"
-msgstr ""
+msgstr "Evolution Addressbook address pop-up"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address viewer"
-msgstr ""
+msgstr "Evolution Addressbook address viewer"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook card viewer"
-msgstr ""
+msgstr "Evolution Addressbook card viewer"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
 msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Addressbook component"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook folder viewer"
-msgstr ""
+msgstr "Evolution Addressbook folder viewer"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
 msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Cannot initialise Evolution's mail summary component."
+msgstr "Evolution S/Mime Certificate Management Control"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
 msgid "Evolution folder settings configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution folder settings configuration control"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manager your S/Mime certificates here"
-msgstr ""
+msgstr "Manager your S/Mime certificates here"
 
 #: addressbook/gui/component/addressbook-component.c:225
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
+msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
 
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "New Address Book"
-msgstr "Cannot initialise the Evolution shell."
-
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+msgstr "New Address Book"
+
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: 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-tasks.xml.h:6
 msgid "Delete"
-msgstr ""
+msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
 msgid "Properties..."
-msgstr "Synchronising \"%s\""
+msgstr "Properties..."
 
-#: addressbook/gui/component/addressbook-component.c:554
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:551
 msgid "New Contact"
-msgstr "Organisation:"
+msgstr "New Contact"
 
-#: addressbook/gui/component/addressbook-component.c:555
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:552
 msgid "_Contact"
-msgstr "Organisation:"
+msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:556
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:553
 msgid "Create a new contact"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new contact"
 
-#: addressbook/gui/component/addressbook-component.c:561
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:558
 msgid "New Contact List"
-msgstr "Organisation:"
+msgstr "New Contact List"
 
-#: addressbook/gui/component/addressbook-component.c:562
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:559
 msgid "Contact _List"
-msgstr "Organisation:"
+msgstr "Contact _List"
 
-#: addressbook/gui/component/addressbook-component.c:563
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "Create a new contact list"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new contact list"
+
+#: addressbook/gui/component/addressbook-component.c:565
+msgid "New Addressbook Book"
+msgstr "New Addressbook Book"
+
+#: addressbook/gui/component/addressbook-component.c:566
+msgid "_Address Book"
+msgstr "_Address Book"
+
+#: addressbook/gui/component/addressbook-component.c:567
+msgid "Create a new address book"
+msgstr "Create a new address book"
 
 #: addressbook/gui/component/addressbook-config.c:399
 msgid "Failed to connect to LDAP server"
-msgstr ""
+msgstr "Failed to connect to LDAP server"
 
 #: addressbook/gui/component/addressbook-config.c:423
 msgid "Failed to authenticate with LDAP server"
-msgstr ""
+msgstr "Failed to authenticate with LDAP server"
 
 #: addressbook/gui/component/addressbook-config.c:451
 msgid "Could not perform query on Root DSE"
-msgstr ""
+msgstr "Could not perform query on Root DSE"
 
 #: addressbook/gui/component/addressbook-config.c:777
 msgid "The server responded with no supported search bases"
-msgstr ""
+msgstr "The server responded with no supported search bases"
 
 #: addressbook/gui/component/addressbook-config.c:1198
 msgid "This server does not support LDAPv3 schema information"
-msgstr ""
+msgstr "This server does not support LDAPv3 schema information"
 
 #: addressbook/gui/component/addressbook-config.c:1220
 msgid "Error retrieving schema information"
-msgstr ""
+msgstr "Error retrieving schema information"
 
 #: addressbook/gui/component/addressbook-config.c:1228
 msgid "Server did not respond with valid schema information"
-msgstr ""
+msgstr "Server did not respond with valid schema information"
 
 #: addressbook/gui/component/addressbook-migrate.c:57
 #: calendar/gui/migration.c:128 mail/em-migrate.c:1071
 msgid "Migrating..."
-msgstr ""
+msgstr "Migrating..."
 
 #: addressbook/gui/component/addressbook-migrate.c:65
 msgid ""
@@ -188,43 +223,45 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 
 #: addressbook/gui/component/addressbook-migrate.c:99
 #: calendar/gui/migration.c:175 mail/em-migrate.c:1112
-#, fuzzy, c-format
+#, c-format
 msgid "Migrating `%s':"
-msgstr "Synchronise \"%s\""
+msgstr "Migrating `%s':"
 
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
 msgid "On This Computer"
-msgstr ""
+msgstr "On This Computer"
 
 #. Create the default Person addressbook
 #: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:106
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #. Create the LDAP source group
 #: addressbook/gui/component/addressbook-migrate.c:425
 msgid "On LDAP Servers"
-msgstr ""
+msgstr "On LDAP Servers"
 
 #: addressbook/gui/component/addressbook-migrate.c:553
-#, fuzzy
 msgid "LDAP Servers"
-msgstr "Synchronising \"%s\""
+msgstr "LDAP Servers"
 
 #: addressbook/gui/component/addressbook-migrate.c:673
-#, fuzzy
 msgid "Autocompletion Settings"
-msgstr "Synchronising \"%s\""
+msgstr "Autocompletion Settings"
 
 #: addressbook/gui/component/addressbook.c:275
 msgid ""
@@ -233,6 +270,10 @@ msgid ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 msgstr ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
 
 #: addressbook/gui/component/addressbook.c:281
 msgid ""
@@ -241,99 +282,107 @@ msgid ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
 
 #: addressbook/gui/component/addressbook.c:287
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
+msgstr "The backend for this addressbook was unable to parse this query."
 
 #: addressbook/gui/component/addressbook.c:290
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
+msgstr "The backend for this addressbook refused to perform this query."
 
 #: addressbook/gui/component/addressbook.c:293
 msgid "This query did not complete successfully."
-msgstr ""
+msgstr "This query did not complete successfully."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
 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/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
 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/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 msgstr ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
 
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
 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/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
 msgid "Unable to open addressbook"
-msgstr ""
+msgstr "Unable to open addressbook"
 
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
 msgid "Accessing LDAP Server anonymously"
-msgstr ""
+msgstr "Accessing LDAP Server anonymously"
 
-#: addressbook/gui/component/addressbook.c:785
-#, fuzzy
+#: addressbook/gui/component/addressbook.c:782
 msgid "Failed to authenticate.\n"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to authenticate.\n"
 
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
 #, c-format
 msgid "%sEnter password for %s (user %s)"
-msgstr ""
+msgstr "%sEnter password for %s (user %s)"
 
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
 msgid "UID of the contacts source that the view will display"
-msgstr ""
+msgstr "UID of the contacts source that the view will display"
 
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
 msgid "The URI that the address book will display"
-msgstr ""
+msgstr "The URI that the address book will display"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
-msgstr ""
+msgstr "EFolderList xml for the list of completion uris"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "Position of the vertical pane in main view"
-msgstr ""
+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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
+msgstr "URI for the folder last used in the select names dialogue"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
-msgstr ""
+msgstr "  S_how Supported Bases "
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -348,115 +397,111 @@ msgstr ""
 #: 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:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
-msgstr ""
+msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
-msgstr ""
+msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
-msgstr ""
+msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "389"
-msgstr ""
+msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "5:00"
-msgstr ""
+msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "636"
-msgstr ""
+msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Creation Assistant"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Address Book Creation Assistant"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "Address Book Properties"
-msgstr "Cannot initialise the Evolution shell."
-
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Address Book Properties"
 
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:11 mail/mail-account-gui.c:65
+#: mail/mail-config.glade.h:40
 msgid "Always"
-msgstr ""
+msgstr "Always"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Anonymously"
-msgstr ""
+msgstr "Anonymously"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 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."
 
-#: addressbook/gui/component/ldap-config.glade.h:20
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Connecting"
-msgstr "Synchronise \"%s\""
+msgstr "Connecting"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished _name:"
-msgstr ""
+msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address:"
-msgstr "Synchronising \"%s\""
+msgstr "Email address:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
+msgstr "Evolution will use this DN to authenticate you with the server"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: 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"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
-msgstr ""
+msgstr "Finished"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:23
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
-msgstr ""
+msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
-msgstr ""
+msgstr "Group:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:99
 msgid "Never"
-msgstr ""
+msgstr "Never"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -465,32 +510,40 @@ msgid ""
 "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."
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "One"
-msgstr ""
+msgstr "One"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "S_earch scope: "
-msgstr ""
+msgstr "S_earch scope: "
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid "Searching"
-msgstr ""
+msgstr "Searching"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "Selected:"
-msgstr "Synchronising \"%s\""
+msgstr "Selected:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -500,8 +553,15 @@ msgid ""
 "is already\n"
 "secure."
 msgstr ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -509,50 +569,59 @@ msgid ""
 "to security\n"
 "exploits. "
 msgstr ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:43
 #: calendar/gui/dialogs/calendar-setup.glade.h:16
 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. "
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:45
 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."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:48
 #: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
-msgstr ""
+msgstr "Step 1: Folder Characteristics"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Step 2: Server Information"
-msgstr ""
+msgstr "Step 2: Server Information"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 3: Connecting to Server"
-msgstr "Synchronise \"%s\""
+msgstr "Step 3: Connecting to Server"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 4: Searching the Directory"
-msgstr "Synchronise \"%s\""
+msgstr "Step 4: Searching the Directory"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
-msgstr ""
+msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Supported Search Bases"
-msgstr ""
+msgstr "Supported Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -560,16 +629,25 @@ msgid ""
 "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."
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
 "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 \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -578,8 +656,14 @@ msgid ""
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base.\n"
 msgstr ""
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid ""
 "This assistant will help you\n"
 "\t      create a new address book. \n"
@@ -588,290 +672,299 @@ msgid ""
 "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."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:69
 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:73
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
+"too large will slow down your address book."
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:72
 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:76
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:75
 #: calendar/gui/dialogs/calendar-setup.glade.h:34
 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. "
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "This option controls how long a search will be run."
-msgstr ""
+msgstr "This option controls how long a search will be run."
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "U_se SSL/TLS:"
-msgstr ""
+msgstr "U_se SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "Using distinguished name (DN)"
-msgstr ""
+msgstr "Using distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "Using email address"
-msgstr ""
+msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:83 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
-msgstr ""
+msgstr "Whenever Possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:84
 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."
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:86
 #: calendar/gui/dialogs/calendar-setup.glade.h:37
-#, fuzzy
 msgid "_Display name:"
-msgstr "Synchronising \"%s\""
+msgstr "_Display name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "_Download limit:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 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-tasks.xml.h:20
-msgid "_Edit"
-msgstr ""
+msgstr "_Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
-msgstr ""
+msgstr "_Log in method:"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
-msgstr ""
+msgstr "_Port number:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
-msgstr ""
+msgstr "_Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
-msgstr ""
+msgstr "_Server name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
-msgstr ""
+msgstr "_Timeout (minutes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
-msgstr ""
+msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:98
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
-msgstr "Synchronise \"%s\""
+msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
-msgstr ""
+msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
-msgstr ""
+msgstr "searching-tab"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 msgid "Evolution Addressbook name selection interface"
-msgstr ""
+msgstr "Evolution Addressbook name selection interface"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:207
 msgid "Remove All"
-msgstr ""
+msgstr "Remove All"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:214
 #: addressbook/gui/component/select-names/e-select-names.c:693
 #: calendar/gui/dialogs/cal-prefs-dialog.c:659
 msgid "Remove"
-msgstr ""
+msgstr "Remove"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:221
-#, fuzzy
 msgid "View Contact List"
-msgstr "Organisation:"
+msgstr "View Contact List"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:221
 msgid "View Contact Info"
-msgstr ""
+msgstr "View Contact Info"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:228
 #: addressbook/gui/component/select-names/e-select-names-popup.c:338
 msgid "Send HTML Mail?"
-msgstr ""
+msgstr "Send HTML Mail?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
 msgid "Add to Contacts"
-msgstr ""
+msgstr "Add to Contacts"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:356
 msgid "Unnamed Contact"
-msgstr ""
+msgstr "Unnamed Contact"
 
 #: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
-msgstr ""
+msgstr "Source"
 
 #: addressbook/gui/component/select-names/e-select-names.c:494
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
-msgstr ""
+msgstr "Select Contacts from Address Book"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
 msgid "<b>Contacts</b>"
-msgstr "Organisation"
+msgstr "<b>Contacts</b>"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "<b>Show Contacts</b>"
-msgstr ""
+msgstr "<b>Show Contacts</b>"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
 msgid "Address _Book:"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Address _Book:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-#, fuzzy
 msgid "C_ategory:"
-msgstr "Colours"
+msgstr "C_ategory:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Find"
-msgstr ""
+msgstr "_Find"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid " B_usiness:"
-msgstr ""
+msgstr " B_usiness:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-#, fuzzy
 msgid "A_ddress..."
-msgstr "Colours"
+msgstr "A_ddress..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "A_ssistant's name:"
-msgstr ""
+msgstr "A_ssistant's name:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#, fuzzy
 msgid "Addressbook:"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Addressbook:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "Anni_versary:"
-msgstr ""
+msgstr "Anni_versary:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "Birthda_y:"
-msgstr ""
+msgstr "Birthda_y:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#, fuzzy
 msgid "Blog address:"
-msgstr "Synchronising \"%s\""
+msgstr "Blog address:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Business fa_x:"
-msgstr ""
+msgstr "Business fa_x:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "Collaboration"
-msgstr ""
+msgstr "Collaboration"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
 msgid "Contact Editor"
-msgstr ""
+msgstr "Contact Editor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "D_epartment:"
-msgstr ""
+msgstr "D_epartment:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Enter the person's instant messenger accounts here."
-msgstr ""
+msgstr "Enter the person's instant messenger accounts here."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "F_ree/Busy URL:"
-msgstr ""
+msgstr "F_ree/Busy URL:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "File a_s:"
-msgstr ""
+msgstr "File a_s:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Full _Name..."
-msgstr ""
+msgstr "Full _Name..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 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."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid ""
@@ -879,1851 +972,1849 @@ msgid ""
 "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."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Instant Messaging"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "New phone type"
-msgstr ""
+msgstr "New phone type"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "No_tes:"
-msgstr ""
+msgstr "No_tes:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
 msgid "Organi_zation:"
-msgstr "Organisation:"
+msgstr "Organi_sation:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "P_rofession:"
-msgstr ""
+msgstr "P_rofession:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Primary _email:"
-msgstr ""
+msgstr "Primary _email:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "S_pouse:"
-msgstr ""
+msgstr "S_pouse:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Wants to receive _HTML mail"
-msgstr ""
+msgstr "Wants to receive _HTML mail"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Add"
-msgstr ""
+msgstr "_Add"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Business:"
-msgstr ""
+msgstr "_Business:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Categories..."
-msgstr ""
+msgstr "_Categories..."
 
 #. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: 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 ""
+msgstr "_Delete"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 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-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Edit"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#, fuzzy
 msgid "_Home:"
-msgstr "Colours"
+msgstr "_Home:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Job title:"
-msgstr ""
+msgstr "_Job title:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager's name:"
-msgstr ""
+msgstr "_Manager's name:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Mobile:"
-msgstr ""
+msgstr "_Mobile:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Nickname:"
-msgstr ""
+msgstr "_Nickname:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Office:"
-msgstr ""
+msgstr "_Office:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Public Calendar URL:"
-msgstr ""
+msgstr "_Public Calendar URL:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_This is the mailing address"
-msgstr ""
+msgstr "_This is the mailing address"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
 msgid "_Video Conferencing URL:"
-msgstr ""
+msgstr "_Video Conferencing URL:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Web page address:"
-msgstr ""
+msgstr "_Web page address:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "Address"
-msgstr "Colours"
+msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
-msgstr "Synchronising \"%s\""
+msgstr "Editable"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
-msgstr ""
+msgstr "United States"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
-msgstr ""
+msgstr "Afghanistan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
-msgstr ""
+msgstr "Albania"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
-msgstr ""
+msgstr "Algeria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
-msgstr ""
+msgstr "American Samoa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
-msgstr ""
+msgstr "Antarctica"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "Antigua And Barbuda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:146
-#, fuzzy
 msgid "Argentina"
-msgstr "Organisation"
+msgstr "Argentina"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
-msgstr ""
+msgstr "Australia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
-msgstr ""
+msgstr "Austria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
-msgstr ""
+msgstr "Azerbaijan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladesh"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
-msgstr ""
+msgstr "Belarus"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
-msgstr ""
+msgstr "Belgium"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
-msgstr ""
+msgstr "Benin"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermuda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhutan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
-msgstr ""
+msgstr "Bosnia And Herzegowina"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Bouvet Island"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
-msgstr ""
+msgstr "Brazil"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "British Indian Ocean Territory"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Brunei Darussalam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
-msgstr ""
+msgstr "Cambodia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
-msgstr ""
+msgstr "Cameroon"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
-msgstr ""
+msgstr "Canada"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cape Verde"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Cayman Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
-msgstr ""
+msgstr "Central African Republic"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
-msgstr ""
+msgstr "Chad"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#, fuzzy
 msgid "Chile"
-msgstr "Colours"
+msgstr "Chile"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
-msgstr ""
+msgstr "China"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
-msgstr ""
+msgstr "Christmas Island"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Cocos (Keeling) Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
-msgstr ""
+msgstr "Colombia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:184
-#, fuzzy
 msgid "Comoros"
-msgstr "Colours"
+msgstr "Comoros"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
-msgstr ""
+msgstr "Congo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo, The Democratic Republic Of The"
-msgstr ""
+msgstr "Congo, The Democratic Republic Of The"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
-msgstr ""
+msgstr "Cook Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
-msgstr ""
+msgstr "Cote d'Ivoire"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
-msgstr ""
+msgstr "Croatia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
-msgstr ""
+msgstr "Cyprus"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
-msgstr ""
+msgstr "Czech Republic"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
-msgstr ""
+msgstr "Denmark"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
-msgstr ""
+msgstr "Djibouti"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Dominican Republic"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
-msgstr ""
+msgstr "Ecuador"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
-msgstr ""
+msgstr "Egypt"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Equatorial Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
-msgstr ""
+msgstr "Ethiopia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
-msgstr ""
+msgstr "Falkland Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Faroe Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
-msgstr ""
+msgstr "Fiji"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
-msgstr ""
+msgstr "Finland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
-msgstr ""
+msgstr "France"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
-msgstr ""
+msgstr "French Guiana"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
-msgstr ""
+msgstr "French Polynesia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
-msgstr ""
+msgstr "French Southern Territories"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
-msgstr ""
+msgstr "Germany"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
-msgstr ""
+msgstr "Gibraltar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
-msgstr ""
+msgstr "Greece"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
-msgstr ""
+msgstr "Greenland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
-msgstr ""
+msgstr "Grenada"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
-msgstr ""
+msgstr "Guadeloupe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
-msgstr ""
+msgstr "Guam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guernsey"
-msgstr ""
+msgstr "Guernsey"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
-msgstr ""
+msgstr "Guinea-bissau"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
-msgstr ""
+msgstr "Heard And McDonald Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
-msgstr ""
+msgstr "Holy See"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
-msgstr ""
+msgstr "Hungary"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
-msgstr ""
+msgstr "Iceland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
-msgstr ""
+msgstr "India"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:238
-#, fuzzy
 msgid "Iran"
-msgstr "Organisation:"
+msgstr "Iran"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iraq"
-msgstr ""
+msgstr "Iraq"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
-msgstr ""
+msgstr "Ireland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Isle of Man"
-msgstr ""
+msgstr "Isle of Man"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
-msgstr ""
+msgstr "Italy"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
-msgstr ""
+msgstr "Jamaica"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
-msgstr ""
+msgstr "Japan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Jersey"
-msgstr ""
+msgstr "Jersey"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
-msgstr ""
+msgstr "Jordan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazakhstan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Korea, Democratic People's Republic Of"
-msgstr ""
+msgstr "Korea, Democratic People's Republic Of"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
-msgstr ""
+msgstr "Korea, Republic Of"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "Kyrgyzstan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
-msgstr ""
+msgstr "Latvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
-msgstr ""
+msgstr "Lebanon"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
-msgstr ""
+msgstr "Liberia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Libya"
-msgstr ""
+msgstr "Libya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
-msgstr ""
+msgstr "Lithuania"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
-msgstr ""
+msgstr "Luxembourg"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Macao"
-msgstr ""
+msgstr "Macao"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
-msgstr ""
+msgstr "Macedonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
-msgstr ""
+msgstr "Maldives"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Marshall Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
-msgstr ""
+msgstr "Mauritania"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
-msgstr ""
+msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
-msgstr ""
+msgstr "Mexico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
-msgstr ""
+msgstr "Micronesia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "Moldova, Republic Of"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
-msgstr ""
+msgstr "Morocco"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambique"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
-msgstr ""
+msgstr "Myanmar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
-msgstr ""
+msgstr "Netherlands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Netherlands Antilles"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
-msgstr ""
+msgstr "New Caledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
-msgstr ""
+msgstr "New Zealand"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolk Island"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Northern Mariana Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
-msgstr ""
+msgstr "Norway"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
-msgstr ""
+msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
-msgstr ""
+msgstr "Palestinian Territory"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua New Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
-msgstr ""
+msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
-msgstr ""
+msgstr "Peru"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
-msgstr ""
+msgstr "Philippines"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
-msgstr ""
+msgstr "Poland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
-msgstr ""
+msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
-msgstr ""
+msgstr "Romania"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
-msgstr ""
+msgstr "Russian Federation"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "Saint Kitts And Nevis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Saint Lucia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grena-dines"
-msgstr ""
+msgstr "Saint Vincent And The Grena-dines"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
-msgstr ""
+msgstr "Sao Tome And Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Saudi Arabia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "Serbia And Montenegro"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
-msgstr ""
+msgstr "Slovakia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovenia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
-msgstr ""
+msgstr "Solomon Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
-msgstr ""
+msgstr "South Africa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
-msgstr ""
+msgstr "South Georgia And The South Sandwich Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
-msgstr ""
+msgstr "Spain"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
-msgstr ""
+msgstr "St. Helena"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
-msgstr ""
+msgstr "St. Pierre And Miquelon"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
-msgstr ""
+msgstr "Suriname"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
-msgstr ""
+msgstr "Svalbard And Jan Mayen Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
-msgstr ""
+msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
-msgstr ""
+msgstr "Sweden"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
-msgstr ""
+msgstr "Switzerland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Syria"
-msgstr ""
+msgstr "Syria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
-msgstr ""
+msgstr "Tajikistan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
-msgstr ""
+msgstr "Tanzania, United Republic Of"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
-msgstr ""
+msgstr "Thailand"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Timor-Leste"
-msgstr ""
+msgstr "Timor-Leste"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "Trinidad And Tobago"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
-msgstr ""
+msgstr "Turkey"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
-msgstr ""
+msgstr "Turks And Caicos Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
-msgstr ""
+msgstr "Ukraine"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "United Arab Emirates"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
-msgstr ""
+msgstr "United Kingdom"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "United States Minor Outlying Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
-msgstr ""
+msgstr "Viet Nam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
-msgstr ""
+msgstr "Virgin Islands, British"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
-msgstr ""
+msgstr "Virgin Islands, U.S."
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
-msgstr ""
+msgstr "Wallis And Futuna Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
-msgstr ""
+msgstr "Western Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
-msgstr ""
+msgstr "AOL Instant Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
-msgstr ""
+msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:65
 msgid "Yahoo Messenger"
-msgstr ""
+msgstr "Yahoo Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-#, fuzzy
 msgid "MSN Messenger"
-msgstr "Colours"
+msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
-msgstr "Synchronising \"%s\""
+msgstr "Service"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
 #: calendar/gui/dialogs/cal-prefs-dialog.c:426
-#, fuzzy
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "Location"
-msgstr "Organisation"
+msgstr "Location"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
 msgid "Username"
-msgstr "Synchronising \"%s\""
+msgstr "Username"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #. red
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
 #: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:155
 msgid "Work"
-msgstr ""
+msgstr "Work"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
 msgid "Other"
-msgstr ""
+msgstr "Other"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
 msgid "Source Book"
-msgstr ""
+msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Target Book"
-msgstr ""
+msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:180
 msgid "Contact"
-msgstr "Organisation:"
+msgstr "Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Is New Contact"
-msgstr "Organisation:"
+msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
 msgid "Writable Fields"
-msgstr ""
+msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Changed"
-msgstr "Colours"
+msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
 msgid "Account Name"
-msgstr ""
+msgstr "Account Name"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
 msgid "Category editor not available."
-msgstr ""
+msgstr "Category editor not available."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
 msgid "This contact belongs to these categories:"
-msgstr ""
+msgstr "This contact belongs to these categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
 msgid "Save Contact as VCard"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
+msgstr "Save Contact as VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
 msgid "Business"
-msgstr ""
+msgstr "Business"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "Yahoo"
-msgstr ""
+msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
 msgid "GroupWise"
-msgstr ""
+msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
 #, c-format
 msgid "Could not find widget for a field: `%s'"
-msgstr ""
+msgstr "Could not find widget for a field: `%s'"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
-msgstr ""
+msgstr "Contact Quick-Add"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:283
-#, fuzzy
 msgid "_Edit Full"
-msgstr "Synchronising \"%s\""
+msgstr "_Edit Full"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
 msgid "_Full Name:"
-msgstr ""
+msgstr "_Full Name:"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
+msgstr "E-_mail:"
+
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
 msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
-msgstr ""
+msgstr "Address _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
-msgstr ""
+msgstr "Ci_ty:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
-msgstr ""
+msgstr "Countr_y:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
-#, fuzzy
 msgid "Full Address"
-msgstr "Colours"
+msgstr "Full Address"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
-msgstr ""
+msgstr "_Address:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
-msgstr ""
+msgstr "_PO Box:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
-msgstr ""
+msgstr "_State/Province/County:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
-msgstr "_Post Code:"
+msgstr "Post _Code:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
-msgstr ""
+msgstr "Dr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
-msgstr ""
+msgstr "Full Name"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
-msgstr ""
+msgstr "II"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
-msgstr ""
+msgstr "III"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
-msgstr ""
+msgstr "Jr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
-msgstr ""
+msgstr "Miss"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
-msgstr ""
+msgstr "Mr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
-msgstr ""
+msgstr "Mrs."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
-msgstr ""
+msgstr "Ms."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
-msgstr ""
+msgstr "Sr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
-msgstr ""
+msgstr "_First:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
-msgstr ""
+msgstr "_Last:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
-msgstr ""
+msgstr "_Middle:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
-msgstr ""
+msgstr "_Suffix:"
 
 #: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
-msgstr ""
+msgstr "_Title:"
 
 #: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
-msgstr ""
+msgid "Add IM Account"
+msgstr "Add IM Account"
 
 #: addressbook/gui/contact-editor/im.glade.h:3
-msgid "Add IM Account"
-msgstr ""
+msgid "_Account name:"
+msgstr "_Account name:"
 
 #: addressbook/gui/contact-editor/im.glade.h:4
-#, fuzzy
-msgid "IM Service:"
-msgstr "Synchronising \"%s\""
+msgid "_IM Service:"
+msgstr "_IM Service:"
 
 #: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
-#, fuzzy
-msgid "Location:"
-msgstr "Organisation"
+msgid "_Location:"
+msgstr "_Location:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
-msgstr ""
+msgstr "Members"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
-msgstr ""
+msgstr "_Hide addresses when sending mail to this list"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#, fuzzy
 msgid "_List name:"
-msgstr "Synchronising \"%s\""
+msgstr "_List name:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
+msgstr "_Type an email address or drag a contact into the list below:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
-msgstr ""
+msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
-msgstr ""
+msgstr "Book"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 msgid "Is New List"
-msgstr ""
+msgstr "Is New List"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Editor"
-msgstr ""
+msgstr "Contact List Editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
 msgid "Save List as VCard"
-msgstr ""
+msgstr "Save List as VCard"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
-msgstr ""
+msgstr "Changed Contact:"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
-msgstr ""
+msgstr "Conflicting Contact:"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
-msgstr ""
+msgstr "Duplicate Contact Detected"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
-msgstr ""
+msgstr "New Contact:"
 
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
-msgstr ""
+msgstr "Original Contact:"
 
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:154
 msgid "Advanced Search"
-msgstr ""
+msgstr "Advanced Search"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
 msgid "No contacts"
-msgstr "Organisation:"
+msgstr "No contacts"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "Organisation:"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, fuzzy, c-format
-msgid "%d contacts"
-msgstr "Organisation:"
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacts"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
-msgstr ""
+msgstr "Query"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
-msgstr ""
+msgstr "Error getting book view"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:114
 msgid "Error modifying card"
-msgstr ""
+msgstr "Error modifying card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Name begins with"
-msgstr ""
+msgstr "Name begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
 msgid "Email begins with"
-msgstr ""
+msgstr "Email begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
-msgstr ""
+msgstr "Category is"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
-msgstr ""
+msgstr "Any field contains"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Advanced..."
-msgstr ""
+msgstr "Advanced..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
 #: calendar/gui/e-meeting-list-view.c:249
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:506
 msgid "Address Book"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Address Book"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2031
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
-msgstr ""
+msgstr "Save as VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
-msgstr ""
+msgstr "New Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
 msgid "New Contact List..."
-msgstr ""
+msgstr "New Contact List..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
 msgid "Go to Folder..."
-msgstr ""
+msgstr "Go to Folder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
 msgid "Import..."
-msgstr ""
+msgstr "Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Search for Contacts..."
-msgstr ""
+msgstr "Search for Contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
 msgid "Address Book Sources..."
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Address Book Sources..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Pilot Settings..."
-msgstr ""
+msgstr "Pilot Settings..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
-msgstr ""
+msgstr "Forward Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 msgid "Send Message to Contact"
-msgstr ""
+msgstr "Send Message to Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 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 ""
+msgstr "Print"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
 msgid "Print Envelope"
-msgstr ""
+msgstr "Print Envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
 msgid "Copy to Address Book..."
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Copy to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
-#, fuzzy
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
 msgid "Move to Address Book..."
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Move to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
-msgstr ""
+msgstr "Cut"
 
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
-msgstr ""
+msgstr "Copy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
-msgstr ""
+msgstr "Paste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
 msgid "Current View"
-msgstr ""
+msgstr "Current View"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
 #, c-format
 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"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
 #: calendar/gui/cal-search-bar.c:359
 msgid "Any Category"
-msgstr ""
+msgstr "Any Category"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
-msgstr ""
+msgstr "Assistant"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
-msgstr ""
+msgstr "Assistant Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
-msgstr ""
+msgstr "Business Fax"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
-msgstr ""
+msgstr "Business Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
-msgstr ""
+msgstr "Business Phone 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
-msgstr ""
+msgstr "Callback Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
-msgstr ""
+msgstr "Car Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
-msgstr ""
+msgstr "Categories"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
-msgstr ""
+msgstr "Company Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
-msgstr ""
+msgstr "Email 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
-msgstr ""
+msgstr "Email 3"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-#, fuzzy
 msgid "Family Name"
-msgstr "Synchronising \"%s\""
+msgstr "Surname"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
-msgstr ""
+msgstr "File As"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-#, fuzzy
 msgid "Given Name"
-msgstr "Synchronising \"%s\""
+msgstr "Forename"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
-msgstr ""
+msgstr "Home Fax"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
-msgstr ""
+msgstr "Home Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
-msgstr ""
+msgstr "Home Phone 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
-msgstr ""
+msgstr "ISDN Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-#, fuzzy
 msgid "Journal"
-msgstr "Colours"
+msgstr "Journal"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Mobile Phone"
-msgstr ""
+msgstr "Mobile Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
-msgstr ""
+msgstr "Nickname"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
-msgstr ""
+msgstr "Office"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
 msgid "Organization"
 msgstr "Organisation"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
-msgstr ""
+msgstr "Other Fax"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
-msgstr ""
+msgstr "Other Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
-msgstr ""
+msgstr "Pager"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
-msgstr ""
+msgstr "Primary Phone"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
 #: calendar/gui/e-meeting-list-view.c:256
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
-msgstr ""
+msgstr "Role"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
-msgstr ""
+msgstr "Spouse"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "TTYTDD"
-msgstr ""
+msgstr "TTYTDD"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
-msgstr ""
+msgstr "Telex"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
-msgstr ""
+msgstr "Title"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Unit"
-msgstr ""
+msgstr "Unit"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
-msgstr ""
+msgstr "Web Site"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
 msgid "Width"
-msgstr ""
+msgstr "Width"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
 msgid "Height"
-msgstr ""
+msgstr "Height"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
 msgid "Has Focus"
-msgstr ""
+msgstr "Has Focus"
 
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
-msgstr ""
+msgstr "Field"
 
 #: addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
-msgstr ""
+msgstr "Field Name"
 
 #: addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
-msgstr ""
+msgstr "Text Model"
 
 #: addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
-msgstr ""
+msgstr "Max field name length"
 
 #: addressbook/gui/widgets/e-minicard-view-widget.c:126
 msgid "Column Width"
-msgstr ""
+msgstr "Column Width"
 
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
@@ -2733,6 +2824,11 @@ msgid ""
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
 
 #: addressbook/gui/widgets/e-minicard-view.c:145
 msgid ""
@@ -2740,249 +2836,249 @@ msgid ""
 "\n"
 "There are no items to show in this view."
 msgstr ""
+"\n"
+"\n"
+"There are no items to show in this view."
 
 #: addressbook/gui/widgets/e-minicard-view.c:453
 msgid "Adapter"
-msgstr ""
+msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:168
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard.c:159
 msgid "Selected"
-msgstr "Synchronising \"%s\""
+msgstr "Selected"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
 msgid "Has Cursor"
-msgstr ""
+msgstr "Has Cursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
 msgid "(map)"
-msgstr ""
+msgstr "(map)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
 msgid "map"
-msgstr ""
+msgstr "map"
 
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
 msgid "List Members"
-msgstr "Synchronising \"%s\""
+msgstr "List Members"
 
-#: addressbook/gui/widgets/eab-contact-display.c:233
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:298
 msgid "E-mail"
-msgstr "Colours"
-
-#: addressbook/gui/widgets/eab-contact-display.c:238
-msgid "work"
-msgstr ""
+msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:241
-#, fuzzy
+#: addressbook/gui/widgets/eab-contact-display.c:306
 msgid "Position"
-msgstr "Synchronising \"%s\""
+msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
 msgid "Groupwise"
-msgstr ""
+msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
 msgid "Video Conferencing"
-msgstr ""
+msgstr "Video Conferencing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "Phone"
-msgstr ""
+msgstr "Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:255
-msgid "personal"
-msgstr ""
+#: addressbook/gui/widgets/eab-contact-display.c:319
+msgid "work"
+msgstr "work"
 
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "WWW"
-msgstr ""
+msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Blog"
-msgstr ""
+msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+msgid "personal"
+msgstr "personal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
 msgid "Job Title"
-msgstr ""
+msgstr "Job Title"
 
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
 msgid "Home page"
-msgstr ""
+msgstr "Home page"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Success"
-msgstr ""
+msgstr "Success"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
 #: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
 msgid "Unknown error"
-msgstr ""
+msgstr "Unknown error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Repository offline"
-msgstr ""
+msgstr "Repository offline"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Permission denied"
-msgstr ""
+msgstr "Permission denied"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Contact not found"
-msgstr ""
+msgstr "Contact not found"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Contact ID already exists"
-msgstr ""
+msgstr "Contact ID already exists"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Protocol not supported"
-msgstr ""
+msgstr "Protocol not supported"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
 #: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
 #: camel/camel-service.c:766 camel/camel-service.c:850
 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelled"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Authentication Failed"
-msgstr ""
+msgstr "Authentication Failed"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Authentication Required"
-msgstr ""
+msgstr "Authentication Required"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "TLS not Available"
-msgstr ""
+msgstr "TLS not Available"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Address Book does not exist"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Address Book does not exist"
 
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Other error"
-msgstr ""
+msgstr "Other error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
 msgid "Do you want to save changes?"
-msgstr ""
+msgstr "Do you want to save changes?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
 msgid "_Discard"
-msgstr ""
+msgstr "_Discard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
 msgid "Error adding list"
-msgstr ""
+msgstr "Error adding list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Error adding contact"
-msgstr ""
+msgstr "Error adding contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying list"
-msgstr ""
+msgstr "Error modifying list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
 msgid "Error modifying contact"
-msgstr ""
+msgstr "Error modifying contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
 msgid "Error removing list"
-msgstr ""
+msgstr "Error removing list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Error removing contact"
-msgstr ""
+msgstr "Error removing contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 #, 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:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
 msgid "Overwrite"
-msgstr ""
+msgstr "Overwrite"
 
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid "Error saving %s: %s"
-msgstr ""
+msgstr "Error saving %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
 msgid "card.vcf"
-msgstr ""
+msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
 msgid "list"
-msgstr ""
+msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:578
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:579
 msgid "Move contact to"
-msgstr "Organisation:"
+msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:580
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Copy contact to"
-msgstr "Organisation:"
+msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:583
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:584
 msgid "Move contacts to"
-msgstr "Organisation:"
+msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:585
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Copy contacts to"
-msgstr "Organisation:"
+msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:588
-#, fuzzy
+#: addressbook/gui/widgets/eab-gui-util.c:589
 msgid "Select target addressbook."
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Multiple VCards"
-msgstr ""
+msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
 #, c-format
 msgid "VCard for %s"
-msgstr ""
+msgstr "VCard for %s"
 
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
@@ -2991,543 +3087,522 @@ msgstr ""
 #.
 #: addressbook/gui/widgets/eab-popup-control.c:188
 msgid "(none)"
-msgstr ""
+msgstr "(none)"
 
 #: addressbook/gui/widgets/eab-popup-control.c:450
 msgid "Primary Email"
-msgstr ""
+msgstr "Primary Email"
 
 #: addressbook/gui/widgets/eab-popup-control.c:586
 msgid "Select an Action"
-msgstr ""
+msgstr "Select an Action"
 
 #: addressbook/gui/widgets/eab-popup-control.c:594
 #, c-format
 msgid "Create a new contact \"%s\""
-msgstr ""
+msgstr "Create a new contact \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:610
 #, c-format
 msgid "Add address to existing contact \"%s\""
-msgstr ""
+msgstr "Add address to existing contact \"%s\""
 
 #: addressbook/gui/widgets/eab-popup-control.c:888
-#, fuzzy
 msgid "Querying Address Book..."
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Querying Address Book..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
 msgid "Edit Contact Info"
-msgstr ""
+msgstr "Edit Contact Info"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
 msgid "Merge E-Mail Address"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "Organisation:"
+msgstr "Merge E-Mail Address"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
 msgid "and one other contact."
-msgstr "Organisation:"
+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:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
-msgstr ""
+msgstr "Show Full VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
-msgstr ""
+msgstr "Show Compact VCard"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
-msgstr ""
+msgstr "Save in addressbook"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
-msgstr ""
+msgstr "Card View"
 
 #: addressbook/gui/widgets/gal-view-factory-treeview.c:25
 msgid "GTK Tree View"
-msgstr ""
+msgstr "GTK Tree View"
 
 #: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
-msgstr ""
+msgstr "Reflow Test"
 
 #: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr ""
+msgstr "Copyright (C) 2000, Ximian, Inc."
 
 #: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
-msgstr ""
+msgstr "This should test the reflow canvas item"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution LDIF importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution LDIF importer"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
+msgstr "LDAP Data Interchange Format (.ldif)"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution VCard Importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution VCard Importer"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
 msgid "Evolution VCard importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution VCard importer"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
-msgstr ""
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
-msgstr ""
+msgstr "Print envelope"
 
 #: addressbook/printing/e-contact-print.c:1009
-#, fuzzy
 msgid "Print contacts"
-msgstr "Organisation:"
+msgstr "Print contacts"
 
 #: addressbook/printing/e-contact-print.c:1075
 #: addressbook/printing/e-contact-print.c:1102
-#, fuzzy
 msgid "Print contact"
-msgstr "Organisation:"
+msgstr "Print contact"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
-msgstr ""
+msgstr "10 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
-msgstr ""
+msgstr "8 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
-msgstr ""
+msgstr "Blank forms at end:"
 
 #: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
-msgstr ""
+msgstr "Body"
 
 #: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
-msgstr ""
+msgstr "Bottom:"
 
 #: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
-msgstr ""
+msgstr "Dimensions:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr ""
+msgstr "F_ont..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
-msgstr ""
+msgstr "Fonts"
 
 #: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
-msgstr ""
+msgstr "Footer:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
-msgstr ""
+msgstr "Format"
 
 #: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
-msgstr ""
+msgstr "Header"
 
 #: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
-msgstr ""
+msgstr "Header/Footer"
 
 #: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
-msgstr ""
+msgstr "Headings"
 
 #: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
-msgstr ""
+msgstr "Headings for each letter"
 
 #: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
-msgstr ""
+msgstr "Height:"
 
 #: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
-msgstr ""
+msgstr "Immediately follow each other"
 
 #: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
-msgstr ""
+msgstr "Include:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
-msgstr ""
+msgstr "Landscape"
 
 #: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
-msgstr ""
+msgstr "Left:"
 
 #: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
-msgstr ""
+msgstr "Letter tabs on side"
 
 #: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
-msgstr ""
+msgstr "Margins"
 
 #: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
-msgstr ""
+msgstr "Number of columns:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
-msgstr ""
+msgstr "Options"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#, fuzzy
 msgid "Orientation"
-msgstr "Organisation"
+msgstr "Orientation"
 
 #: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
-msgstr ""
+msgstr "Page"
 
 #: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
-msgstr ""
+msgstr "Page Setup:"
 
 #: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
-msgstr ""
+msgstr "Paper"
 
 #: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
-msgstr ""
+msgstr "Paper source:"
 
 #: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
-msgstr ""
+msgstr "Portrait"
 
 #: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
-msgstr ""
+msgstr "Preview:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
-msgstr ""
+msgstr "Print using grey shading"
 
 #: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
-msgstr ""
+msgstr "Reverse on even pages"
 
 #: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
-msgstr ""
+msgstr "Right:"
 
 #: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
-msgstr ""
+msgstr "Sections:"
 
 #: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
-msgstr ""
+msgstr "Shading"
 
 #: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
-msgstr ""
+msgstr "Size:"
 
 #: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
-msgstr ""
+msgstr "Start on a new page"
 
 #: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
-msgstr ""
+msgstr "Style name:"
 
 #: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
-msgstr ""
+msgstr "Top:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
-msgstr ""
+msgstr "Type:"
 
 #: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
-msgstr ""
+msgstr "Width:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr ""
+msgstr "_Font..."
 
 #: addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
-msgstr ""
+msgstr "Contact Print Style Editor Test"
 
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr ""
+msgstr "This should test the contact print style editor widget"
 
 #: addressbook/printing/test-print.c:52
-#, fuzzy
 msgid "Contact Print Test"
-msgstr "Organisation:"
+msgstr "Contact Print Test"
 
 #: addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
-msgstr ""
+msgstr "This should test the contact print code"
 
 #: addressbook/tools/evolution-addressbook-export-list-cards.c:629
 #: addressbook/tools/evolution-addressbook-export-list-cards.c:667
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-#, fuzzy
 msgid "Can not open file"
-msgstr "Synchronising \"%s\""
+msgstr "Can not open file"
 
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:78
 msgid "Can not load URI"
-msgstr ""
+msgstr "Can not load URI"
 
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
-msgstr ""
+msgstr "Specify the output file instead of standard output"
 
 #: addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
-msgstr ""
+msgstr "OUTPUTFILE"
 
 #: addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local addressbook folders"
-msgstr ""
+msgstr "List local addressbook folders"
 
 #: addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
-msgstr ""
+msgstr "Show cards as vcard or csv file"
 
 #: addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
-msgstr ""
+msgstr "[vcard|csv]"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode "
-msgstr ""
+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."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
-msgstr ""
+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."
 
 #: addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
-msgstr ""
+msgstr "Only support csv or vcard format."
 
 #: addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
-msgstr ""
+msgstr "In async mode, output must be file."
 
 #: addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there should not need size option."
-msgstr ""
+msgstr "In normal mode, there should not need size option."
 
 #: addressbook/tools/evolution-addressbook-export.c:153
 msgid "Impossible internal error."
-msgstr ""
+msgstr "Impossible internal error."
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
-msgstr ""
+msgstr "Error loading default addressbook."
 
 #: addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
-msgstr ""
+msgstr "Input File"
 
 #: addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
-msgstr ""
+msgstr "No filename provided."
 
 #: addressbook/util/eab-destination.c:677
 msgid "Unnamed List"
-msgstr ""
+msgstr "Unnamed List"
 
 #: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
 msgid "Enter password"
-msgstr ""
+msgstr "Enter password"
 
 #: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
-msgstr ""
+msgstr "Split Multi-Day Events:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1320
 #: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
-msgstr ""
+msgstr "Could not start wombat server"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1321
 #: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
-msgstr ""
+msgstr "Could not start wombat"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1436
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
-msgstr ""
+msgstr "Could not read pilot's Calendar application block"
 
 #: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
-msgstr ""
+msgstr "Default Priority:"
 
 #: calendar/conduits/todo/todo-conduit.c:945
 #: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
-msgstr ""
+msgstr "Could not read pilot's ToDo application block"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "Calendar and Tasks"
-msgstr ""
+msgstr "Calendar and Tasks"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
 msgid "Calendars"
-msgstr "Colours"
+msgstr "Calendars"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
+msgstr "Configure your timezone, Calendar and Task List here "
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
 msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Calendar and Tasks"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
 msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Calendar configuration control"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
+msgstr "Evolution Calendar scheduling message viewer"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Calendar viewer"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Calendar viewer"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar/Task editor"
-msgstr ""
+msgstr "Evolution Calendar/Task editor"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
 msgid "Evolution Tasks viewer"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Tasks viewer"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
 msgid "Evolution's Calendar component"
-msgstr "Cannot initialise Evolution's mail summary component."
+msgstr "Evolution's Calendar component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
 msgid "Evolution's Tasks component"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution's Tasks component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:709
 msgid "Tasks"
-msgstr ""
+msgstr "Tasks"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Calendar alarm notification service"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Calendar alarm notification service"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
-#, fuzzy
 msgid "Starting:"
-msgstr "Synchronise \"%s\""
+msgstr "Starting:"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
-msgstr ""
+msgstr "Ending:"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
-#, fuzzy
 msgid "Evolution Alarm"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Alarm"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
-msgstr ""
+msgstr "Alarm on %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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
-#, fuzzy
 msgid "C_lose"
-msgstr "Colours"
+msgstr "C_lose"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Snoo_ze"
-msgstr ""
+msgstr "Snoo_ze"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
-msgstr ""
+msgstr "Snooze time (minutes)"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
-msgstr ""
+msgstr "_Edit appointment"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
-msgstr ""
+msgstr "Open"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
 msgid "Dismiss"
-msgstr ""
+msgstr "Dismiss"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
 msgid "Dismiss All"
-msgstr ""
+msgstr "Dismiss All"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
 msgid "No description available."
-msgstr ""
+msgstr "No description available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3535,21 +3610,29 @@ msgid ""
 "Starting at %s\n"
 "Ending at %s"
 msgstr ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Warning"
-msgstr ""
+msgstr "Warning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialogue box instead."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3559,184 +3642,186 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
 msgid "Do not ask me about this program again."
-msgstr ""
+msgstr "Do not ask me about this program again."
 
 #: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
 #: calendar/gui/alarm-notify/notify-main.c:166
-#, fuzzy
 msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise Bonobo"
+msgstr "Could not initialise gnome-vfs"
 
 #: calendar/gui/alarm-notify/notify-main.c:175
 msgid "Could not create the alarm notify service factory"
-msgstr ""
+msgstr "Could not create the alarm notify service factory"
 
 #: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
-msgstr ""
+msgstr "invalid time"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Allocate less space to weekend appointments"
-msgstr ""
+msgstr "Allocate less space to weekend appointments"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 msgid "Calendars to run alarms for"
-msgstr ""
+msgstr "Calendars to run alarms for"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
-#, fuzzy
 msgid "Color of tasks that are due today"
-msgstr "Colours for display"
+msgstr "Colour of tasks that are due today"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
-#, fuzzy
 msgid "Color of tasks that are overdue"
-msgstr "Colours for display"
+msgstr "Colour of tasks that are overdue"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Days that are work days"
-msgstr ""
+msgstr "Days that are work days"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid "Default timezone for meetings"
-msgstr ""
+msgstr "Default timezone for meetings"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Hour the workday ends on"
-msgstr ""
+msgstr "Hour the work day ends on"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Hour the workday starts on"
-msgstr ""
+msgstr "Hour the work day starts on"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Intervals shown in Day and Work Week views"
-msgstr ""
+msgstr "Intervals shown in Day and Work Week views"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "List of urls for free/busy publishing"
-msgstr ""
+msgstr "List of urls for free/busy publishing"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Minute the workday ends on"
-msgstr ""
+msgstr "Minute the work day ends on"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Minute the workday starts on"
-msgstr ""
+msgstr "Minute the work day starts on"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Number of units for default reminder"
-msgstr ""
+msgstr "Number of units for default reminder"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Number of units for determining when to hide tasks"
-msgstr ""
+msgstr "Number of units for determining when to hide tasks"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Position of the horizontal pane"
-msgstr ""
+msgstr "Position of the horizontal pane"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Position of the horizontal pane in the month view"
-msgstr ""
+msgstr "Position of the horizontal pane in the month view"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Position of the vertical pane"
-msgstr ""
+msgstr "Position of the vertical pane"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Position of the vertical pane in the month view"
-msgstr ""
+msgstr "Position of the vertical pane in the month view"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Position of the vertical pane in the task view"
-msgstr ""
+msgstr "Position of the vertical pane in the task view"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Programs that can run as part of alarms"
-msgstr ""
+msgstr "Programs that can run as part of alarms"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Show where events end in week and month views"
-msgstr ""
+msgstr "Show where events end in week and month views"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "The view showing when the calendar starts"
-msgstr ""
+msgstr "The view showing when the calendar starts"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Time last alarm ran"
-msgstr ""
+msgstr "Time last alarm ran"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units for determining when to hide tasks"
-msgstr ""
+msgstr "Units for determining when to hide tasks"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Units of default reminder"
-msgstr ""
+msgstr "Units of default reminder"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
-msgstr ""
+msgstr "Weekday the week starts on"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
-msgstr ""
+msgstr "Whether to ask for confirmation on appointment deletion"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
-msgstr ""
+msgstr "Whether to ask for confirmation when folder is expunged"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
-msgstr ""
+msgstr "Whether to hide completed tasks"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
-msgstr ""
+msgstr "Whether to set a default reminder for events"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr ""
+msgstr "Whether to show times in 24h format instead of using am/pm"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
-msgstr ""
+msgstr "Whether to show week numbers in date navigator"
 
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
-msgstr ""
+msgstr "Summary contains"
 
 #: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
-msgstr ""
+msgstr "Description contains"
 
 #: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
-msgstr ""
+msgstr "Comment contains"
 
 #: calendar/gui/cal-search-bar.c:53
-#, fuzzy
 msgid "Location contains"
-msgstr "Organisation"
+msgstr "Location contains"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1058
 msgid "Unmatched"
-msgstr ""
+msgstr "Unmatched"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
 msgid "Calendar"
-msgstr ""
+msgstr "Calendar"
 
 #: calendar/gui/calendar-commands.c:351
 msgid ""
@@ -3744,37 +3829,39 @@ msgid ""
 "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:357
 msgid "Purge events older than"
-msgstr ""
+msgstr "Purge events older than"
 
 #: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
 msgid "days"
-msgstr ""
+msgstr "days"
 
 #: calendar/gui/calendar-commands.c:431
 msgid "%A %d %B %Y"
-msgstr ""
+msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
-msgstr ""
+msgstr "%a %d %b"
 
 #: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
 #: calendar/gui/calendar-commands.c:443
 msgid "%a %d %b %Y"
-msgstr ""
+msgstr "%a %d %b %Y"
 
 #: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
 #: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
-#, fuzzy
 msgid "%d %B %Y"
-msgstr "%m/%d/%Y"
+msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
@@ -3782,576 +3869,554 @@ msgstr "%m/%d/%Y"
 #: calendar/gui/calendar-commands.c:464
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
-msgstr ""
+msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
+msgstr "Calendar '%s' will be removed. Are you sure you want to continue?"
 
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
 #: calendar/gui/dialogs/calendar-setup.glade.h:13
-#, fuzzy
 msgid "New Calendar"
-msgstr "Colours"
+msgstr "New Calendar"
 
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
 msgid "New appointment"
-msgstr ""
+msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
 msgid "_Appointment"
-msgstr ""
+msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
 msgid "Create a new appointment"
-msgstr ""
+msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:850
-#, fuzzy
+#: calendar/gui/calendar-component.c:930
 msgid "New meeting"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:851
-#, fuzzy
+#: calendar/gui/calendar-component.c:931
 msgid "M_eeting"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:852
-#, fuzzy
+#: calendar/gui/calendar-component.c:932
 msgid "Create a new meeting request"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
 msgid "New all day appointment"
-msgstr ""
+msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
 msgid "All _Day Appointment"
-msgstr ""
+msgstr "All _Day Appointment"
 
-#: calendar/gui/calendar-component.c:859
-#, fuzzy
+#: calendar/gui/calendar-component.c:939
 msgid "Create a new all-day appointment"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:864
-#, fuzzy
+#: calendar/gui/calendar-component.c:944
 msgid "New calendar"
-msgstr "Colours"
+msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:865
-#, fuzzy
+#: calendar/gui/calendar-component.c:945
 msgid "C_alendar"
-msgstr "Colours"
+msgstr "C_alendar"
 
-#: calendar/gui/calendar-component.c:866
-#, fuzzy
+#: calendar/gui/calendar-component.c:946
 msgid "Create a new calendar"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new calendar"
 
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
+msgstr "Unable to open the calendar '%s' for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
 msgid "There is no calendar available for creating events and meetings"
-msgstr ""
+msgstr "There is no calendar available for creating events and meetings"
 
 #: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
-msgstr ""
+msgstr "backend_go_offline(): %s"
 
 #: calendar/gui/calendar-offline-handler.c:215
 #, c-format
 msgid "backend_go_online(): %s"
-msgstr ""
+msgstr "backend_go_online(): %s"
 
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
-msgstr ""
+msgstr "Day View"
 
 #: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
-msgstr ""
+msgstr "Work Week View"
 
 #: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
-msgstr ""
+msgstr "Week View"
 
 #: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
-msgstr ""
-
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Synchronising \"%s\""
+msgstr "Month View"
 
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
-msgstr ""
+msgstr "Error while opening the calendar"
 
 #: calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
-msgstr ""
+msgstr "Method not supported when opening the calendar"
 
 #: calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
-msgstr ""
+msgstr "Permission denied to open the calendar"
 
 #: calendar/gui/comp-editor-factory.c:474
 #, c-format
 msgid "open_client(): %s"
-msgstr ""
+msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:140
-#, fuzzy, c-format
+#: calendar/gui/control-factory.c:142
+#, c-format
 msgid "Could not open the folder in '%s'"
-msgstr "Synchronising \"%s\""
+msgstr "Could not open the folder in '%s'"
 
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
 msgid "The URI that the calendar will display"
-msgstr ""
+msgstr "The URI that the calendar will display"
 
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
 msgid "The type of view to show"
-msgstr ""
+msgstr "The type of view to show"
 
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
-msgstr ""
+msgstr "Audio Alarm Options"
 
 #: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
-msgstr ""
+msgstr "Message Alarm Options"
 
 #: calendar/gui/dialogs/alarm-options.c:484
-#, fuzzy
 msgid "Email Alarm Options"
-msgstr "Synchronising \"%s\""
+msgstr "Email Alarm Options"
 
 #: calendar/gui/dialogs/alarm-options.c:493
 msgid "Program Alarm Options"
-msgstr ""
+msgstr "Program Alarm Options"
 
 #: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
-msgstr ""
+msgstr "Unknown Alarm Options"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
-msgstr ""
+msgstr "Alarm Repeat"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
-#, fuzzy
 msgid "Message to Display:"
-msgstr "Colours"
+msgstr "Message to Display:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
-#, fuzzy
 msgid "Message to Send"
-msgstr "Colours"
+msgstr "Message to Send"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
-msgstr ""
+msgstr "Play sound:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
-msgstr ""
+msgstr "Repeat the alarm"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
-msgstr ""
+msgstr "Run program:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:8
 msgid "Send To:"
-msgstr ""
+msgstr "Send To:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
-msgstr ""
+msgstr "With these arguments:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
-msgstr ""
+msgstr "dialogue1"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
-msgstr ""
+msgstr "extra times every"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
-msgstr ""
+msgstr "hours"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "minutes"
-msgstr ""
+msgstr "minutes"
 
 #: calendar/gui/dialogs/alarm-page.c:800
 msgid "Action/Trigger"
-msgstr ""
+msgstr "Action/Trigger"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
-msgstr ""
+msgstr "A_dd"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
-msgstr ""
+msgstr "Basics"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
-msgstr ""
+msgstr "Date/Time:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
 msgid "Display a message"
-msgstr ""
+msgstr "Display a message"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
-msgstr ""
+msgstr "Play a sound"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
 msgid "Reminders"
-msgstr "Synchronising \"%s\""
+msgstr "Reminders"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
-msgstr ""
+msgstr "Run a program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
-msgstr ""
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Send an email"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:164
 msgid "Summary:"
-msgstr ""
+msgstr "Summary:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
-msgstr ""
+msgstr "_Options..."
 
 #: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
-msgstr ""
+msgstr "after"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
-msgstr ""
+msgstr "before"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
-msgstr ""
+msgstr "day(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
-msgstr ""
+msgstr "end of appointment"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
-msgstr ""
+msgstr "hour(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
 msgid "minute(s)"
-msgstr ""
+msgstr "minute(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
-msgstr ""
+msgstr "start of appointment"
 
 #. 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:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:719 mail/em-composer-prefs.c:884
 msgid "Enabled"
-msgstr ""
+msgstr "Enabled"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:656
 msgid "Are you sure you want to remove this URL?"
-msgstr ""
+msgstr "Are you sure you want to remove this URL?"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:664
 msgid "Don't Remove"
-msgstr ""
+msgstr "Don't Remove"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:686 mail/em-composer-prefs.c:704
+#: mail/em-composer-prefs.c:728
 msgid "Disable"
-msgstr ""
+msgstr "Disable"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:710
 #: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:686 mail/em-composer-prefs.c:704
+#: mail/em-composer-prefs.c:728
 msgid "Enable"
-msgstr ""
+msgstr "Enable"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
-msgstr ""
+msgstr "05 minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
-msgstr ""
+msgstr "10 minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
-msgstr ""
+msgstr "15 minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
-msgstr ""
+msgstr "30 minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
-msgstr ""
+msgstr "60 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "Alerts"
-msgstr ""
+msgstr "Alerts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
-msgstr ""
+msgstr "Calendar and Tasks Settings"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
-msgstr ""
+msgstr "Colour for overdue tasks"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
 msgid "Color for tasks due today"
-msgstr "Colours for display"
+msgstr "Colour for tasks due today"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Day _ends:"
-msgstr ""
+msgstr "Day _ends:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
-msgstr ""
+msgstr "Days"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
-msgstr ""
+msgstr "E_nable"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:562
 msgid "Friday"
-msgstr ""
+msgstr "Friday"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Hours"
-msgstr ""
+msgstr "Hours"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Minutes"
-msgstr ""
+msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:558
 msgid "Monday"
-msgstr ""
+msgstr "Monday"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "S_un"
-msgstr ""
+msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:563
 msgid "Saturday"
-msgstr ""
+msgstr "Saturday"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Sh_ow a reminder"
-msgstr ""
+msgstr "Sh_ow a reminder"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Show week _numbers in date navigator"
-msgstr ""
+msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:557
 msgid "Sunday"
-msgstr ""
+msgstr "Sunday"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
 msgid "T_asks due today:"
-msgstr "Colours for display"
+msgstr "T_asks due today:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
-msgstr ""
+msgstr "T_hu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
 msgid "Task List"
-msgstr "Organisation:"
+msgstr "Task List"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:561
 msgid "Thursday"
-msgstr ""
+msgstr "Thursday"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time"
-msgstr ""
+msgstr "Time"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time _zone:"
-msgstr ""
+msgstr "Time _zone:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time format:"
-msgstr ""
+msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:559
 msgid "Tuesday"
-msgstr ""
+msgstr "Tuesday"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "W_eek starts:"
-msgstr ""
+msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:560
 msgid "Wednesday"
-msgstr ""
+msgstr "Wednesday"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 msgid "Work Week"
-msgstr ""
+msgstr "Work Week"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Work days:"
-msgstr ""
+msgstr "Work days:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_12 hour (AM/PM)"
-msgstr ""
+msgstr "_12 hour (AM/PM)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
-msgstr ""
+msgstr "_24 hour"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Add URL"
-msgstr ""
+msgstr "_Add URL"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Ask for confirmation when deleting items"
-msgstr ""
+msgstr "_Ask for confirmation when deleting items"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Compress weekends in month view"
-msgstr ""
+msgstr "_Compress weekends in month view"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Day begins:"
-msgstr ""
+msgstr "_Day begins:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Display"
-msgstr ""
+msgstr "_Display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Free/Busy Publishing"
-msgstr ""
+msgstr "_Free/Busy Publishing"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Fri"
-msgstr ""
+msgstr "_Fri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
 msgid "_General"
-msgstr ""
+msgstr "_General"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Hide completed tasks after"
-msgstr ""
+msgstr "_Hide completed tasks after"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Mon"
-msgstr ""
+msgstr "_Mon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Overdue tasks:"
-msgstr ""
+msgstr "_Overdue tasks:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Sat"
-msgstr ""
+msgstr "_Sat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Show appointment end times in week and month views"
-msgstr ""
+msgstr "_Show appointment end times in week and month views"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Time divisions:"
-msgstr ""
+msgstr "_Time divisions:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Tue"
-msgstr ""
+msgstr "_Tue"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Wed"
-msgstr ""
+msgstr "_Wed"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "before every appointment"
-msgstr ""
+msgstr "before every appointment"
 
 #: calendar/gui/dialogs/calendar-setup.c:156
-#, fuzzy
 msgid "You must specify a location to get the calendar from."
-msgstr "Synchronising \"%s\""
+msgstr "You must specify a location to get the calendar from."
 
 #: calendar/gui/dialogs/calendar-setup.c:164
 #, c-format
 msgid "The source location '%s' is not well-formed."
-msgstr ""
+msgstr "The source location '%s' is not well-formed."
 
 #: calendar/gui/dialogs/calendar-setup.c:179
 #, c-format
 msgid "The source location '%s' is not a webcal source."
-msgstr ""
+msgstr "The source location '%s' is not a webcal source."
 
 #: calendar/gui/dialogs/calendar-setup.c:216
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
+msgstr "Source with name '%s' already exists in the selected group"
 
 #: calendar/gui/dialogs/calendar-setup.c:229
 #, c-format
@@ -4359,16 +4424,16 @@ 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
-#, fuzzy
 msgid "Calendar Creation Assistant"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Calendar Creation Assistant"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
 msgid "Calendar Properties"
-msgstr "Colours"
+msgstr "Calendar Properties"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid ""
@@ -4376,6 +4441,9 @@ msgid ""
 "\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."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid ""
@@ -4383,43 +4451,46 @@ msgid ""
 "\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."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
-#, fuzzy
+#: calendar/gui/tasks-component.c:363
 msgid "New Task List"
-msgstr "Organisation:"
+msgstr "New Task List"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:15
-#, fuzzy
 msgid "Remote"
-msgstr "Synchronising \"%s\""
+msgstr "Remote"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:18
 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."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:19
 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."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "Step 2: Remote Folder Parameters"
-msgstr ""
+msgstr "Step 2: Remote Folder Parameters"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:22
-#, fuzzy
 msgid "Task List Creation Assistant"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Task List Creation Assistant"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:23
-#, fuzzy
 msgid "Task List Properties"
-msgstr "Synchronising \"%s\""
+msgstr "Task List Properties"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:24
 msgid ""
@@ -4429,6 +4500,11 @@ msgid ""
 "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."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:29
 msgid ""
@@ -4438,6 +4514,11 @@ msgid ""
 "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."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:35
 msgid ""
@@ -4445,700 +4526,685 @@ msgid ""
 "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."
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:38
 msgid "_Refresh Interval:"
-msgstr ""
+msgstr "_Refresh Interval:"
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:39
 msgid "_Source URL:"
-msgstr ""
+msgstr "_Source URL:"
 
 #: calendar/gui/dialogs/cancel-comp.c:57
 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?"
 
 #: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
+msgstr "Are you sure you want to cancel and delete this meeting?"
 
 #: calendar/gui/dialogs/cancel-comp.c:66
 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?"
 
 #: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
+msgstr "Are you sure you want to cancel and delete this task?"
 
 #: calendar/gui/dialogs/cancel-comp.c:75
 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?"
 
 #: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
+msgstr "Are you sure you want to cancel and delete this journal entry?"
 
 #: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
-msgstr ""
+msgstr "This event has been deleted."
 
 #: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
-msgstr ""
+msgstr "This task has been deleted."
 
 #: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
-msgstr ""
+msgstr "This journal entry has been deleted."
 
 #: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
+msgstr "%s  You have made changes. Forget those changes and close the editor?"
 
 #: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr ""
+msgstr "%s  You have made no changes, close the editor?"
 
 #: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
-msgstr ""
+msgstr "This event has been changed."
 
 #: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
-msgstr ""
+msgstr "This task has been changed."
 
 #: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
-msgstr ""
+msgstr "This journal entry has been changed."
 
 #: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
+msgstr "%s  You have made changes. Forget those changes and update the editor?"
 
 #: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr ""
+msgstr "%s  You have made no changes, update the editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
-msgstr ""
+msgstr "Validation error: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
-msgstr ""
+msgstr " to "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
-msgstr ""
+msgstr " (Completed "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
-msgstr ""
+msgstr "Completed "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
-msgstr ""
+msgstr " (Due "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
-msgstr ""
+msgstr "Due "
 
 #: calendar/gui/dialogs/comp-editor.c:402
-#, fuzzy
 msgid "Could not update object"
-msgstr "Could not initialise Bonobo"
+msgstr "Could not update object"
 
 #: calendar/gui/dialogs/comp-editor.c:877
 #: calendar/gui/dialogs/comp-editor.c:914
 msgid "Edit Appointment"
-msgstr ""
+msgstr "Edit Appointment"
 
 #: calendar/gui/dialogs/comp-editor.c:882
 #: calendar/gui/dialogs/comp-editor.c:919
 #, c-format
 msgid "Appointment - %s"
-msgstr ""
+msgstr "Appointment - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:885
 #: calendar/gui/dialogs/comp-editor.c:922
 #, c-format
 msgid "Task - %s"
-msgstr ""
+msgstr "Task - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:888
 #: calendar/gui/dialogs/comp-editor.c:925
 #, c-format
 msgid "Journal entry - %s"
-msgstr ""
+msgstr "Journal entry - %s"
 
 #: calendar/gui/dialogs/comp-editor.c:899
 #: calendar/gui/dialogs/comp-editor.c:935
 msgid "No summary"
-msgstr ""
+msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
 msgid "Save as..."
-msgstr ""
+msgstr "Save as..."
 
 #: calendar/gui/dialogs/comp-editor.c:1463
 #: calendar/gui/dialogs/comp-editor.c:1487
 #: calendar/gui/dialogs/comp-editor.c:1513
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
+msgstr "Changes made to this item may be discarded if an update arrives"
 
 #: calendar/gui/dialogs/comp-editor.c:1552
 msgid "Unable to use current version!"
-msgstr ""
+msgstr "Unable to use current version!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:83
-#, fuzzy
+#: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
-msgstr "Synchronising \"%s\""
+msgstr "Could not open source"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:91
-#, fuzzy
+#: calendar/gui/dialogs/copy-source-dialog.c:65
 msgid "Could not open destination"
-msgstr "Could not initialise Bonobo"
+msgstr "Could not open destination"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
 msgid "Destination is read only"
-msgstr ""
-
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr ""
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Colours"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "Organisation:"
+msgstr "Destination is read only"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
+msgstr "Are you sure you want to delete the appointment `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
+msgstr "Are you sure you want to delete this untitled appointment?"
 
 #: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
+msgstr "Are you sure you want to delete the task `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
+msgstr "Are you sure you want to delete this untitled task?"
 
 #: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
+msgstr "Are you sure you want to delete the journal entry `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
+msgstr "Are you sure want to delete this untitled journal entry?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr ""
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] "Are you sure you want to delete %d appointment?"
+msgstr[1] "Are you sure you want to delete %d appointments?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:138
 #, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr ""
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] "Are you sure you want to delete %d task?"
+msgstr[1] "Are you sure you want to delete %d tasks?"
 
-#: calendar/gui/dialogs/delete-comp.c:141
+#: calendar/gui/dialogs/delete-comp.c:145
 #, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr ""
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] "Are you sure you want to delete %d journal entry?"
+msgstr[1] "Are you sure you want to delete %d journal entries?"
 
 #: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
-msgstr ""
+msgstr "The event could not be deleted due to a corba error"
 
 #: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
-msgstr ""
+msgstr "The task could not be deleted due to a corba error"
 
 #: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
-msgstr ""
+msgstr "The journal entry could not be deleted due to a corba error"
 
 #: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
-msgstr ""
+msgstr "The item could not be deleted due to a corba error"
 
 #: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
-msgstr ""
+msgstr "The event could not be deleted because permission was denied"
 
 #: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
-msgstr ""
+msgstr "The task could not be deleted because permission was denied"
 
 #: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
+msgstr "The journal entry could not be deleted because permission was denied"
 
 #: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
-msgstr ""
+msgstr "The item could not be deleted because permission was denied"
 
 #: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
-msgstr ""
+msgstr "The event could not be deleted due to an error"
 
 #: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
-msgstr ""
+msgstr "The task could not be deleted due to an error"
 
 #: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
-msgstr ""
+msgstr "The journal entry could not be deleted due to an error"
 
 #: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
-msgstr ""
+msgstr "The item could not be deleted due to an error"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
-msgstr ""
+msgstr "Addressbook..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
-msgstr ""
+msgstr "Delegate To:"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
-msgstr ""
+msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
-msgstr ""
+msgstr "Appointment"
 
 #: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
-msgstr ""
+msgstr "Reminder"
 
 #: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
-msgstr ""
+msgstr "Recurrence"
 
 #: calendar/gui/dialogs/event-editor.c:221
 #: calendar/gui/dialogs/event-editor.c:294
 #: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
-msgstr ""
+msgstr "Scheduling"
 
 #: calendar/gui/dialogs/event-editor.c:228
 #: calendar/gui/dialogs/event-editor.c:297
 #: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
-msgstr ""
+msgstr "Meeting"
 
 #: calendar/gui/dialogs/event-page.c:458
 msgid "Event with no start date"
-msgstr ""
+msgstr "Event with no start date"
 
 #: calendar/gui/dialogs/event-page.c:461
 msgid "Event with no end date"
-msgstr ""
+msgstr "Event with no end date"
 
 #: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
-msgstr ""
+msgstr "Start date is wrong"
 
 #: calendar/gui/dialogs/event-page.c:625
 msgid "End date is wrong"
-msgstr ""
+msgstr "End date is wrong"
 
 #: calendar/gui/dialogs/event-page.c:648
 msgid "Start time is wrong"
-msgstr ""
+msgstr "Start time is wrong"
 
 #: calendar/gui/dialogs/event-page.c:655
 msgid "End time is wrong"
-msgstr ""
+msgstr "End time is wrong"
 
 #: calendar/gui/dialogs/event-page.c:1234
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Synchronising \"%s\""
+msgstr "Unable to open the calendar '%s'."
 
 #: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
-msgstr ""
+msgstr "A_ll day event"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
-msgstr ""
+msgstr "B_usy"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:2
 msgid "Ca_tegories..."
-msgstr ""
+msgstr "Ca_tegories..."
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#, fuzzy
 msgid "Calendar:"
-msgstr "Colours"
+msgstr "Calendar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
-msgstr ""
+msgstr "Classification"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 msgid "Co_nfidential"
-msgstr ""
+msgstr "Co_nfidential"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
 #: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Date & Time"
-msgstr ""
+msgstr "Date & Time"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
 msgid "F_ree"
-msgstr ""
+msgstr "F_ree"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#, fuzzy
 msgid "L_ocation:"
-msgstr "Organisation"
+msgstr "L_ocation:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Pri_vate"
-msgstr ""
+msgstr "Pri_vate"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Pu_blic"
-msgstr ""
+msgstr "Pu_blic"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 msgid "Show Time As"
-msgstr ""
+msgstr "Show Time As"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
-msgstr ""
+msgstr "Su_mmary:"
 
 #: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
-msgstr ""
+msgstr "_End time:"
 
 #: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Start time:"
-msgstr ""
+msgstr "_Start time:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2091
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1316 mail/mail-account-gui.c:1850
+#: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: 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 ""
+msgstr "None"
 
 #: calendar/gui/dialogs/meeting-page.c:418
 msgid "The organizer selected no longer has an account."
-msgstr ""
+msgstr "The organiser selected no longer has an account."
 
 #: calendar/gui/dialogs/meeting-page.c:424
 msgid "An organizer is required."
-msgstr ""
+msgstr "An organiser is required."
 
 #: calendar/gui/dialogs/meeting-page.c:439
 msgid "At least one attendee is required."
-msgstr ""
+msgstr "At least one attendee is required."
 
 #: calendar/gui/dialogs/meeting-page.c:647
 msgid "_Delegate To..."
-msgstr ""
+msgstr "_Delegate To..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:240
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
-msgstr ""
+msgstr "Attendee"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
-msgstr ""
+msgstr "Click here to add an attendee"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
-msgstr ""
+msgstr "Common Name"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
-msgstr ""
+msgstr "Delegated From"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
-msgstr ""
+msgstr "Delegated To"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
-msgstr ""
+msgstr "Language"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
-msgstr ""
+msgstr "Member"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
-msgstr ""
+msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:9
 #: calendar/gui/e-meeting-list-view.c:270
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "Add A_ttendee"
-msgstr ""
+msgstr "Add A_ttendee"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:9
-#, fuzzy
 msgid "Organizer:"
-msgstr "Organisation:"
+msgstr "Organiser:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
 msgid "_Change Organizer"
-msgstr "Organisation:"
+msgstr "_Change Organiser"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-meeting-time-sel.c:417
 msgid "_Invite Others..."
-msgstr ""
+msgstr "_Invite Others..."
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
-msgstr ""
+msgstr "<b>Calendar options</b>"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:3
-#, fuzzy
 msgid "Add New Calendar"
-msgstr "Colours"
+msgstr "Add New Calendar"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:4
-#, fuzzy
 msgid "Calendar Group"
-msgstr "Colours"
+msgstr "Calendar Group"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:5
-#, fuzzy
 msgid "Calendar Location"
-msgstr "Colours"
+msgstr "Calendar Location"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:6
-#, fuzzy
 msgid "Calendar Name"
-msgstr "Colours"
+msgstr "Calendar Name"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
-msgstr ""
+msgstr "<b>Task List Options</b>"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:3
-#, fuzzy
 msgid "Add New Task List"
-msgstr "Colours"
+msgstr "Add New Task List"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Group"
-msgstr ""
+msgstr "Task List Group"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:5
-#, fuzzy
 msgid "Task List Name"
-msgstr "Synchronising \"%s\""
+msgstr "Task List Name"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr ""
+msgstr "You are modifying a recurring event, what would you like to modify?"
 
 #: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr ""
+msgstr "You are modifying a recurring task, what would you like to modify?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
 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:72
 msgid "This Instance Only"
-msgstr ""
+msgstr "This Instance Only"
 
 #: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
-msgstr ""
+msgstr "This and Prior Instances"
 
 #: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
-msgstr ""
+msgstr "This and Future Instances"
 
 #: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
-msgstr ""
+msgstr "All Instances"
 
 #: calendar/gui/dialogs/recurrence-page.c:542
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
+msgstr "This appointment contains recurrences that Evolution cannot edit."
 
 #: calendar/gui/dialogs/recurrence-page.c:816
 msgid "Recurrence date is invalid"
-msgstr ""
+msgstr "Recurrence date is invalid"
 
 #: calendar/gui/dialogs/recurrence-page.c:927
 msgid "on"
-msgstr ""
+msgstr "on"
 
 #: calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
-msgstr ""
+msgstr "first"
 
 #: calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
-msgstr ""
+msgstr "second"
 
 #: calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
-msgstr ""
+msgstr "third"
 
 #: calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
-msgstr ""
+msgstr "fourth"
 
 #: calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
-msgstr ""
+msgstr "last"
 
 #: calendar/gui/dialogs/recurrence-page.c:1015
-#, fuzzy
 msgid "Other Date"
-msgstr "Organisation:"
+msgstr "Other Date"
 
 #: calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
-msgstr ""
+msgstr "day"
 
 #: calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
-msgstr ""
+msgstr "on the"
 
 #: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
-msgstr ""
+msgstr "occurrences"
 
 #: calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
-msgstr ""
+msgstr "Date/Time"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
-msgstr ""
+msgstr "Every"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-#, fuzzy
 msgid "Exceptions"
-msgstr "Synchronising \"%s\""
+msgstr "Exceptions"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Preview"
-msgstr ""
+msgstr "Preview"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Recurrence Rule"
-msgstr ""
+msgstr "Recurrence Rule"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "_Custom recurrence"
-msgstr ""
+msgstr "_Custom recurrence"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
-msgstr ""
+msgstr "_Modify"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
-msgstr ""
+msgstr "_No recurrence"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
 msgid "_Remove"
-msgstr ""
+msgstr "_Remove"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Simple recurrence"
-msgstr ""
+msgstr "_Simple recurrence"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
-msgstr ""
+msgstr "for"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "forever"
-msgstr ""
+msgstr "forever"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "month(s)"
-msgstr ""
+msgstr "month(s)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
-msgstr ""
+msgstr "until"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
-msgstr ""
+msgstr "week(s)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
-msgstr ""
+msgstr "year(s)"
 
 #: calendar/gui/dialogs/save-comp.c:53
 msgid ""
@@ -5146,361 +5212,352 @@ msgid ""
 "\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?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
 msgid "_Discard Changes"
-msgstr ""
+msgstr "_Discard Changes"
 
 #: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
 msgid "Save Event"
-msgstr "Synchronising \"%s\""
+msgstr "Save Event"
+
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+msgid "Select source"
+msgstr "Select source"
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr "Select destination %s"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "calendar"
+msgstr "calendar"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "task list"
+msgstr "task list"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
-msgstr ""
+msgstr "The meeting information has been created. Send it?"
 
 #: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
+msgstr "The meeting information has changed. Send an updated version?"
 
 #: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
-msgstr ""
+msgstr "The task assignment information has been created. Send it?"
 
 #: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
-msgstr ""
+msgstr "The task information has changed. Send an updated version?"
 
 #: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
-msgstr ""
+msgstr "Completed date is wrong"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #, no-c-format
 msgid "% _Complete"
-msgstr ""
+msgstr "% _Complete"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
 msgid "Completed"
-msgstr ""
+msgstr "Completed"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
 msgid "High"
-msgstr ""
+msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
 msgid "In Progress"
-msgstr ""
+msgstr "In Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
 msgid "Low"
-msgstr ""
+msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
 #: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
 msgid "Not Started"
-msgstr ""
+msgstr "Not Started"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#, fuzzy
 msgid "Progress"
-msgstr "Colours"
+msgstr "Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:394
 msgid "Undefined"
-msgstr ""
+msgstr "Undefined"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
-msgstr ""
+msgid "_Date completed:"
+msgstr "_Date completed:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
-msgstr ""
+msgstr "_Priority:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
-msgstr ""
+msgstr "_Status:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
-msgstr ""
+msgstr "_Web Page:"
 
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
-msgstr ""
+msgstr "Basic"
 
 #: calendar/gui/dialogs/task-editor.c:207
 #: calendar/gui/dialogs/task-editor.c:270
 #: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
-msgstr ""
+msgstr "Assignment"
 
 #: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
-msgstr ""
+msgstr "Due date is wrong"
 
 #: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
-msgstr ""
+msgstr "Due date is before start date!"
 
 #: calendar/gui/dialogs/task-page.c:810
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr ""
+msgstr "Unable to open tasks in '%s'."
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Con_fidential"
-msgstr ""
+msgstr "Con_fidential"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
-msgstr ""
+msgstr "Description:"
 
 #: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
 msgid "Folder:"
-msgstr "Synchronising \"%s\""
+msgstr "Folder:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
-msgstr ""
+msgid "Sta_rt date:"
+msgstr "Sta_rt date:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
-msgstr ""
+msgid "_Due date:"
+msgstr "_Due date:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+msgstr "Authentication Credentials for HTTP Server"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "Calendars selected for publishing"
-msgstr ""
+msgstr "Calendars selected for publishing"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
 msgid "Daily"
-msgstr "Colours"
+msgstr "Daily"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "Free/Busy Editor"
-msgstr ""
+msgstr "Free/Busy Editor"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Location"
-msgstr ""
+msgstr "Free/Busy Publishing Location"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-#, fuzzy
 msgid "Login name:"
-msgstr "Synchronising \"%s\""
+msgstr "Login name:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 msgid "Password:"
-msgstr ""
+msgstr "Password:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
 msgid "Publishing Frequency"
-msgstr ""
+msgstr "Publishing Frequency"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 msgid "Remember password"
-msgstr ""
+msgstr "Remember password"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "URL:"
-msgstr ""
+msgstr "URL:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
 msgid "User Publishes"
-msgstr ""
+msgstr "User Publishes"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 msgid "Weekly"
-msgstr ""
+msgstr "Weekly"
 
 #: calendar/gui/e-alarm-list.c:395
 #, c-format
-msgid "%d days"
-msgstr ""
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d day"
+msgstr[1] "%d days"
 
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:403
+#: calendar/gui/e-alarm-list.c:400
 #, c-format
-msgid "%d weeks"
-msgstr ""
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d week"
+msgstr[1] "%d weeks"
 
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:411
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
-msgid "%d hours"
-msgstr ""
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
 
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:419
+#: calendar/gui/e-alarm-list.c:410
 #, c-format
-msgid "%d minutes"
-msgstr ""
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
 
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:427
+#: calendar/gui/e-alarm-list.c:415
 #, c-format
-msgid "%d seconds"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr ""
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
 
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
-msgstr ""
+msgstr "Unknown action to be performed"
 
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
-msgstr ""
+msgstr "%s %s before the start of the appointment"
 
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
-msgstr ""
+msgstr "%s %s after the start of the appointment"
 
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
-msgstr ""
+msgstr "%s at the start of the appointment"
 
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
-msgstr ""
+msgstr "%s %s before the end of the appointment"
 
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
-msgstr ""
+msgstr "%s %s after the end of the appointment"
 
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
-msgstr ""
+msgstr "%s at the end of the appointment"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
-msgstr ""
+msgstr "%s at %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
-msgstr ""
+msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
 msgid "Public"
-msgstr ""
+msgstr "Public"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
 #: calendar/gui/e-calendar-table.c:370
 msgid "Private"
-msgstr ""
+msgstr "Private"
 
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
 #: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
-msgstr ""
+msgstr "Confidential"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Synchronising \"%s\""
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "End Date"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
-msgstr ""
+msgstr "Start Date"
 
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
 msgid "Summary"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-#, fuzzy
-msgid "color"
-msgstr "Colours"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr ""
+msgstr "Summary"
 
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
-msgstr ""
+msgstr "Free"
 
 #: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
-msgstr ""
+msgstr "Busy"
 
 #: calendar/gui/e-cal-model-tasks.c:275
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: calendar/gui/e-cal-model-tasks.c:275
 msgid "S"
-msgstr ""
+msgstr "S"
 
 #: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
 msgid "E"
-msgstr ""
+msgstr "E"
 
 #: calendar/gui/e-cal-model-tasks.c:277
 msgid "W"
-msgstr ""
+msgstr "W"
 
 #: calendar/gui/e-cal-model-tasks.c:545
 msgid ""
@@ -5508,253 +5565,262 @@ msgid ""
 "\n"
 "45.436845,125.862501"
 msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 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:1665 camel/camel-gpg-context.c:1716
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
-msgstr ""
+msgstr "Unknown"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
 msgid "Recurring"
-msgstr ""
+msgstr "Recurring"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
 msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr ""
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-#, fuzzy
-msgid "_Settings..."
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Assigned"
 
 #: calendar/gui/e-calendar-table.c:413
 msgid "0%"
-msgstr ""
+msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:414
 msgid "10%"
-msgstr ""
+msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:415
 msgid "20%"
-msgstr ""
+msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:416
 msgid "30%"
-msgstr ""
+msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:417
 msgid "40%"
-msgstr ""
+msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:418
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:419
 msgid "60%"
-msgstr ""
+msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:420
 msgid "70%"
-msgstr ""
+msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:421
 msgid "80%"
-msgstr ""
+msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:422
 msgid "90%"
-msgstr ""
+msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:423
 msgid "100%"
-msgstr ""
+msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+msgid "Deleting selected objects"
+msgstr "Deleting selected objects"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Updating objects"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Open"
+
+#: calendar/gui/e-calendar-table.c:1041
 msgid "Open _Web Page"
-msgstr ""
+msgstr "Open _Web Page"
+
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
+msgstr "_Save As..."
+
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 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:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
+msgstr "_Print..."
+
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: 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:1050
+#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 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:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 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:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
+msgstr "_Paste"
+
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Assign Task"
-msgstr ""
+msgstr "_Assign Task"
 
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
 msgid "_Forward as iCalendar"
-msgstr ""
+msgstr "_Forward as iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
 msgid "_Mark as Complete"
-msgstr ""
+msgstr "_Mark as Complete"
 
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
 msgid "_Mark Selected Tasks as Complete"
-msgstr ""
+msgstr "_Mark Selected Tasks as Complete"
 
-#: calendar/gui/e-calendar-table.c:1058 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
 msgid "_Delete Selected Tasks"
-msgstr ""
+msgstr "_Delete Selected Tasks"
 
-#: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
-msgstr ""
+msgstr "Click to add a task"
 
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr ""
+msgstr "% Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
 msgid "Complete"
-msgstr ""
+msgstr "Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Completion date"
+msgstr "Completion date"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:6
+msgid "Due date"
+msgstr "Due date"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
-msgstr ""
+msgstr "Priority"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Start date"
+msgstr "Start date"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
-msgstr ""
+msgstr "Task sort"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr ""
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
+msgstr "New _Appointment..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "New All Day _Event"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "New Meeting"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "New Task"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "Select _Today"
+
+#: calendar/gui/e-calendar-view.c:1251
+msgid "_Select Date..."
+msgstr "_Select Date..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Publish Free/Busy Information"
+
+#: calendar/gui/e-calendar-view.c:1274
+msgid "Cop_y to Calendar..."
+msgstr "Cop_y to Calendar..."
+
+#: calendar/gui/e-calendar-view.c:1275
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ve to Calendar..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Schedule Meeting..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Forward as iCalendar..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Delete this _Occurrence"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Delete _All Occurrences"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Go to _Today"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Go to Date..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Settings..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5775,574 +5841,574 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 
 #: calendar/gui/e-day-view-time-item.c:532
 #, c-format
 msgid "%02i minute divisions"
-msgstr ""
+msgstr "%02i minute divisions"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 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 ""
+msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
-msgstr ""
+msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
-msgstr ""
+msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
-msgstr ""
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:591
 msgid "Yes. (Complex Recurrence)"
-msgstr ""
+msgstr "Yes. (Complex Recurrence)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, c-format
 msgid "Every day"
-msgstr ""
+msgid_plural "Every %d days"
+msgstr[0] "Every day"
+msgstr[1] "Every %d days"
 
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:607
 #, c-format
-msgid "Every %d days"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:611
 msgid "Every week"
-msgstr ""
+msgid_plural "Every %d weeks"
+msgstr[0] "Every week"
+msgstr[1] "Every %d weeks"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
 #, c-format
-msgid "Every %d weeks"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:616
 msgid "Every week on "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr ""
+msgid_plural "Every %d weeks on "
+msgstr[0] "Every week on "
+msgstr[1] "Every %d weeks on "
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
 msgid " and "
-msgstr ""
+msgstr " and "
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
 #, c-format
 msgid "The %s day of "
-msgstr ""
+msgstr "The %s day of "
 
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
 #, c-format
 msgid "The %s %s of "
-msgstr ""
+msgstr "The %s %s of "
 
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, c-format
 msgid "every month"
-msgstr ""
+msgid_plural "every %d months"
+msgstr[0] "every %d month"
+msgstr[1] "every %d month"
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:648
 #, c-format
-msgid "every %d months"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:662
 msgid "Every year"
-msgstr ""
+msgid_plural "Every %d years"
+msgstr[0] "Every %d year"
+msgstr[1] "Every %d years"
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:659
 #, c-format
-msgid "Every %d years"
-msgstr ""
+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:676
-#, c-format
-msgid " a total of %d times"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
 msgid ", ending on "
-msgstr ""
+msgstr ", ending on "
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
 msgid "<b>Starts:</b> "
-msgstr ""
+msgstr "<b>Starts:</b> "
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
 msgid "<b>Ends:</b> "
-msgstr ""
+msgstr "<b>Ends:</b> "
 
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
 msgid "<b>Completed:</b> "
-msgstr ""
+msgstr "<b>Completed:</b> "
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
 msgid "<b>Due:</b> "
-msgstr ""
+msgstr "<b>Due:</b> "
 
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
-msgstr ""
+msgstr "iCalendar Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
 msgid "iCalendar Error"
-msgstr ""
+msgstr "iCalendar Error"
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
 msgid "An unknown person"
-msgstr ""
+msgstr "An unknown person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
 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:936
+#: calendar/gui/e-itip-control.c:919
 msgid "<i>None</i>"
-msgstr ""
+msgstr "<i>None</i>"
+
+#: calendar/gui/e-itip-control.c:930
+msgid "Location:"
+msgstr "Location:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
 msgid "Status:"
-msgstr ""
+msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
-msgstr ""
+msgstr "Accepted"
 
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
-msgstr ""
+msgstr "Tentatively Accepted"
 
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
 #: 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 ""
+msgstr "Declined"
 
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
 msgid "Choose an action:"
-msgstr ""
+msgstr "Choose an action:"
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
 msgid "Update"
-msgstr ""
+msgstr "Update"
 
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
 #: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
 msgid "Accept"
-msgstr ""
+msgstr "Accept"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
 msgid "Tentatively accept"
-msgstr ""
+msgstr "Tentatively accept"
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
 msgid "Decline"
-msgstr ""
+msgstr "Decline"
 
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
 msgid "Send Free/Busy Information"
-msgstr ""
+msgstr "Send Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
 msgid "Update respondent status"
-msgstr ""
+msgstr "Update respondent status"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
 msgid "Send Latest Information"
-msgstr ""
+msgstr "Send Latest Information"
 
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
 #, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr ""
+msgstr "<b>%s</b> has published meeting information."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
 msgid "Meeting Information"
-msgstr ""
+msgstr "Meeting Information"
 
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr ""
+msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
+msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
 msgid "Meeting Proposal"
-msgstr ""
+msgstr "Meeting Proposal"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
+msgstr "<b>%s</b> wishes to add to an existing meeting."
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
 msgid "Meeting Update"
-msgstr ""
+msgstr "Meeting Update"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
+msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Update Request"
-msgstr ""
+msgstr "Meeting Update Request"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr ""
+msgstr "<b>%s</b> has replied to a meeting request."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Reply"
-msgstr ""
+msgstr "Meeting Reply"
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
+msgstr "<b>%s</b> has cancelled a meeting."
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
 msgid "Meeting Cancellation"
-msgstr ""
+msgstr "Meeting Cancellation"
 
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
 msgid "Bad Meeting Message"
-msgstr ""
+msgstr "Bad Meeting Message"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
 #, c-format
 msgid "<b>%s</b> has published task information."
-msgstr ""
+msgstr "<b>%s</b> has published task information."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
 msgid "Task Information"
-msgstr ""
+msgstr "Task Information"
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr ""
+msgstr "<b>%s</b> requests %s to perform a task."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1262
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr ""
+msgstr "<b>%s</b> requests you perform a task."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
 msgid "Task Proposal"
-msgstr ""
+msgstr "Task Proposal"
 
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
+msgstr "<b>%s</b> wishes to add to an existing task."
 
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
 msgid "Task Update"
-msgstr ""
+msgstr "Task Update"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
+msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Update Request"
-msgstr ""
+msgstr "Task Update Request"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr ""
+msgstr "<b>%s</b> has replied to a task assignment."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Reply"
-msgstr ""
+msgstr "Task Reply"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
-msgstr ""
+msgstr "<b>%s</b> has cancelled a task."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
 msgid "Task Cancellation"
-msgstr ""
+msgstr "Task Cancellation"
 
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
 msgid "Bad Task Message"
-msgstr ""
+msgstr "Bad Task Message"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
-msgstr ""
+msgstr "<b>%s</b> has published free/busy information."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
 msgid "Free/Busy Information"
-msgstr ""
+msgstr "Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
+msgstr "<b>%s</b> requests your free/busy information."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
 msgid "Free/Busy Request"
-msgstr ""
+msgstr "Free/Busy Request"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
+msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
 msgid "Free/Busy Reply"
-msgstr ""
+msgstr "Free/Busy Reply"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
 msgid "Bad Free/Busy Message"
-msgstr ""
+msgstr "Bad Free/Busy Message"
 
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
 msgid "The message does not appear to be properly formed"
-msgstr ""
+msgstr "The message does not appear to be properly formed"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
 msgid "The message contains only unsupported requests."
-msgstr ""
+msgstr "The message contains only unsupported requests."
 
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
 msgid "The attachment does not contain a valid calendar message"
-msgstr ""
+msgstr "The attachment does not contain a valid calendar message"
 
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
 msgid "The attachment has no viewable calendar items"
-msgstr ""
+msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
 msgid "Calendar file could not be updated!\n"
-msgstr ""
+msgstr "Calendar file could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
 msgid "Update complete\n"
-msgstr ""
+msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
+msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
 msgid "Object is invalid and cannot be updated\n"
-msgstr ""
+msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
+msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
+msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
 msgid "There was an error on the CORBA system\n"
-msgstr ""
+msgstr "There was an error on the CORBA system\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
 msgid "Object could not be found\n"
-msgstr ""
+msgstr "Object could not be found\n"
 
-#: calendar/gui/e-itip-control.c:1870
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1853
 msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Synchronising \"%s\""
+msgstr "You don't have the right permissions to update the calendar\n"
 
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
 msgid "Attendee status updated\n"
-msgstr ""
+msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
 msgid "Attendee status could not be updated!\n"
-msgstr ""
+msgstr "Attendee status could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
 msgid "Removal Complete"
-msgstr ""
+msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
 msgid "Item sent!\n"
-msgstr ""
+msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
 msgid "The item could not be sent!\n"
-msgstr ""
+msgstr "The item could not be sent!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
-msgstr ""
+msgstr "%P %%"
 
 #: calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
-msgstr ""
+msgstr "--to--"
 
 #: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
-msgstr ""
+msgstr "Calendar Message"
 
 #: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
-msgstr ""
+msgstr "Date:"
 
 #: calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
-msgstr ""
+msgstr "Loading Calendar"
 
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
-msgstr ""
+msgstr "Loading calendar..."
 
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
-msgstr ""
+msgstr "Server Message:"
 
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
-msgstr ""
+msgstr "date-end"
 
 #: calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
-msgstr ""
+msgstr "date-start"
 
 #: calendar/gui/e-meeting-list-view.c:62
 msgid "Chair Persons"
-msgstr ""
+msgstr "Chair Persons"
 
 #: calendar/gui/e-meeting-list-view.c:63
 #: calendar/gui/e-meeting-list-view.c:479
 msgid "Required Participants"
-msgstr ""
+msgstr "Required Participants"
 
 #: calendar/gui/e-meeting-list-view.c:64
 msgid "Optional Participants"
-msgstr ""
+msgstr "Optional Participants"
 
 #: calendar/gui/e-meeting-list-view.c:65
 msgid "Resources"
-msgstr ""
+msgstr "Resources"
 
 #: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
-msgstr ""
+msgstr "Individual"
 
 #: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
-msgstr ""
+msgstr "Group"
 
 #: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
-msgstr ""
+msgstr "Resource"
 
 #: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
-msgstr ""
+msgstr "Room"
 
 #: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
-msgstr ""
+msgstr "Chair"
 
 #: calendar/gui/e-meeting-list-view.c:155 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 ""
+msgstr "Required Participant"
 
 #: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
-msgstr ""
+msgstr "Optional Participant"
 
 #: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
-msgstr ""
+msgstr "Non-Participant"
 
 #: calendar/gui/e-meeting-list-view.c:179 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 ""
+msgstr "Needs Action"
 
 #: calendar/gui/e-meeting-list-view.c:182 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 ""
+msgstr "Tentative"
 
 #: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
-msgstr ""
+msgstr "Delegated"
 
 #: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
 msgid "In Process"
-msgstr ""
+msgstr "In Process"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
 #: calendar/gui/e-meeting-time-sel.c:2060
 msgid "%A, %B %d, %Y"
-msgstr ""
+msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
@@ -6355,280 +6421,287 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: 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
 msgid "Out of Office"
-msgstr ""
+msgstr "Out of Office"
 
 #: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
-msgstr ""
+msgstr "No Information"
 
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
-msgstr ""
+msgstr "_Options"
 
 #: calendar/gui/e-meeting-time-sel.c:457
 msgid "Show _Only Working Hours"
-msgstr ""
+msgstr "Show _Only Working Hours"
 
 #: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Zoomed Out"
-msgstr ""
+msgstr "Show _Zoomed Out"
 
 #: calendar/gui/e-meeting-time-sel.c:482
 msgid "_Update Free/Busy"
-msgstr ""
+msgstr "_Update Free/Busy"
 
 #: calendar/gui/e-meeting-time-sel.c:497
 msgid "_<<"
-msgstr ""
+msgstr "_<<"
 
 #: calendar/gui/e-meeting-time-sel.c:515
 msgid "_Autopick"
-msgstr ""
+msgstr "_Autopick"
 
 #: calendar/gui/e-meeting-time-sel.c:530
 msgid ">_>"
-msgstr ""
+msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
 msgid "_All People and Resources"
-msgstr ""
+msgstr "_All People and Resources"
 
 #: calendar/gui/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
-msgstr ""
+msgstr "All _People and One Resource"
 
 #: calendar/gui/e-meeting-time-sel.c:565
 msgid "_Required People"
-msgstr ""
+msgstr "_Required People"
 
 #: calendar/gui/e-meeting-time-sel.c:574
 msgid "Required People and _One Resource"
-msgstr ""
+msgstr "Required People and _One Resource"
 
 #: calendar/gui/e-meeting-time-sel.c:593
 msgid "Meeting _start time:"
-msgstr ""
+msgstr "Meeting _start time:"
 
 #: calendar/gui/e-meeting-time-sel.c:613
 msgid "Meeting _end time:"
-msgstr ""
+msgstr "Meeting _end time:"
 
 #: calendar/gui/e-tasks.c:177
-#, fuzzy
 msgid "Start Date:"
-msgstr "Organisation:"
+msgstr "Start Date:"
 
 #: calendar/gui/e-tasks.c:193
-#, fuzzy
 msgid "Due Date:"
-msgstr "Organisation:"
+msgstr "Due Date:"
 
 #. write priority
 #: calendar/gui/e-tasks.c:221
 msgid "Priority:"
-msgstr ""
+msgstr "Priority:"
 
 #. URL
 #: calendar/gui/e-tasks.c:277
 msgid "Web Page:"
-msgstr ""
+msgstr "Web Page:"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
 #, c-format
 msgid "Click to open %s"
-msgstr ""
+msgstr "Click to open %s"
 
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
+"Error on %s:\n"
+" %s"
 
 #. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:792
 #, c-format
 msgid ""
 "The task backend for\n"
 "%s\n"
 " has crashed."
 msgstr ""
+"The task backend for\n"
+"%s\n"
+" has crashed."
 
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
 #, c-format
 msgid "Opening tasks at %s"
-msgstr ""
+msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
+"Error opening %s:\n"
+"%s"
 
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
 msgid "Loading tasks"
-msgstr ""
+msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
 msgid "Completing tasks..."
-msgstr ""
+msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
 msgid "Deleting selected objects..."
-msgstr ""
+msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
 msgid "Expunging"
-msgstr ""
+msgstr "Expunging"
 
-#: calendar/gui/gnome-cal.c:1751
+#: calendar/gui/gnome-cal.c:1758
 #, c-format
-msgid "Loading tasks at %s"
-msgstr ""
+msgid "Loading appointments at %s"
+msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1777
 #, c-format
-msgid "Loading appointments at %s"
-msgstr ""
+msgid "Loading tasks at %s"
+msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:1796
-#, fuzzy, c-format
+#: calendar/gui/gnome-cal.c:1797
+#, c-format
 msgid "Opening %s"
-msgstr "Synchronise \"%s\""
+msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1926
 #, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
-msgstr ""
+msgid "The calendar backend for '%s' has crashed."
+msgstr "The calendar backend for '%s' has crashed."
+
+#: calendar/gui/gnome-cal.c:1938
+#, c-format
+msgid "The task backend for '%s' has crashed."
+msgstr "The task backend for '%s' has crashed."
 
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2752
 msgid "Purging"
-msgstr ""
+msgstr "Purging"
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
-msgstr ""
+msgstr "February"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr ""
+msgid "January"
+msgstr "January"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "January"
-msgstr ""
+msgid "July"
+msgstr "July"
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "July"
-msgstr ""
+msgid "June"
+msgstr "June"
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "June"
-msgstr ""
+msgid "March"
+msgstr "March"
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "March"
-msgstr ""
+msgid "May"
+msgstr "May"
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "May"
-msgstr ""
+msgid "November"
+msgstr "November"
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "November"
-msgstr ""
+msgid "October"
+msgstr "October"
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "October"
-msgstr ""
+msgid "Select Date"
+msgstr "Select Date"
 
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr ""
+msgid "_Select Today"
+msgstr "_Select Today"
 
 #: 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 ""
+msgstr "An organiser must be set."
 
 #: calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
-msgstr ""
+msgstr "At least one attendee is necessary"
 
 #: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
-msgstr ""
+msgstr "Event information"
 
 #: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
-msgstr ""
+msgstr "Task information"
 
 #: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
-msgstr ""
+msgstr "Journal information"
 
 #: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
-msgstr ""
+msgstr "Free/Busy information"
 
 #: calendar/gui/itip-utils.c:402
 msgid "Calendar information"
-msgstr ""
+msgstr "Calendar information"
 
 #: calendar/gui/itip-utils.c:438
 msgid "Updated"
-msgstr ""
+msgstr "Updated"
 
 #: calendar/gui/itip-utils.c:446
 msgid "Refresh"
-msgstr ""
+msgstr "Refresh"
 
 #: calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
-msgstr ""
+msgstr "Counter-proposal"
 
 #: calendar/gui/itip-utils.c:521
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr ""
+msgstr "Free/Busy information (%s to %s)"
 
 #: calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
-msgstr ""
+msgstr "iCalendar information"
 
 #: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
-msgstr ""
+msgstr "You must be an attendee of the event."
 
 #: calendar/gui/itip-utils.c:1157
 #, c-format
 msgid "Enter the password for %s"
-msgstr ""
+msgstr "Enter the password for %s"
 
 #: calendar/gui/migration.c:137
 msgid ""
@@ -6637,6 +6710,10 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 
 #: calendar/gui/migration.c:141
 msgid ""
@@ -6645,296 +6722,297 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 
 #: calendar/gui/migration.c:366
 msgid "Birthdays & Anniversaries"
-msgstr ""
+msgstr "Birthdays & Anniversaries"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
 msgid "On The Web"
-msgstr ""
+msgstr "On The Web"
 
 #: calendar/gui/print.c:489
 msgid "1st"
-msgstr ""
+msgstr "1st"
 
 #: calendar/gui/print.c:489
 msgid "2nd"
-msgstr ""
+msgstr "2nd"
 
 #: calendar/gui/print.c:489
 msgid "3rd"
-msgstr ""
+msgstr "3rd"
 
 #: calendar/gui/print.c:489
 msgid "4th"
-msgstr ""
+msgstr "4th"
 
 #: calendar/gui/print.c:489
 msgid "5th"
-msgstr ""
+msgstr "5th"
 
 #: calendar/gui/print.c:490
 msgid "6th"
-msgstr ""
+msgstr "6th"
 
 #: calendar/gui/print.c:490
 msgid "7th"
-msgstr ""
+msgstr "7th"
 
 #: calendar/gui/print.c:490
 msgid "8th"
-msgstr ""
+msgstr "8th"
 
 #: calendar/gui/print.c:490
 msgid "9th"
-msgstr ""
+msgstr "9th"
 
 #: calendar/gui/print.c:490
 msgid "10th"
-msgstr ""
+msgstr "10th"
 
 #: calendar/gui/print.c:491
 msgid "11th"
-msgstr ""
+msgstr "11th"
 
 #: calendar/gui/print.c:491
 msgid "12th"
-msgstr ""
+msgstr "12th"
 
 #: calendar/gui/print.c:491
 msgid "13th"
-msgstr ""
+msgstr "13th"
 
 #: calendar/gui/print.c:491
 msgid "14th"
-msgstr ""
+msgstr "14th"
 
 #: calendar/gui/print.c:491
 msgid "15th"
-msgstr ""
+msgstr "15th"
 
 #: calendar/gui/print.c:492
 msgid "16th"
-msgstr ""
+msgstr "16th"
 
 #: calendar/gui/print.c:492
 msgid "17th"
-msgstr ""
+msgstr "17th"
 
 #: calendar/gui/print.c:492
 msgid "18th"
-msgstr ""
+msgstr "18th"
 
 #: calendar/gui/print.c:492
 msgid "19th"
-msgstr ""
+msgstr "19th"
 
 #: calendar/gui/print.c:492
 msgid "20th"
-msgstr ""
+msgstr "20th"
 
 #: calendar/gui/print.c:493
 msgid "21st"
-msgstr ""
+msgstr "21st"
 
 #: calendar/gui/print.c:493
 msgid "22nd"
-msgstr ""
+msgstr "22nd"
 
 #: calendar/gui/print.c:493
 msgid "23rd"
-msgstr ""
+msgstr "23rd"
 
 #: calendar/gui/print.c:493
 msgid "24th"
-msgstr ""
+msgstr "24th"
 
 #: calendar/gui/print.c:493
 msgid "25th"
-msgstr ""
+msgstr "25th"
 
 #: calendar/gui/print.c:494
 msgid "26th"
-msgstr ""
+msgstr "26th"
 
 #: calendar/gui/print.c:494
 msgid "27th"
-msgstr ""
+msgstr "27th"
 
 #: calendar/gui/print.c:494
 msgid "28th"
-msgstr ""
+msgstr "28th"
 
 #: calendar/gui/print.c:494
 msgid "29th"
-msgstr ""
+msgstr "29th"
 
 #: calendar/gui/print.c:494
 msgid "30th"
-msgstr ""
+msgstr "30th"
 
 #: calendar/gui/print.c:495
 msgid "31st"
-msgstr ""
+msgstr "31st"
 
 #: calendar/gui/print.c:570
 msgid "Su"
-msgstr ""
+msgstr "Su"
 
 #: calendar/gui/print.c:570
 msgid "Mo"
-msgstr ""
+msgstr "Mo"
 
 #: calendar/gui/print.c:570
 msgid "Tu"
-msgstr ""
+msgstr "Tu"
 
 #: calendar/gui/print.c:570
 msgid "We"
-msgstr ""
+msgstr "We"
 
 #: calendar/gui/print.c:571
 msgid "Th"
-msgstr ""
+msgstr "Th"
 
 #: calendar/gui/print.c:571
 msgid "Fr"
-msgstr ""
+msgstr "Fr"
 
 #: calendar/gui/print.c:571
 msgid "Sa"
-msgstr ""
+msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
-msgstr ""
+msgstr "Selected day (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
-msgstr ""
+msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
-msgstr ""
+msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1945 calendar/gui/print.c:1947
-#: calendar/gui/print.c:1948
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
-msgstr ""
+msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
-msgstr ""
+msgstr "Selected week (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
-msgstr ""
+msgstr "Selected month (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
-msgstr ""
+msgstr "Selected year (%Y)"
 
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
 msgid "Task"
-msgstr ""
+msgstr "Task"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
-msgstr ""
+msgstr "Status: %s"
 
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
-msgstr ""
+msgstr "Priority: %s"
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
-msgstr ""
+msgstr "Percent Complete: %i"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
-msgstr ""
+msgstr "URL: %s"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
-msgstr ""
+msgstr "Categories: %s"
 
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
-msgstr ""
+msgstr "Contacts: "
 
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
 msgid "Print Preview"
-msgstr ""
+msgstr "Print Preview"
 
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
 msgid "Print Item"
-msgstr ""
+msgstr "Print Item"
 
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
-msgstr ""
+msgstr "Print Setup"
 
 #: calendar/gui/tasks-component.c:302
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
+msgstr "Task List '%s' will be removed. Are you sure you want to continue?"
 
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
 msgid "New task"
-msgstr ""
+msgstr "New task"
 
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
 msgid "_Task"
-msgstr ""
+msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
 msgid "Create a new task"
-msgstr ""
+msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:565
-#, fuzzy
+#: calendar/gui/tasks-component.c:567
 msgid "New task list"
-msgstr "Organisation:"
+msgstr "New task list"
 
-#: calendar/gui/tasks-component.c:566
-#, fuzzy
+#: calendar/gui/tasks-component.c:568
 msgid "_Task List"
-msgstr "Organisation:"
+msgstr "_Task List"
 
-#: calendar/gui/tasks-component.c:567
-#, fuzzy
+#: calendar/gui/tasks-component.c:569
 msgid "Create a new task list"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new task list"
 
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
+msgstr "Unable to open the task list '%s' for creating events and meetings"
 
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
 msgid "There is no calendar available for creating tasks"
-msgstr ""
+msgstr "There is no calendar available for creating tasks"
 
 #: calendar/gui/tasks-control.c:152
 msgid "The URI of the tasks folder to display"
-msgstr ""
+msgstr "The URI of the tasks folder to display"
 
 #: calendar/gui/tasks-control.c:211
 #, c-format
 msgid "Could not load the tasks in `%s'"
-msgstr ""
+msgstr "Could not load the tasks in `%s'"
 
 #: calendar/gui/tasks-control.c:478
 msgid ""
@@ -6943,63 +7021,66 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
 
 #: calendar/gui/tasks-control.c:481
 msgid "Do not ask me again."
-msgstr ""
+msgstr "Do not ask me again."
 
 #: calendar/gui/tasks-control.c:539
 msgid "Print Tasks"
-msgstr ""
+msgstr "Print Tasks"
 
 #: calendar/gui/weekday-picker.c:326
 msgid "SMTWTFS"
-msgstr ""
+msgstr "SMTWTFS"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Calendar intelligent importer"
-msgstr "Cannot initialise Evolution's mail summary component."
+msgstr "Evolution Calendar intelligent importer"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-#, fuzzy
 msgid "Evolution iCalendar importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution iCalendar importer"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-#, fuzzy
 msgid "Evolution vCalendar importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution vCalendar importer"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
 msgid "iCalendar files (.ics)"
-msgstr ""
+msgstr "iCalendar files (.ics)"
 
 #: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
 msgid "vCalendar files (.vcf)"
-msgstr ""
+msgstr "vCalendar files (.vcf)"
 
 #: calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
-msgstr ""
+msgstr "Appointments and Meetings"
 
 #: calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
-msgstr ""
+msgstr "Reminder!!"
 
 #: calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
-msgstr ""
+msgstr "Calendar Events"
 
 #: calendar/importers/icalendar-importer.c:727
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
 
 #: calendar/importers/icalendar-importer.c:734
 msgid "Gnome Calendar"
-msgstr ""
+msgstr "Gnome Calendar"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -7008,1684 +7089,1687 @@ msgstr ""
 #.
 #: calendar/zones.h:7
 msgid "Africa/Abidjan"
-msgstr ""
+msgstr "Africa/Abidjan"
 
 #: calendar/zones.h:8
 msgid "Africa/Accra"
-msgstr ""
+msgstr "Africa/Accra"
 
 #: calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
-msgstr ""
+msgstr "Africa/Addis_Ababa"
 
 #: calendar/zones.h:10
 msgid "Africa/Algiers"
-msgstr ""
+msgstr "Africa/Algiers"
 
 #: calendar/zones.h:11
 msgid "Africa/Asmera"
-msgstr ""
+msgstr "Africa/Asmera"
 
 #: calendar/zones.h:12
 msgid "Africa/Bamako"
-msgstr ""
+msgstr "Africa/Bamako"
 
 #: calendar/zones.h:13
 msgid "Africa/Bangui"
-msgstr ""
+msgstr "Africa/Bangui"
 
 #: calendar/zones.h:14
 msgid "Africa/Banjul"
-msgstr ""
+msgstr "Africa/Banjul"
 
 #: calendar/zones.h:15
 msgid "Africa/Bissau"
-msgstr ""
+msgstr "Africa/Bissau"
 
 #: calendar/zones.h:16
 msgid "Africa/Blantyre"
-msgstr ""
+msgstr "Africa/Blantyre"
 
 #: calendar/zones.h:17
 msgid "Africa/Brazzaville"
-msgstr ""
+msgstr "Africa/Brazzaville"
 
 #: calendar/zones.h:18
 msgid "Africa/Bujumbura"
-msgstr ""
+msgstr "Africa/Bujumbura"
 
 #: calendar/zones.h:19
 msgid "Africa/Cairo"
-msgstr ""
+msgstr "Africa/Cairo"
 
 #: calendar/zones.h:20
 msgid "Africa/Casablanca"
-msgstr ""
+msgstr "Africa/Casablanca"
 
 #: calendar/zones.h:21
 msgid "Africa/Ceuta"
-msgstr ""
+msgstr "Africa/Ceuta"
 
 #: calendar/zones.h:22
 msgid "Africa/Conakry"
-msgstr ""
+msgstr "Africa/Conakry"
 
 #: calendar/zones.h:23
 msgid "Africa/Dakar"
-msgstr ""
+msgstr "Africa/Dakar"
 
 #: calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
-msgstr ""
+msgstr "Africa/Dar_es_Salaam"
 
 #: calendar/zones.h:25
 msgid "Africa/Djibouti"
-msgstr ""
+msgstr "Africa/Djibouti"
 
 #: calendar/zones.h:26
 msgid "Africa/Douala"
-msgstr ""
+msgstr "Africa/Douala"
 
 #: calendar/zones.h:27
 msgid "Africa/El_Aaiun"
-msgstr ""
+msgstr "Africa/El_Aaiun"
 
 #: calendar/zones.h:28
 msgid "Africa/Freetown"
-msgstr ""
+msgstr "Africa/Freetown"
 
 #: calendar/zones.h:29
 msgid "Africa/Gaborone"
-msgstr ""
+msgstr "Africa/Gaborone"
 
 #: calendar/zones.h:30
 msgid "Africa/Harare"
-msgstr ""
+msgstr "Africa/Harare"
 
 #: calendar/zones.h:31
 msgid "Africa/Johannesburg"
-msgstr ""
+msgstr "Africa/Johannesburg"
 
 #: calendar/zones.h:32
 msgid "Africa/Kampala"
-msgstr ""
+msgstr "Africa/Kampala"
 
 #: calendar/zones.h:33
 msgid "Africa/Khartoum"
-msgstr ""
+msgstr "Africa/Khartoum"
 
 #: calendar/zones.h:34
 msgid "Africa/Kigali"
-msgstr ""
+msgstr "Africa/Kigali"
 
 #: calendar/zones.h:35
 msgid "Africa/Kinshasa"
-msgstr ""
+msgstr "Africa/Kinshasa"
 
 #: calendar/zones.h:36
 msgid "Africa/Lagos"
-msgstr ""
+msgstr "Africa/Lagos"
 
 #: calendar/zones.h:37
 msgid "Africa/Libreville"
-msgstr ""
+msgstr "Africa/Libreville"
 
 #: calendar/zones.h:38
 msgid "Africa/Lome"
-msgstr ""
+msgstr "Africa/Lome"
 
 #: calendar/zones.h:39
 msgid "Africa/Luanda"
-msgstr ""
+msgstr "Africa/Luanda"
 
 #: calendar/zones.h:40
 msgid "Africa/Lubumbashi"
-msgstr ""
+msgstr "Africa/Lubumbashi"
 
 #: calendar/zones.h:41
 msgid "Africa/Lusaka"
-msgstr ""
+msgstr "Africa/Lusaka"
 
 #: calendar/zones.h:42
 msgid "Africa/Malabo"
-msgstr ""
+msgstr "Africa/Malabo"
 
 #: calendar/zones.h:43
 msgid "Africa/Maputo"
-msgstr ""
+msgstr "Africa/Maputo"
 
 #: calendar/zones.h:44
 msgid "Africa/Maseru"
-msgstr ""
+msgstr "Africa/Maseru"
 
 #: calendar/zones.h:45
 msgid "Africa/Mbabane"
-msgstr ""
+msgstr "Africa/Mbabane"
 
 #: calendar/zones.h:46
 msgid "Africa/Mogadishu"
-msgstr ""
+msgstr "Africa/Mogadishu"
 
 #: calendar/zones.h:47
 msgid "Africa/Monrovia"
-msgstr ""
+msgstr "Africa/Monrovia"
 
 #: calendar/zones.h:48
 msgid "Africa/Nairobi"
-msgstr ""
+msgstr "Africa/Nairobi"
 
 #: calendar/zones.h:49
 msgid "Africa/Ndjamena"
-msgstr ""
+msgstr "Africa/Ndjamena"
 
 #: calendar/zones.h:50
 msgid "Africa/Niamey"
-msgstr ""
+msgstr "Africa/Niamey"
 
 #: calendar/zones.h:51
 msgid "Africa/Nouakchott"
-msgstr ""
+msgstr "Africa/Nouakchott"
 
 #: calendar/zones.h:52
 msgid "Africa/Ouagadougou"
-msgstr ""
+msgstr "Africa/Ouagadougou"
 
 #: calendar/zones.h:53
 msgid "Africa/Porto-Novo"
-msgstr ""
+msgstr "Africa/Porto-Novo"
 
 #: calendar/zones.h:54
 msgid "Africa/Sao_Tome"
-msgstr ""
+msgstr "Africa/Sao_Tome"
 
 #: calendar/zones.h:55
 msgid "Africa/Timbuktu"
-msgstr ""
+msgstr "Africa/Timbuktu"
 
 #: calendar/zones.h:56
 msgid "Africa/Tripoli"
-msgstr ""
+msgstr "Africa/Tripoli"
 
 #: calendar/zones.h:57
 msgid "Africa/Tunis"
-msgstr ""
+msgstr "Africa/Tunis"
 
 #: calendar/zones.h:58
 msgid "Africa/Windhoek"
-msgstr ""
+msgstr "Africa/Windhoek"
 
 #: calendar/zones.h:59
 msgid "America/Adak"
-msgstr ""
+msgstr "America/Adak"
 
 #: calendar/zones.h:60
 msgid "America/Anchorage"
-msgstr ""
+msgstr "America/Anchorage"
 
 #: calendar/zones.h:61
 msgid "America/Anguilla"
-msgstr ""
+msgstr "America/Anguilla"
 
 #: calendar/zones.h:62
 msgid "America/Antigua"
-msgstr ""
+msgstr "America/Antigua"
 
 #: calendar/zones.h:63
 msgid "America/Araguaina"
-msgstr ""
+msgstr "America/Araguaina"
 
 #: calendar/zones.h:64
 msgid "America/Aruba"
-msgstr ""
+msgstr "America/Aruba"
 
 #: calendar/zones.h:65
 msgid "America/Asuncion"
-msgstr ""
+msgstr "America/Asuncion"
 
 #: calendar/zones.h:66
 msgid "America/Barbados"
-msgstr ""
+msgstr "America/Barbados"
 
 #: calendar/zones.h:67
 msgid "America/Belem"
-msgstr ""
+msgstr "America/Belem"
 
 #: calendar/zones.h:68
 msgid "America/Belize"
-msgstr ""
+msgstr "America/Belize"
 
 #: calendar/zones.h:69
 msgid "America/Boa_Vista"
-msgstr ""
+msgstr "America/Boa_Vista"
 
 #: calendar/zones.h:70
 msgid "America/Bogota"
-msgstr ""
+msgstr "America/Bogota"
 
 #: calendar/zones.h:71
 msgid "America/Boise"
-msgstr ""
+msgstr "America/Boise"
 
 #: calendar/zones.h:72
 msgid "America/Buenos_Aires"
-msgstr ""
+msgstr "America/Buenos_Aires"
 
 #: calendar/zones.h:73
 msgid "America/Cambridge_Bay"
-msgstr ""
+msgstr "America/Cambridge_Bay"
 
 #: calendar/zones.h:74
 msgid "America/Cancun"
-msgstr ""
+msgstr "America/Cancun"
 
 #: calendar/zones.h:75
 msgid "America/Caracas"
-msgstr ""
+msgstr "America/Caracas"
 
 #: calendar/zones.h:76
 msgid "America/Catamarca"
-msgstr ""
+msgstr "America/Catamarca"
 
 #: calendar/zones.h:77
 msgid "America/Cayenne"
-msgstr ""
+msgstr "America/Cayenne"
 
 #: calendar/zones.h:78
 msgid "America/Cayman"
-msgstr ""
+msgstr "America/Cayman"
 
 #: calendar/zones.h:79
 msgid "America/Chicago"
-msgstr ""
+msgstr "America/Chicago"
 
 #: calendar/zones.h:80
 msgid "America/Chihuahua"
-msgstr ""
+msgstr "America/Chihuahua"
 
 #: calendar/zones.h:81
 msgid "America/Cordoba"
-msgstr ""
+msgstr "America/Cordoba"
 
 #: calendar/zones.h:82
 msgid "America/Costa_Rica"
-msgstr ""
+msgstr "America/Costa_Rica"
 
 #: calendar/zones.h:83
 msgid "America/Cuiaba"
-msgstr ""
+msgstr "America/Cuiaba"
 
 #: calendar/zones.h:84
 msgid "America/Curacao"
-msgstr ""
+msgstr "America/Curacao"
 
 #: calendar/zones.h:85
 msgid "America/Danmarkshavn"
-msgstr ""
+msgstr "America/Danmarkshavn"
 
 #: calendar/zones.h:86
 msgid "America/Dawson"
-msgstr ""
+msgstr "America/Dawson"
 
 #: calendar/zones.h:87
 msgid "America/Dawson_Creek"
-msgstr ""
+msgstr "America/Dawson_Creek"
 
 #: calendar/zones.h:88
 msgid "America/Denver"
-msgstr ""
+msgstr "America/Denver"
 
 #: calendar/zones.h:89
 msgid "America/Detroit"
-msgstr ""
+msgstr "America/Detroit"
 
 #: calendar/zones.h:90
 msgid "America/Dominica"
-msgstr ""
+msgstr "America/Dominica"
 
 #: calendar/zones.h:91
 msgid "America/Edmonton"
-msgstr ""
+msgstr "America/Edmonton"
 
 #: calendar/zones.h:92
 msgid "America/Eirunepe"
-msgstr ""
+msgstr "America/Eirunepe"
 
 #: calendar/zones.h:93
 msgid "America/El_Salvador"
-msgstr ""
+msgstr "America/El_Salvador"
 
 #: calendar/zones.h:94
 msgid "America/Fortaleza"
-msgstr ""
+msgstr "America/Fortaleza"
 
 #: calendar/zones.h:95
 msgid "America/Glace_Bay"
-msgstr ""
+msgstr "America/Glace_Bay"
 
 #: calendar/zones.h:96
 msgid "America/Godthab"
-msgstr ""
+msgstr "America/Godthab"
 
 #: calendar/zones.h:97
 msgid "America/Goose_Bay"
-msgstr ""
+msgstr "America/Goose_Bay"
 
 #: calendar/zones.h:98
 msgid "America/Grand_Turk"
-msgstr ""
+msgstr "America/Grand_Turk"
 
 #: calendar/zones.h:99
 msgid "America/Grenada"
-msgstr ""
+msgstr "America/Grenada"
 
 #: calendar/zones.h:100
 msgid "America/Guadeloupe"
-msgstr ""
+msgstr "America/Guadeloupe"
 
 #: calendar/zones.h:101
 msgid "America/Guatemala"
-msgstr ""
+msgstr "America/Guatemala"
 
 #: calendar/zones.h:102
 msgid "America/Guayaquil"
-msgstr ""
+msgstr "America/Guayaquil"
 
 #: calendar/zones.h:103
 msgid "America/Guyana"
-msgstr ""
+msgstr "America/Guyana"
 
 #: calendar/zones.h:104
 msgid "America/Halifax"
-msgstr ""
+msgstr "America/Halifax"
 
 #: calendar/zones.h:105
 msgid "America/Havana"
-msgstr ""
+msgstr "America/Havana"
 
 #: calendar/zones.h:106
 msgid "America/Hermosillo"
-msgstr ""
+msgstr "America/Hermosillo"
 
 #: calendar/zones.h:107
 msgid "America/Indiana/Indianapolis"
-msgstr ""
+msgstr "America/Indiana/Indianapolis"
 
 #: calendar/zones.h:108
 msgid "America/Indiana/Knox"
-msgstr ""
+msgstr "America/Indiana/Knox"
 
 #: calendar/zones.h:109
 msgid "America/Indiana/Marengo"
-msgstr ""
+msgstr "America/Indiana/Marengo"
 
 #: calendar/zones.h:110
 msgid "America/Indiana/Vevay"
-msgstr ""
+msgstr "America/Indiana/Vevay"
 
 #: calendar/zones.h:111
 msgid "America/Indianapolis"
-msgstr ""
+msgstr "America/Indianapolis"
 
 #: calendar/zones.h:112
 msgid "America/Inuvik"
-msgstr ""
+msgstr "America/Inuvik"
 
 #: calendar/zones.h:113
 msgid "America/Iqaluit"
-msgstr ""
+msgstr "America/Iqaluit"
 
 #: calendar/zones.h:114
 msgid "America/Jamaica"
-msgstr ""
+msgstr "America/Jamaica"
 
 #: calendar/zones.h:115
 msgid "America/Jujuy"
-msgstr ""
+msgstr "America/Jujuy"
 
 #: calendar/zones.h:116
 msgid "America/Juneau"
-msgstr ""
+msgstr "America/Juneau"
 
 #: calendar/zones.h:117
 msgid "America/Kentucky/Louisville"
-msgstr ""
+msgstr "America/Kentucky/Louisville"
 
 #: calendar/zones.h:118
 msgid "America/Kentucky/Monticello"
-msgstr ""
+msgstr "America/Kentucky/Monticello"
 
 #: calendar/zones.h:119
 msgid "America/La_Paz"
-msgstr ""
+msgstr "America/La_Paz"
 
 #: calendar/zones.h:120
 msgid "America/Lima"
-msgstr ""
+msgstr "America/Lima"
 
 #: calendar/zones.h:121
 msgid "America/Los_Angeles"
-msgstr ""
+msgstr "America/Los_Angeles"
 
 #: calendar/zones.h:122
 msgid "America/Louisville"
-msgstr ""
+msgstr "America/Louisville"
 
 #: calendar/zones.h:123
 msgid "America/Maceio"
-msgstr ""
+msgstr "America/Maceio"
 
 #: calendar/zones.h:124
 msgid "America/Managua"
-msgstr ""
+msgstr "America/Managua"
 
 #: calendar/zones.h:125
 msgid "America/Manaus"
-msgstr ""
+msgstr "America/Manaus"
 
 #: calendar/zones.h:126
 msgid "America/Martinique"
-msgstr ""
+msgstr "America/Martinique"
 
 #: calendar/zones.h:127
 msgid "America/Mazatlan"
-msgstr ""
+msgstr "America/Mazatlan"
 
 #: calendar/zones.h:128
 msgid "America/Mendoza"
-msgstr ""
+msgstr "America/Mendoza"
 
 #: calendar/zones.h:129
 msgid "America/Menominee"
-msgstr ""
+msgstr "America/Menominee"
 
 #: calendar/zones.h:130
 msgid "America/Merida"
-msgstr ""
+msgstr "America/Merida"
 
 #: calendar/zones.h:131
 msgid "America/Mexico_City"
-msgstr ""
+msgstr "America/Mexico_City"
 
 #: calendar/zones.h:132
 msgid "America/Miquelon"
-msgstr ""
+msgstr "America/Miquelon"
 
 #: calendar/zones.h:133
 msgid "America/Monterrey"
-msgstr ""
+msgstr "America/Monterrey"
 
 #: calendar/zones.h:134
 msgid "America/Montevideo"
-msgstr ""
+msgstr "America/Montevideo"
 
 #: calendar/zones.h:135
 msgid "America/Montreal"
-msgstr ""
+msgstr "America/Montreal"
 
 #: calendar/zones.h:136
 msgid "America/Montserrat"
-msgstr ""
+msgstr "America/Montserrat"
 
 #: calendar/zones.h:137
 msgid "America/Nassau"
-msgstr ""
+msgstr "America/Nassau"
 
 #: calendar/zones.h:138
 msgid "America/New_York"
-msgstr ""
+msgstr "America/New_York"
 
 #: calendar/zones.h:139
 msgid "America/Nipigon"
-msgstr ""
+msgstr "America/Nipigon"
 
 #: calendar/zones.h:140
 msgid "America/Nome"
-msgstr ""
+msgstr "America/Nome"
 
 #: calendar/zones.h:141
 msgid "America/Noronha"
-msgstr ""
+msgstr "America/Noronha"
 
 #: calendar/zones.h:142
 msgid "America/North_Dakota/Center"
-msgstr ""
+msgstr "America/North_Dakota/Centre"
 
 #: calendar/zones.h:143
 msgid "America/Panama"
-msgstr ""
+msgstr "America/Panama"
 
 #: calendar/zones.h:144
 msgid "America/Pangnirtung"
-msgstr ""
+msgstr "America/Pangnirtung"
 
 #: calendar/zones.h:145
 msgid "America/Paramaribo"
-msgstr ""
+msgstr "America/Paramaribo"
 
 #: calendar/zones.h:146
 msgid "America/Phoenix"
-msgstr ""
+msgstr "America/Phoenix"
 
 #: calendar/zones.h:147
 msgid "America/Port-au-Prince"
-msgstr ""
+msgstr "America/Port-au-Prince"
 
 #: calendar/zones.h:148
 msgid "America/Port_of_Spain"
-msgstr ""
+msgstr "America/Port_of_Spain"
 
 #: calendar/zones.h:149
 msgid "America/Porto_Velho"
-msgstr ""
+msgstr "America/Porto_Velho"
 
 #: calendar/zones.h:150
 msgid "America/Puerto_Rico"
-msgstr ""
+msgstr "America/Puerto_Rico"
 
 #: calendar/zones.h:151
 msgid "America/Rainy_River"
-msgstr ""
+msgstr "America/Rainy_River"
 
 #: calendar/zones.h:152
 msgid "America/Rankin_Inlet"
-msgstr ""
+msgstr "America/Rankin_Inlet"
 
 #: calendar/zones.h:153
 msgid "America/Recife"
-msgstr ""
+msgstr "America/Recife"
 
 #: calendar/zones.h:154
 msgid "America/Regina"
-msgstr ""
+msgstr "America/Regina"
 
 #: calendar/zones.h:155
 msgid "America/Rio_Branco"
-msgstr ""
+msgstr "America/Rio_Branco"
 
 #: calendar/zones.h:156
 msgid "America/Rosario"
-msgstr ""
+msgstr "America/Rosario"
 
 #: calendar/zones.h:157
 msgid "America/Santiago"
-msgstr ""
+msgstr "America/Santiago"
 
 #: calendar/zones.h:158
 msgid "America/Santo_Domingo"
-msgstr ""
+msgstr "America/Santo_Domingo"
 
 #: calendar/zones.h:159
 msgid "America/Sao_Paulo"
-msgstr ""
+msgstr "America/Sao_Paulo"
 
 #: calendar/zones.h:160
 msgid "America/Scoresbysund"
-msgstr ""
+msgstr "America/Scoresbysund"
 
 #: calendar/zones.h:161
 msgid "America/Shiprock"
-msgstr ""
+msgstr "America/Shiprock"
 
 #: calendar/zones.h:162
 msgid "America/St_Johns"
-msgstr ""
+msgstr "America/St_Johns"
 
 #: calendar/zones.h:163
 msgid "America/St_Kitts"
-msgstr ""
+msgstr "America/St_Kitts"
 
 #: calendar/zones.h:164
 msgid "America/St_Lucia"
-msgstr ""
+msgstr "America/St_Lucia"
 
 #: calendar/zones.h:165
 msgid "America/St_Thomas"
-msgstr ""
+msgstr "America/St_Thomas"
 
 #: calendar/zones.h:166
 msgid "America/St_Vincent"
-msgstr ""
+msgstr "America/St_Vincent"
 
 #: calendar/zones.h:167
 msgid "America/Swift_Current"
-msgstr ""
+msgstr "America/Swift_Current"
 
 #: calendar/zones.h:168
 msgid "America/Tegucigalpa"
-msgstr ""
+msgstr "America/Tegucigalpa"
 
 #: calendar/zones.h:169
 msgid "America/Thule"
-msgstr ""
+msgstr "America/Thule"
 
 #: calendar/zones.h:170
 msgid "America/Thunder_Bay"
-msgstr ""
+msgstr "America/Thunder_Bay"
 
 #: calendar/zones.h:171
 msgid "America/Tijuana"
-msgstr ""
+msgstr "America/Tijuana"
 
 #: calendar/zones.h:172
 msgid "America/Tortola"
-msgstr ""
+msgstr "America/Tortola"
 
 #: calendar/zones.h:173
 msgid "America/Vancouver"
-msgstr ""
+msgstr "America/Vancouver"
 
 #: calendar/zones.h:174
 msgid "America/Whitehorse"
-msgstr ""
+msgstr "America/Whitehorse"
 
 #: calendar/zones.h:175
 msgid "America/Winnipeg"
-msgstr ""
+msgstr "America/Winnipeg"
 
 #: calendar/zones.h:176
 msgid "America/Yakutat"
-msgstr ""
+msgstr "America/Yakutat"
 
 #: calendar/zones.h:177
 msgid "America/Yellowknife"
-msgstr ""
+msgstr "America/Yellowknife"
 
 #: calendar/zones.h:178
 msgid "Antarctica/Casey"
-msgstr ""
+msgstr "Antarctica/Casey"
 
 #: calendar/zones.h:179
 msgid "Antarctica/Davis"
-msgstr ""
+msgstr "Antarctica/Davis"
 
 #: calendar/zones.h:180
 msgid "Antarctica/DumontDUrville"
-msgstr ""
+msgstr "Antarctica/DumontDUrville"
 
 #: calendar/zones.h:181
 msgid "Antarctica/Mawson"
-msgstr ""
+msgstr "Antarctica/Mawson"
 
 #: calendar/zones.h:182
 msgid "Antarctica/McMurdo"
-msgstr ""
+msgstr "Antarctica/McMurdo"
 
 #: calendar/zones.h:183
 msgid "Antarctica/Palmer"
-msgstr ""
+msgstr "Antarctica/Palmer"
 
 #: calendar/zones.h:184
 msgid "Antarctica/South_Pole"
-msgstr ""
+msgstr "Antarctica/South_Pole"
 
 #: calendar/zones.h:185
 msgid "Antarctica/Syowa"
-msgstr ""
+msgstr "Antarctica/Syowa"
 
 #: calendar/zones.h:186
 msgid "Antarctica/Vostok"
-msgstr ""
+msgstr "Antarctica/Vostok"
 
 #: calendar/zones.h:187
 msgid "Arctic/Longyearbyen"
-msgstr ""
+msgstr "Arctic/Longyearbyen"
 
 #: calendar/zones.h:188
 msgid "Asia/Aden"
-msgstr ""
+msgstr "Asia/Aden"
 
 #: calendar/zones.h:189
 msgid "Asia/Almaty"
-msgstr ""
+msgstr "Asia/Almaty"
 
 #: calendar/zones.h:190
 msgid "Asia/Amman"
-msgstr ""
+msgstr "Asia/Amman"
 
 #: calendar/zones.h:191
 msgid "Asia/Anadyr"
-msgstr ""
+msgstr "Asia/Anadyr"
 
 #: calendar/zones.h:192
 msgid "Asia/Aqtau"
-msgstr ""
+msgstr "Asia/Aqtau"
 
 #: calendar/zones.h:193
 msgid "Asia/Aqtobe"
-msgstr ""
+msgstr "Asia/Aqtobe"
 
 #: calendar/zones.h:194
 msgid "Asia/Ashgabat"
-msgstr ""
+msgstr "Asia/Ashgabat"
 
 #: calendar/zones.h:195
 msgid "Asia/Baghdad"
-msgstr ""
+msgstr "Asia/Baghdad"
 
 #: calendar/zones.h:196
 msgid "Asia/Bahrain"
-msgstr ""
+msgstr "Asia/Bahrain"
 
 #: calendar/zones.h:197
 msgid "Asia/Baku"
-msgstr ""
+msgstr "Asia/Baku"
 
 #: calendar/zones.h:198
 msgid "Asia/Bangkok"
-msgstr ""
+msgstr "Asia/Bangkok"
 
 #: calendar/zones.h:199
 msgid "Asia/Beirut"
-msgstr ""
+msgstr "Asia/Beirut"
 
 #: calendar/zones.h:200
 msgid "Asia/Bishkek"
-msgstr ""
+msgstr "Asia/Bishkek"
 
 #: calendar/zones.h:201
 msgid "Asia/Brunei"
-msgstr ""
+msgstr "Asia/Brunei"
 
 #: calendar/zones.h:202
 msgid "Asia/Calcutta"
-msgstr ""
+msgstr "Asia/Calcutta"
 
 #: calendar/zones.h:203
 msgid "Asia/Choibalsan"
-msgstr ""
+msgstr "Asia/Choibalsan"
 
 #: calendar/zones.h:204
 msgid "Asia/Chongqing"
-msgstr ""
+msgstr "Asia/Chongqing"
 
 #: calendar/zones.h:205
 msgid "Asia/Colombo"
-msgstr ""
+msgstr "Asia/Colombo"
 
 #: calendar/zones.h:206
 msgid "Asia/Damascus"
-msgstr ""
+msgstr "Asia/Damascus"
 
 #: calendar/zones.h:207
 msgid "Asia/Dhaka"
-msgstr ""
+msgstr "Asia/Dhaka"
 
 #: calendar/zones.h:208
 msgid "Asia/Dili"
-msgstr ""
+msgstr "Asia/Dili"
 
 #: calendar/zones.h:209
 msgid "Asia/Dubai"
-msgstr ""
+msgstr "Asia/Dubai"
 
 #: calendar/zones.h:210
 msgid "Asia/Dushanbe"
-msgstr ""
+msgstr "Asia/Dushanbe"
 
 #: calendar/zones.h:211
 msgid "Asia/Gaza"
-msgstr ""
+msgstr "Asia/Gaza"
 
 #: calendar/zones.h:212
 msgid "Asia/Harbin"
-msgstr ""
+msgstr "Asia/Harbin"
 
 #: calendar/zones.h:213
 msgid "Asia/Hong_Kong"
-msgstr ""
+msgstr "Asia/Hong_Kong"
 
 #: calendar/zones.h:214
 msgid "Asia/Hovd"
-msgstr ""
+msgstr "Asia/Hovd"
 
 #: calendar/zones.h:215
 msgid "Asia/Irkutsk"
-msgstr ""
+msgstr "Asia/Irkutsk"
 
 #: calendar/zones.h:216
 msgid "Asia/Istanbul"
-msgstr ""
+msgstr "Asia/Istanbul"
 
 #: calendar/zones.h:217
 msgid "Asia/Jakarta"
-msgstr ""
+msgstr "Asia/Jakarta"
 
 #: calendar/zones.h:218
 msgid "Asia/Jayapura"
-msgstr ""
+msgstr "Asia/Jayapura"
 
 #: calendar/zones.h:219
 msgid "Asia/Jerusalem"
-msgstr ""
+msgstr "Asia/Jerusalem"
 
 #: calendar/zones.h:220
 msgid "Asia/Kabul"
-msgstr ""
+msgstr "Asia/Kabul"
 
 #: calendar/zones.h:221
 msgid "Asia/Kamchatka"
-msgstr ""
+msgstr "Asia/Kamchatka"
 
 #: calendar/zones.h:222
 msgid "Asia/Karachi"
-msgstr ""
+msgstr "Asia/Karachi"
 
 #: calendar/zones.h:223
 msgid "Asia/Kashgar"
-msgstr ""
+msgstr "Asia/Kashgar"
 
 #: calendar/zones.h:224
 msgid "Asia/Katmandu"
-msgstr ""
+msgstr "Asia/Katmandu"
 
 #: calendar/zones.h:225
 msgid "Asia/Krasnoyarsk"
-msgstr ""
+msgstr "Asia/Krasnoyarsk"
 
 #: calendar/zones.h:226
 msgid "Asia/Kuala_Lumpur"
-msgstr ""
+msgstr "Asia/Kuala_Lumpur"
 
 #: calendar/zones.h:227
 msgid "Asia/Kuching"
-msgstr ""
+msgstr "Asia/Kuching"
 
 #: calendar/zones.h:228
 msgid "Asia/Kuwait"
-msgstr ""
+msgstr "Asia/Kuwait"
 
 #: calendar/zones.h:229
 msgid "Asia/Macao"
-msgstr ""
+msgstr "Asia/Macao"
 
 #: calendar/zones.h:230
 msgid "Asia/Macau"
-msgstr ""
+msgstr "Asia/Macau"
 
 #: calendar/zones.h:231
 msgid "Asia/Magadan"
-msgstr ""
+msgstr "Asia/Magadan"
 
 #: calendar/zones.h:232
 msgid "Asia/Makassar"
-msgstr ""
+msgstr "Asia/Makassar"
 
 #: calendar/zones.h:233
 msgid "Asia/Manila"
-msgstr ""
+msgstr "Asia/Manila"
 
 #: calendar/zones.h:234
 msgid "Asia/Muscat"
-msgstr ""
+msgstr "Asia/Muscat"
 
 #: calendar/zones.h:235
 msgid "Asia/Nicosia"
-msgstr ""
+msgstr "Asia/Nicosia"
 
 #: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
-msgstr ""
+msgstr "Asia/Novosibirsk"
 
 #: calendar/zones.h:237
 msgid "Asia/Omsk"
-msgstr ""
+msgstr "Asia/Omsk"
 
 #: calendar/zones.h:238
 msgid "Asia/Oral"
-msgstr ""
+msgstr "Asia/Oral"
 
 #: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
-msgstr ""
+msgstr "Asia/Phnom_Penh"
 
 #: calendar/zones.h:240
 msgid "Asia/Pontianak"
-msgstr ""
+msgstr "Asia/Pontianak"
 
 #: calendar/zones.h:241
 msgid "Asia/Pyongyang"
-msgstr ""
+msgstr "Asia/Pyongyang"
 
 #: calendar/zones.h:242
 msgid "Asia/Qatar"
-msgstr ""
+msgstr "Asia/Qatar"
 
 #: calendar/zones.h:243
 msgid "Asia/Qyzylorda"
-msgstr ""
+msgstr "Asia/Qyzylorda"
 
 #: calendar/zones.h:244
 msgid "Asia/Rangoon"
-msgstr ""
+msgstr "Asia/Rangoon"
 
 #: calendar/zones.h:245
 msgid "Asia/Riyadh"
-msgstr ""
+msgstr "Asia/Riyadh"
 
 #: calendar/zones.h:246
 msgid "Asia/Saigon"
-msgstr ""
+msgstr "Asia/Saigon"
 
 #: calendar/zones.h:247
 msgid "Asia/Sakhalin"
-msgstr ""
+msgstr "Asia/Sakhalin"
 
 #: calendar/zones.h:248
 msgid "Asia/Samarkand"
-msgstr ""
+msgstr "Asia/Samarkand"
 
 #: calendar/zones.h:249
 msgid "Asia/Seoul"
-msgstr ""
+msgstr "Asia/Seoul"
 
 #: calendar/zones.h:250
 msgid "Asia/Shanghai"
-msgstr ""
+msgstr "Asia/Shanghai"
 
 #: calendar/zones.h:251
 msgid "Asia/Singapore"
-msgstr ""
+msgstr "Asia/Singapore"
 
 #: calendar/zones.h:252
 msgid "Asia/Taipei"
-msgstr ""
+msgstr "Asia/Taipei"
 
 #: calendar/zones.h:253
 msgid "Asia/Tashkent"
-msgstr ""
+msgstr "Asia/Tashkent"
 
 #: calendar/zones.h:254
 msgid "Asia/Tbilisi"
-msgstr ""
+msgstr "Asia/Tbilisi"
 
 #: calendar/zones.h:255
 msgid "Asia/Tehran"
-msgstr ""
+msgstr "Asia/Tehran"
 
 #: calendar/zones.h:256
 msgid "Asia/Thimphu"
-msgstr ""
+msgstr "Asia/Thimphu"
 
 #: calendar/zones.h:257
 msgid "Asia/Tokyo"
-msgstr ""
+msgstr "Asia/Tokyo"
 
 #: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
-msgstr ""
+msgstr "Asia/Ujung_Pandang"
 
 #: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
-msgstr ""
+msgstr "Asia/Ulaanbaatar"
 
 #: calendar/zones.h:260
 msgid "Asia/Urumqi"
-msgstr ""
+msgstr "Asia/Urumqi"
 
 #: calendar/zones.h:261
 msgid "Asia/Vientiane"
-msgstr ""
+msgstr "Asia/Vientiane"
 
 #: calendar/zones.h:262
 msgid "Asia/Vladivostok"
-msgstr ""
+msgstr "Asia/Vladivostok"
 
 #: calendar/zones.h:263
 msgid "Asia/Yakutsk"
-msgstr ""
+msgstr "Asia/Yakutsk"
 
 #: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
-msgstr ""
+msgstr "Asia/Yekaterinburg"
 
 #: calendar/zones.h:265
 msgid "Asia/Yerevan"
-msgstr ""
+msgstr "Asia/Yerevan"
 
 #: calendar/zones.h:266
 msgid "Atlantic/Azores"
-msgstr ""
+msgstr "Atlantic/Azores"
 
 #: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
-msgstr ""
+msgstr "Atlantic/Bermuda"
 
 #: calendar/zones.h:268
 msgid "Atlantic/Canary"
-msgstr ""
+msgstr "Atlantic/Canary"
 
 #: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
-msgstr ""
+msgstr "Atlantic/Cape_Verde"
 
 #: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
-msgstr ""
+msgstr "Atlantic/Faeroe"
 
 #: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
-msgstr ""
+msgstr "Atlantic/Jan_Mayen"
 
 #: calendar/zones.h:272
 msgid "Atlantic/Madeira"
-msgstr ""
+msgstr "Atlantic/Madeira"
 
 #: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
-msgstr ""
+msgstr "Atlantic/Reykjavik"
 
 #: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
-msgstr ""
+msgstr "Atlantic/South_Georgia"
 
 #: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
-msgstr ""
+msgstr "Atlantic/St_Helena"
 
 #: calendar/zones.h:276
 msgid "Atlantic/Stanley"
-msgstr ""
+msgstr "Atlantic/Stanley"
 
 #: calendar/zones.h:277
 msgid "Australia/Adelaide"
-msgstr ""
+msgstr "Australia/Adelaide"
 
 #: calendar/zones.h:278
 msgid "Australia/Brisbane"
-msgstr ""
+msgstr "Australia/Brisbane"
 
 #: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
-msgstr ""
+msgstr "Australia/Broken_Hill"
 
 #: calendar/zones.h:280
 msgid "Australia/Darwin"
-msgstr ""
+msgstr "Australia/Darwin"
 
 #: calendar/zones.h:281
 msgid "Australia/Hobart"
-msgstr ""
+msgstr "Australia/Hobart"
 
 #: calendar/zones.h:282
 msgid "Australia/Lindeman"
-msgstr ""
+msgstr "Australia/Lindeman"
 
 #: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
-msgstr ""
+msgstr "Australia/Lord_Howe"
 
 #: calendar/zones.h:284
 msgid "Australia/Melbourne"
-msgstr ""
+msgstr "Australia/Melbourne"
 
 #: calendar/zones.h:285
 msgid "Australia/Perth"
-msgstr ""
+msgstr "Australia/Perth"
 
 #: calendar/zones.h:286
 msgid "Australia/Sydney"
-msgstr ""
+msgstr "Australia/Sydney"
 
 #: calendar/zones.h:287
 msgid "Europe/Amsterdam"
-msgstr ""
+msgstr "Europe/Amsterdam"
 
 #: calendar/zones.h:288
 msgid "Europe/Andorra"
-msgstr ""
+msgstr "Europe/Andorra"
 
 #: calendar/zones.h:289
 msgid "Europe/Athens"
-msgstr ""
+msgstr "Europe/Athens"
 
 #: calendar/zones.h:290
 msgid "Europe/Belfast"
-msgstr ""
+msgstr "Europe/Belfast"
 
 #: calendar/zones.h:291
 msgid "Europe/Belgrade"
-msgstr ""
+msgstr "Europe/Belgrade"
 
 #: calendar/zones.h:292
 msgid "Europe/Berlin"
-msgstr ""
+msgstr "Europe/Berlin"
 
 #: calendar/zones.h:293
 msgid "Europe/Bratislava"
-msgstr ""
+msgstr "Europe/Bratislava"
 
 #: calendar/zones.h:294
 msgid "Europe/Brussels"
-msgstr ""
+msgstr "Europe/Brussels"
 
 #: calendar/zones.h:295
 msgid "Europe/Bucharest"
-msgstr ""
+msgstr "Europe/Bucharest"
 
 #: calendar/zones.h:296
 msgid "Europe/Budapest"
-msgstr ""
+msgstr "Europe/Budapest"
 
 #: calendar/zones.h:297
 msgid "Europe/Chisinau"
-msgstr ""
+msgstr "Europe/Chisinau"
 
 #: calendar/zones.h:298
 msgid "Europe/Copenhagen"
-msgstr ""
+msgstr "Europe/Copenhagen"
 
 #: calendar/zones.h:299
 msgid "Europe/Dublin"
-msgstr ""
+msgstr "Europe/Dublin"
 
 #: calendar/zones.h:300
 msgid "Europe/Gibraltar"
-msgstr ""
+msgstr "Europe/Gibraltar"
 
 #: calendar/zones.h:301
 msgid "Europe/Helsinki"
-msgstr ""
+msgstr "Europe/Helsinki"
 
 #: calendar/zones.h:302
 msgid "Europe/Istanbul"
-msgstr ""
+msgstr "Europe/Istanbul"
 
 #: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
-msgstr ""
+msgstr "Europe/Kaliningrad"
 
 #: calendar/zones.h:304
 msgid "Europe/Kiev"
-msgstr ""
+msgstr "Europe/Kiev"
 
 #: calendar/zones.h:305
 msgid "Europe/Lisbon"
-msgstr ""
+msgstr "Europe/Lisbon"
 
 #: calendar/zones.h:306
 msgid "Europe/Ljubljana"
-msgstr ""
+msgstr "Europe/Ljubljana"
 
 #: calendar/zones.h:307
 msgid "Europe/London"
-msgstr ""
+msgstr "Europe/London"
 
 #: calendar/zones.h:308
 msgid "Europe/Luxembourg"
-msgstr ""
+msgstr "Europe/Luxembourg"
 
 #: calendar/zones.h:309
 msgid "Europe/Madrid"
-msgstr ""
+msgstr "Europe/Madrid"
 
 #: calendar/zones.h:310
 msgid "Europe/Malta"
-msgstr ""
+msgstr "Europe/Malta"
 
 #: calendar/zones.h:311
 msgid "Europe/Minsk"
-msgstr ""
+msgstr "Europe/Minsk"
 
 #: calendar/zones.h:312
 msgid "Europe/Monaco"
-msgstr ""
+msgstr "Europe/Monaco"
 
 #: calendar/zones.h:313
 msgid "Europe/Moscow"
-msgstr ""
+msgstr "Europe/Moscow"
 
 #: calendar/zones.h:314
 msgid "Europe/Nicosia"
-msgstr ""
+msgstr "Europe/Nicosia"
 
 #: calendar/zones.h:315
 msgid "Europe/Oslo"
-msgstr ""
+msgstr "Europe/Oslo"
 
 #: calendar/zones.h:316
 msgid "Europe/Paris"
-msgstr ""
+msgstr "Europe/Paris"
 
 #: calendar/zones.h:317
 msgid "Europe/Prague"
-msgstr ""
+msgstr "Europe/Prague"
 
 #: calendar/zones.h:318
 msgid "Europe/Riga"
-msgstr ""
+msgstr "Europe/Riga"
 
 #: calendar/zones.h:319
 msgid "Europe/Rome"
-msgstr ""
+msgstr "Europe/Rome"
 
 #: calendar/zones.h:320
 msgid "Europe/Samara"
-msgstr ""
+msgstr "Europe/Samara"
 
 #: calendar/zones.h:321
 msgid "Europe/San_Marino"
-msgstr ""
+msgstr "Europe/San_Marino"
 
 #: calendar/zones.h:322
 msgid "Europe/Sarajevo"
-msgstr ""
+msgstr "Europe/Sarajevo"
 
 #: calendar/zones.h:323
 msgid "Europe/Simferopol"
-msgstr ""
+msgstr "Europe/Simferopol"
 
 #: calendar/zones.h:324
 msgid "Europe/Skopje"
-msgstr ""
+msgstr "Europe/Skopje"
 
 #: calendar/zones.h:325
 msgid "Europe/Sofia"
-msgstr ""
+msgstr "Europe/Sofia"
 
 #: calendar/zones.h:326
 msgid "Europe/Stockholm"
-msgstr ""
+msgstr "Europe/Stockholm"
 
 #: calendar/zones.h:327
 msgid "Europe/Tallinn"
-msgstr ""
+msgstr "Europe/Tallinn"
 
 #: calendar/zones.h:328
 msgid "Europe/Tirane"
-msgstr ""
+msgstr "Europe/Tirane"
 
 #: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
-msgstr ""
+msgstr "Europe/Uzhgorod"
 
 #: calendar/zones.h:330
 msgid "Europe/Vaduz"
-msgstr ""
+msgstr "Europe/Vaduz"
 
 #: calendar/zones.h:331
 msgid "Europe/Vatican"
-msgstr ""
+msgstr "Europe/Vatican"
 
 #: calendar/zones.h:332
 msgid "Europe/Vienna"
-msgstr ""
+msgstr "Europe/Vienna"
 
 #: calendar/zones.h:333
 msgid "Europe/Vilnius"
-msgstr ""
+msgstr "Europe/Vilnius"
 
 #: calendar/zones.h:334
 msgid "Europe/Warsaw"
-msgstr ""
+msgstr "Europe/Warsaw"
 
 #: calendar/zones.h:335
 msgid "Europe/Zagreb"
-msgstr ""
+msgstr "Europe/Zagreb"
 
 #: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
-msgstr ""
+msgstr "Europe/Zaporozhye"
 
 #: calendar/zones.h:337
 msgid "Europe/Zurich"
-msgstr ""
+msgstr "Europe/Zurich"
 
 #: calendar/zones.h:338
 msgid "Indian/Antananarivo"
-msgstr ""
+msgstr "Indian/Antananarivo"
 
 #: calendar/zones.h:339
 msgid "Indian/Chagos"
-msgstr ""
+msgstr "Indian/Chagos"
 
 #: calendar/zones.h:340
 msgid "Indian/Christmas"
-msgstr ""
+msgstr "Indian/Christmas"
 
 #: calendar/zones.h:341
 msgid "Indian/Cocos"
-msgstr ""
+msgstr "Indian/Cocos"
 
 #: calendar/zones.h:342
-#, fuzzy
 msgid "Indian/Comoro"
-msgstr "Colours"
+msgstr "Indian/Comoro"
 
 #: calendar/zones.h:343
 msgid "Indian/Kerguelen"
-msgstr ""
+msgstr "Indian/Kerguelen"
 
 #: calendar/zones.h:344
 msgid "Indian/Mahe"
-msgstr ""
+msgstr "Indian/Mahe"
 
 #: calendar/zones.h:345
 msgid "Indian/Maldives"
-msgstr ""
+msgstr "Indian/Maldives"
 
 #: calendar/zones.h:346
 msgid "Indian/Mauritius"
-msgstr ""
+msgstr "Indian/Mauritius"
 
 #: calendar/zones.h:347
 msgid "Indian/Mayotte"
-msgstr ""
+msgstr "Indian/Mayotte"
 
 #: calendar/zones.h:348
 msgid "Indian/Reunion"
-msgstr ""
+msgstr "Indian/Reunion"
 
 #: calendar/zones.h:349
 msgid "Pacific/Apia"
-msgstr ""
+msgstr "Pacific/Apia"
 
 #: calendar/zones.h:350
 msgid "Pacific/Auckland"
-msgstr ""
+msgstr "Pacific/Auckland"
 
 #: calendar/zones.h:351
 msgid "Pacific/Chatham"
-msgstr ""
+msgstr "Pacific/Chatham"
 
 #: calendar/zones.h:352
 msgid "Pacific/Easter"
-msgstr ""
+msgstr "Pacific/Easter"
 
 #: calendar/zones.h:353
 msgid "Pacific/Efate"
-msgstr ""
+msgstr "Pacific/Efate"
 
 #: calendar/zones.h:354
 msgid "Pacific/Enderbury"
-msgstr ""
+msgstr "Pacific/Enderbury"
 
 #: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
-msgstr ""
+msgstr "Pacific/Fakaofo"
 
 #: calendar/zones.h:356
 msgid "Pacific/Fiji"
-msgstr ""
+msgstr "Pacific/Fiji"
 
 #: calendar/zones.h:357
 msgid "Pacific/Funafuti"
-msgstr ""
+msgstr "Pacific/Funafuti"
 
 #: calendar/zones.h:358
 msgid "Pacific/Galapagos"
-msgstr ""
+msgstr "Pacific/Galapagos"
 
 #: calendar/zones.h:359
 msgid "Pacific/Gambier"
-msgstr ""
+msgstr "Pacific/Gambier"
 
 #: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
-msgstr ""
+msgstr "Pacific/Guadalcanal"
 
 #: calendar/zones.h:361
 msgid "Pacific/Guam"
-msgstr ""
+msgstr "Pacific/Guam"
 
 #: calendar/zones.h:362
 msgid "Pacific/Honolulu"
-msgstr ""
+msgstr "Pacific/Honolulu"
 
 #: calendar/zones.h:363
 msgid "Pacific/Johnston"
-msgstr ""
+msgstr "Pacific/Johnston"
 
 #: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
-msgstr ""
+msgstr "Pacific/Kiritimati"
 
 #: calendar/zones.h:365
 msgid "Pacific/Kosrae"
-msgstr ""
+msgstr "Pacific/Kosrae"
 
 #: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
-msgstr ""
+msgstr "Pacific/Kwajalein"
 
 #: calendar/zones.h:367
 msgid "Pacific/Majuro"
-msgstr ""
+msgstr "Pacific/Majuro"
 
 #: calendar/zones.h:368
 msgid "Pacific/Marquesas"
-msgstr ""
+msgstr "Pacific/Marquesas"
 
 #: calendar/zones.h:369
 msgid "Pacific/Midway"
-msgstr ""
+msgstr "Pacific/Midway"
 
 #: calendar/zones.h:370
 msgid "Pacific/Nauru"
-msgstr ""
+msgstr "Pacific/Nauru"
 
 #: calendar/zones.h:371
 msgid "Pacific/Niue"
-msgstr ""
+msgstr "Pacific/Niue"
 
 #: calendar/zones.h:372
 msgid "Pacific/Norfolk"
-msgstr ""
+msgstr "Pacific/Norfolk"
 
 #: calendar/zones.h:373
 msgid "Pacific/Noumea"
-msgstr ""
+msgstr "Pacific/Noumea"
 
 #: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
-msgstr ""
+msgstr "Pacific/Pago_Pago"
 
 #: calendar/zones.h:375
 msgid "Pacific/Palau"
-msgstr ""
+msgstr "Pacific/Palau"
 
 #: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
-msgstr ""
+msgstr "Pacific/Pitcairn"
 
 #: calendar/zones.h:377
 msgid "Pacific/Ponape"
-msgstr ""
+msgstr "Pacific/Ponape"
 
 #: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
-msgstr ""
+msgstr "Pacific/Port_Moresby"
 
 #: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
-msgstr ""
+msgstr "Pacific/Rarotonga"
 
 #: calendar/zones.h:380
 msgid "Pacific/Saipan"
-msgstr ""
+msgstr "Pacific/Saipan"
 
 #: calendar/zones.h:381
 msgid "Pacific/Tahiti"
-msgstr ""
+msgstr "Pacific/Tahiti"
 
 #: calendar/zones.h:382
 msgid "Pacific/Tarawa"
-msgstr ""
+msgstr "Pacific/Tarawa"
 
 #: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
-msgstr ""
+msgstr "Pacific/Tongatapu"
 
 #: calendar/zones.h:384
 msgid "Pacific/Truk"
-msgstr ""
+msgstr "Pacific/Truk"
 
 #: calendar/zones.h:385
 msgid "Pacific/Wake"
-msgstr ""
+msgstr "Pacific/Wake"
 
 #: calendar/zones.h:386
 msgid "Pacific/Wallis"
-msgstr ""
+msgstr "Pacific/Wallis"
 
 #: calendar/zones.h:387
 msgid "Pacific/Yap"
-msgstr ""
+msgstr "Pacific/Yap"
 
 #: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
-msgstr ""
+msgstr "Signing is not supported by this cypher"
 
 #: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
-msgstr ""
+msgstr "Verifying is not supported by this cypher"
 
 #: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
-msgstr ""
+msgstr "Encryption is not supported by this cypher"
 
 #: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
-msgstr ""
+msgstr "Decryption is not supported by this cypher"
 
 #: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
-msgstr ""
+msgstr "You may not import keys with this cypher"
 
 #: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
-msgstr ""
+msgstr "You may not export keys with this cypher"
 
 #: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
-msgstr ""
+msgstr "Unable to create cache path"
 
 #: camel/camel-data-cache.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "Could not remove cache entry: %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not remove cache entry: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronised."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
-msgstr ""
+msgstr "Resynchronising with server"
 
 #: camel/camel-disco-folder.c:41
 msgid "Copy folder content locally for offline operation"
-msgstr ""
+msgstr "Copy folder content locally for offline operation"
 
 #: camel/camel-disco-folder.c:101
 msgid "Downloading new messages for offline mode"
-msgstr ""
+msgstr "Downloading new messages for offline mode"
 
 #: camel/camel-disco-folder.c:441
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "Synchronising \"%s\""
+msgstr "Preparing folder '%s' for offline"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
 msgid "You must be working online to complete this operation"
-msgstr ""
+msgstr "You must be working online to complete this operation"
 
 #: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create pipe to '%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to create pipe to '%s': %s"
 
 #: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create create child process '%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to create create child process '%s': %s"
 
 #: camel/camel-filter-driver.c:754
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Invalid message stream received from %s: %s"
 
 #: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
-#, fuzzy
 msgid "Syncing folders"
-msgstr "Synchronising \"%s\""
+msgstr "Syncing folders"
 
 #: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr ""
+msgstr "Error parsing filter: %s: %s"
 
 #: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr ""
+msgstr "Error executing filter: %s: %s"
 
 #: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
-msgstr ""
+msgstr "Unable to open spool folder"
 
 #: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
-msgstr ""
+msgstr "Unable to process spool folder"
 
 #: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
-msgstr ""
+msgstr "Getting message %d (%d%%)"
 
 #: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
-msgstr ""
+msgstr "Cannot open message"
 
 #: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
-msgstr ""
+msgstr "Failed on message %d"
 
 #: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
-#, fuzzy
 msgid "Syncing folder"
-msgstr "Synchronising \"%s\""
+msgstr "Syncing folder"
 
 #: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
-msgstr ""
+msgstr "Getting message %d of %d"
 
 #: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
-msgstr ""
+msgstr "Failed at message %d of %d"
 
 #: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
-msgstr ""
+msgstr "Failed to retrieve message"
 
 #: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
-msgstr ""
+msgstr "Invalid arguments to (system-flag)"
 
 #: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
-msgstr ""
+msgstr "Invalid arguments to (user-tag)"
 
 #: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr ""
+msgstr "Error executing filter search: %s: %s"
 
 #: camel/camel-folder-search.c:348
 #, c-format
@@ -8693,6 +8777,8 @@ msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
+"Cannot parse search expression: %s:\n"
+"%s"
 
 #: camel/camel-folder-search.c:358
 #, c-format
@@ -8700,42 +8786,48 @@ msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
+"Error executing search expression: %s:\n"
+"%s"
 
 #: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
-msgstr ""
+msgstr "(match-all) requires a single bool result"
 
 #: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
-msgstr ""
+msgstr "Performing query on unknown header: %s"
 
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
-msgstr ""
+msgstr "Unsupported operation: append message: for %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
+msgstr "Unsupported operation: search by expression: for %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
+msgstr "Unsupported operation: search by uids: for %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Moving messages"
-msgstr ""
+msgstr "Moving messages"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
 msgid "Copying messages"
-msgstr ""
+msgstr "Copying messages"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr "Learning junk and/or non junk message(s)"
+
+#: camel/camel-folder.c:1618
 msgid "Filtering new message(s)"
-msgstr ""
+msgstr "Filtering new message(s)"
 
 #: camel/camel-gpg-context.c:710
 #, c-format
@@ -8744,14 +8836,17 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
 
 #: camel/camel-gpg-context.c:724
 msgid "Failed to parse gpg userid hint."
-msgstr ""
+msgstr "Failed to parse gpg userid hint."
 
 #: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg passphrase request."
-msgstr ""
+msgstr "Failed to parse gpg passphrase request."
 
 #: camel/camel-gpg-context.c:762
 #, c-format
@@ -8759,235 +8854,240 @@ msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
 
 #: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
 #: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
+#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:696
+#: mail/mail-send-recv.c:598
 msgid "Cancelled."
-msgstr ""
+msgstr "Cancelled."
 
 #: camel/camel-gpg-context.c:797
 msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr ""
+msgstr "Failed to unlock secret key: 3 bad passphrases given."
 
 #: camel/camel-gpg-context.c:803
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr ""
+msgstr "Unexpected response from GnuPG: %s"
 
 #: camel/camel-gpg-context.c:847
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr ""
+msgstr "Failed to encrypt: No valid recipients specified."
 
 #: camel/camel-gpg-context.c:1124
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
 "%s"
-msgstr "Synchronising \"%s\""
+msgstr ""
+"Failed to GPG %s: %s\n"
+"\n"
+"%s"
 
 #: camel/camel-gpg-context.c:1129
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to GPG %s: %s\n"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to GPG %s: %s\n"
 
 #: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
-#, fuzzy, c-format
+#, c-format
 msgid "Could not generate signing data: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not generate signing data: %s"
 
 #: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
 #: camel/camel-gpg-context.c:1715
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute gpg: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to execute gpg: %s"
 
 #: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
 #: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
 #: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
 #: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
 msgid "Failed to execute gpg."
-msgstr ""
+msgstr "Failed to execute gpg."
 
 #: camel/camel-gpg-context.c:1299
 msgid "This is a digitally signed message part"
-msgstr ""
+msgstr "This is a digitally signed message part"
 
 #: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
 #: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr ""
+msgstr "Cannot verify message signature: Incorrect message format"
 
 #: camel/camel-gpg-context.c:1397
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
+msgstr "Cannot verify message signature: could not create temp file: %s"
 
 #: camel/camel-gpg-context.c:1484
-#, fuzzy, c-format
+#, c-format
 msgid "Could not generate encrypting data: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not generate encrypting data: %s"
 
 #: camel/camel-gpg-context.c:1542
 msgid "This is a digitally encrypted message part"
-msgstr ""
+msgstr "This is a digitally encrypted message part"
 
 #: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
 msgid "Encrypted content"
-msgstr ""
+msgstr "Encrypted content"
 
 #: camel/camel-gpg-context.c:1643
-#, fuzzy
 msgid "Unable to parse message content"
-msgstr "Synchronising \"%s\""
+msgstr "Unable to parse message content"
 
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
-msgstr ""
+msgstr "Cannot build locking helper pipe: %s"
 
 #: camel/camel-lock-client.c:113
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr ""
+msgstr "Cannot fork locking helper: %s"
 
 #: 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 ""
+msgstr "Could not lock '%s': protocol error with lock-helper"
 
 #: camel/camel-lock-client.c:204
 #, c-format
 msgid "Could not lock '%s'"
-msgstr ""
+msgstr "Could not lock '%s'"
 
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr ""
+msgstr "Could not create lock file for %s: %s"
 
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
+msgstr "Timed out trying to get lock file on %s. Try again later."
 
 #: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
+msgstr "Failed to get lock using fcntl(2): %s"
 
 #: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr ""
+msgstr "Failed to get lock using flock(2): %s"
 
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr ""
+msgstr "Could not check mail file %s: %s"
 
 #: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
-msgstr ""
+msgstr "Could not open mail file %s: %s"
 
 #: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr ""
+msgstr "Could not open temporary mail file %s: %s"
 
 #: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
+msgstr "Failed to store mail in temp file %s: %s"
 
 #: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr ""
+msgstr "Could not create pipe: %s"
 
 #: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
-msgstr ""
+msgstr "Could not fork: %s"
 
 #: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
-msgstr ""
+msgstr "Movemail program failed: %s"
 
 #: camel/camel-movemail.c:238
 msgid "(Unknown error)"
-msgstr ""
+msgstr "(Unknown error)"
 
 #: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
-msgstr ""
+msgstr "Error reading mail file: %s"
 
 #: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
-msgstr ""
+msgstr "Error writing mail temp file: %s"
 
 #: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr ""
+msgstr "Error copying mail temp file: %s"
 
 #: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
-msgstr ""
+msgstr "Failed to decrypt MIME part: protocol error"
 
 #: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
-msgstr ""
+msgstr "Failed to decrypt MIME part: invalid structure"
 
 #: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
-msgstr ""
+msgstr "parse error"
 
 #: camel/camel-provider.c:59
 msgid "Virtual folder email provider"
-msgstr ""
+msgstr "Virtual folder email provider"
 
 #: camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
-msgstr ""
+msgstr "For reading mail as a query of another set of folders"
 
 #: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
+msgstr "Could not load %s: Module loading not supported on this system."
 
 #: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
-msgstr ""
+msgstr "Could not load %s: %s"
 
 #: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr ""
+msgstr "Could not load %s: No initialisation code in module."
 
 #: camel/camel-provider.c:356 camel/camel-session.c:160
 #, c-format
 msgid "No provider available for protocol `%s'"
-msgstr ""
+msgstr "No provider available for protocol `%s'"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
-msgstr ""
+msgstr "Anonymous"
 
 #: camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
-msgstr ""
+msgstr "This option will connect to the server using an anonymous login."
 
 #: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
-msgstr ""
+msgstr "Authentication failed."
 
 #: camel/camel-sasl-anonymous.c:121
 #, c-format
@@ -8995,6 +9095,8 @@ msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
+"Invalid email address trace information:\n"
+"%s"
 
 #: camel/camel-sasl-anonymous.c:133
 #, c-format
@@ -9002,6 +9104,8 @@ msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
+"Invalid opaque trace information:\n"
+"%s"
 
 #: camel/camel-sasl-anonymous.c:145
 #, c-format
@@ -9009,132 +9113,150 @@ msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
+"Invalid trace information:\n"
+"%s"
 
 #: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
-msgstr ""
+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."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
-msgstr ""
+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."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
-msgstr ""
+msgstr "Server challenge too long (>2048 octets)\n"
 
 #: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
-msgstr ""
+msgstr "Server challenge invalid\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr ""
+msgstr "Server challenge contained invalid \"Quality of Protection\" token\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
-msgstr ""
+msgstr "Server response did not contain authorisation data\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr ""
+msgstr "Server response contained incomplete authorisation data\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
-msgstr ""
+msgstr "Server response does not match\n"
 
 #: camel/camel-sasl-gssapi.c:48
 msgid "GSSAPI"
-msgstr ""
+msgstr "GSSAPI"
 
 #: camel/camel-sasl-gssapi.c:50
 msgid "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:148
 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:153
 msgid "The provided target_name parameter was ill-formed."
-msgstr ""
+msgstr "The provided target_name parameter was ill-formed."
 
 #: camel/camel-sasl-gssapi.c:156
 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:160
 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:165
 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:169
 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:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
+msgstr "The supplied context handle did not refer to a valid context."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
-msgstr ""
+msgstr "The consistency checks performed on the input_token failed."
 
 #: camel/camel-sasl-gssapi.c:180
 msgid "The consistency checks performed on the credential failed."
-msgstr ""
+msgstr "The consistency checks performed on the credential failed."
 
 #: camel/camel-sasl-gssapi.c:183
 msgid "The referenced credentials have expired."
-msgstr ""
+msgstr "The referenced credentials have expired."
 
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
 msgid "Bad authentication response from server."
-msgstr ""
+msgstr "Bad authentication response from server."
 
 #: camel/camel-sasl-gssapi.c:213
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to resolve host `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to resolve host `%s': %s"
 
 #: camel/camel-sasl-gssapi.c:299
 msgid "Unsupported security layer."
-msgstr ""
+msgstr "Unsupported security layer."
 
 #: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
-msgstr ""
+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."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -9142,110 +9264,113 @@ msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
+"Could not get Kerberos ticket:\n"
+"%s"
 
 #: camel/camel-sasl-login.c:32
 msgid "Login"
-msgstr ""
+msgstr "Login"
 
 #: 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 ""
+msgstr "This option will connect to the server using a simple password."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
-msgstr ""
+msgstr "Unknown authentication state."
 
 #: camel/camel-sasl-ntlm.c:31
 msgid "NTLM / SPA"
-msgstr ""
+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."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
-msgstr ""
+msgstr "PLAIN"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
-msgstr ""
+msgstr "POP before SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr ""
+msgstr "This option will authorise a POP connection before attempting SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
-msgstr ""
+msgstr "POP Source URI"
 
 #: camel/camel-sasl-popb4smtp.c:106
 msgid "POP Before SMTP auth using an unknown transport"
-msgstr ""
+msgstr "POP Before SMTP auth using an unknown transport"
 
 #: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using a non-pop source"
-msgstr ""
+msgstr "POP Before SMTP auth using a non-pop source"
 
 #: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr ""
+msgstr "Regular expression compilation failed: %s: %s"
 
 #: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a username component"
-msgstr ""
+msgstr "URL '%s' needs a username component"
 
 #: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr ""
+msgstr "URL '%s' needs a host component"
 
 #: camel/camel-service.c:283
 #, c-format
 msgid "URL '%s' needs a path component"
-msgstr ""
+msgstr "URL '%s' needs a path component"
 
 #: camel/camel-service.c:733
 #, c-format
 msgid "Resolving: %s"
-msgstr ""
+msgstr "Resolving: %s"
 
 #: camel/camel-service.c:764 camel/camel-service.c:888
 #, c-format
 msgid "Failure in name lookup: %s"
-msgstr ""
+msgstr "Failure in name lookup: %s"
 
 #: camel/camel-service.c:785 camel/camel-service.c:909
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
-msgstr ""
+msgstr "Host lookup failed: cannot create thread: %s"
 
 #: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
-msgstr ""
+msgstr "Host lookup failed: %s: host not found"
 
 #: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
-msgstr ""
+msgstr "Host lookup failed: %s: unknown reason"
 
 #: camel/camel-service.c:855
-#, fuzzy
 msgid "Resolving address"
-msgstr "Synchronising \"%s\""
+msgstr "Resolving address"
 
 #: camel/camel-service.c:924
 msgid "Host lookup failed: host not found"
-msgstr ""
+msgstr "Host lookup failed: host not found"
 
 #: camel/camel-service.c:927
 msgid "Host lookup failed: unknown reason"
-msgstr ""
+msgstr "Host lookup failed: unknown reason"
 
 #: camel/camel-session.c:282
 #, c-format
@@ -9253,200 +9378,202 @@ msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
+"Could not create directory %s:\n"
+"%s"
 
 #: camel/camel-smime-context.c:104
 #, c-format
 msgid "Enter security pass-phrase for `%s'"
-msgstr ""
+msgstr "Enter security pass-phrase for `%s'"
 
 #: camel/camel-smime-context.c:514
 msgid "Unverified"
-msgstr ""
+msgstr "Unverified"
 
 #: camel/camel-smime-context.c:516
 msgid "Good signature"
-msgstr ""
+msgstr "Good signature"
 
 #: camel/camel-smime-context.c:518
 msgid "Bad signature"
-msgstr ""
+msgstr "Bad signature"
 
 #: camel/camel-smime-context.c:520
 msgid "Content tampered with or altered in transit"
-msgstr ""
+msgstr "Content tampered with or altered in transit"
 
 #: camel/camel-smime-context.c:522
 msgid "Signing certificate not found"
-msgstr ""
+msgstr "Signing certificate not found"
 
 #: camel/camel-smime-context.c:524
 msgid "Signing certificate not trusted"
-msgstr ""
+msgstr "Signing certificate not trusted"
 
 #: camel/camel-smime-context.c:526
 msgid "Signature algorithm unknown"
-msgstr ""
+msgstr "Signature algorithm unknown"
 
 #: camel/camel-smime-context.c:528
 msgid "Siganture algorithm unsupported"
-msgstr ""
+msgstr "Siganture algorithm unsupported"
 
 #: camel/camel-smime-context.c:530
 msgid "Malformed signature"
-msgstr ""
+msgstr "Malformed signature"
 
 #: camel/camel-smime-context.c:532
 msgid "Processing error"
-msgstr ""
+msgstr "Processing error"
 
 #: camel/camel-smime-context.c:647
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
-msgstr ""
+msgstr "Signer: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
-#, fuzzy
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot get folder: Invalid operation on this store"
 
 #: camel/camel-store.c:244
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder `%s': folder exists"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot create folder `%s': folder exists"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr ""
+msgstr "Cannot create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
-#, fuzzy, c-format
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1078
 msgid "Trash"
-msgstr ""
+msgstr "Trash"
 
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1082
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
-msgstr ""
+msgstr "Junk"
 
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
-msgstr ""
+msgstr "Unable to get issuer's certificate"
 
 #: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
-msgstr ""
+msgstr "Unable to get Certificate Revocation List"
 
 #: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
-msgstr ""
+msgstr "Unable to decrypt certificate signature"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
+msgstr "Unable to decrypt Certificate Revocation List signature"
 
 #: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
-msgstr ""
+msgstr "Unable to decode issuer's public key"
 
 #: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
-msgstr ""
+msgstr "Certificate signature failure"
 
 #: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
-msgstr ""
+msgstr "Certificate Revocation List signature failure"
 
 #: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
-msgstr ""
+msgstr "Certificate not yet valid"
 
 #: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
-msgstr ""
+msgstr "Certificate has expired"
 
 #: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
-msgstr ""
+msgstr "CRL not yet valid"
 
 #: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
-msgstr ""
+msgstr "CRL has expired"
 
 #: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
-msgstr ""
+msgstr "Error in CRL"
 
 #: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
-msgstr ""
+msgstr "Out of memory"
 
 #: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
-msgstr ""
+msgstr "Zero-depth self-signed certificate"
 
 #: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
-msgstr ""
+msgstr "Self-signed certificate in chain"
 
 #: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
-msgstr ""
+msgstr "Unable to get issuer's certificate locally"
 
 #: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
-msgstr ""
+msgstr "Unable to verify leaf signature"
 
 #: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
-msgstr ""
+msgstr "Certificate chain too long"
 
 #: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
-msgstr ""
+msgstr "Certificate Revoked"
 
 #: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
-msgstr ""
+msgstr "Invalid Certificate Authority (CA)"
 
 #: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
-msgstr ""
+msgstr "Path length exceeded"
 
 #: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
-msgstr ""
+msgstr "Invalid purpose"
 
 #: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
-msgstr ""
+msgstr "Certificate untrusted"
 
 #: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
-msgstr ""
+msgstr "Certificate rejected"
 
 #: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
-msgstr ""
+msgstr "Subject/Issuer mismatch"
 
 #: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
-msgstr ""
+msgstr "AKID/SKID mismatch"
 
 #: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
-msgstr ""
+msgstr "AKID/Issuer serial mismatch"
 
 #: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
-msgstr ""
+msgstr "Key usage does not support certificate signing"
 
 #: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
-msgstr ""
+msgstr "Error in application verification"
 
 #: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
@@ -9456,14 +9583,18 @@ msgid ""
 "Fingerprint:       %s\n"
 "Signature:         %s"
 msgstr ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
 
 #: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
-msgstr ""
+msgstr "GOOD"
 
 #: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
-msgstr ""
+msgstr "BAD"
 
 #: camel/camel-tcp-stream-openssl.c:704
 #, c-format
@@ -9476,6 +9607,13 @@ msgid ""
 "\n"
 "Do you wish to accept anyway?"
 msgstr ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
 
 #. construct our user prompt
 #: camel/camel-tcp-stream-ssl.c:841
@@ -9487,6 +9625,11 @@ msgid ""
 "\n"
 "Do you wish to accept?"
 msgstr ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 
 #: camel/camel-tcp-stream-ssl.c:885
 #, c-format
@@ -9494,6 +9637,8 @@ msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
+"Certificate problem: %s\n"
+"Issuer: %s"
 
 #: camel/camel-tcp-stream-ssl.c:937
 #, c-format
@@ -9501,6 +9646,8 @@ msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
 
 #: camel/camel-tcp-stream-ssl.c:955
 #, c-format
@@ -9508,6 +9655,8 @@ msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
+"Certificate expired: %s\n"
+"Issuer: %s"
 
 #: camel/camel-tcp-stream-ssl.c:972
 #, c-format
@@ -9515,119 +9664,118 @@ msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
 
 #: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
-msgstr ""
+msgstr "Could not parse URL `%s'"
 
 #: camel/camel-vee-folder.c:611
 #, c-format
 msgid "Error storing `%s': %s"
-msgstr ""
+msgstr "Error storing `%s': %s"
 
 #: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
-msgstr ""
+msgstr "No such message %s in %s"
 
 #: camel/camel-vee-folder.c:815 camel/camel-vee-folder.c:821
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr ""
+msgstr "Cannot copy or move messages into a Virtual Folder"
 
-#: camel/camel-vee-store.c:365
-#, fuzzy, c-format
+#: camel/camel-vee-store.c:368
+#, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:378
-#, fuzzy, c-format
+#: camel/camel-vee-store.c:381
+#, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot rename folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:386
-#, fuzzy, c-format
+#: camel/camel-vee-store.c:389
+#, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot rename folder: %s: No such folder"
 
 #: camel/camel-vtrash-folder.c:44
-#, fuzzy
 msgid "Cannot copy messages to the Trash folder"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot copy messages to the Trash folder"
 
 #: camel/camel-vtrash-folder.c:46
-#, fuzzy
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot copy messages to the Junk folder"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
-msgstr ""
+msgstr "Checking for new mail"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
 #: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
-msgstr ""
+msgstr "Check for new messages in all folders"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr ""
+msgstr "Apply filters to new messages in Inbox on this server"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
 #: camel/providers/imap/camel-imap-provider.c:70
 msgid "Automatically synchronize remote mail locally"
-msgstr ""
+msgstr "Automatically synchronise remote mail locally"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-#, fuzzy
-msgid "LDAP Server Name:"
-msgstr "Synchronising \"%s\""
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book And Calendar"
+msgstr "Address Book And Calendar"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "Organisation:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr "Post Office Agent SOAP Port:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
 msgid "Novell GroupWise"
-msgstr ""
+msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "For accessing Novell Groupwise servers"
-msgstr ""
+msgstr "For accessing Novell Groupwise servers"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
 #: camel/providers/imap/camel-imap-provider.c:93
 #: 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:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
 #: 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."
 
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Checklist"
-msgstr ""
+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:2888
+#: camel/providers/imap/camel-imap-store.c:3024
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
-msgstr ""
+msgstr "Server unexpectedly disconnected: %s"
 
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
@@ -9636,56 +9784,58 @@ msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
 
 #: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr ""
+msgstr "Unexpected response from IMAP server: %s"
 
 #: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr ""
+msgstr "IMAP command failed: %s"
 
 #: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
-msgstr ""
+msgstr "Server response ended too soon."
 
 #: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr ""
+msgstr "IMAP server response did not contain %s information"
 
 #: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
+msgstr "Unexpected OK response from IMAP server: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:223
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr ""
+msgstr "Could not create directory %s: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:242
 #, c-format
 msgid "Could not load summary for %s"
-msgstr ""
+msgstr "Could not load summary for %s"
 
 #: camel/providers/imap/camel-imap-folder.c:323
 msgid "Folder was destroyed and recreated on server."
-msgstr ""
+msgstr "Folder was destroyed and recreated on server."
 
 #. Check UIDs and flags of all messages we already know of.
 #: camel/providers/imap/camel-imap-folder.c:566
 msgid "Scanning for changed messages"
-msgstr ""
+msgstr "Scanning for changed messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1917
-#, fuzzy, c-format
+#: camel/providers/imap/camel-imap-folder.c:1924
+#, c-format
 msgid "Unable to retrieve message: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Unable to retrieve message: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9698,33 +9848,35 @@ msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
+"Cannot get message: %s\n"
+"  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
-msgstr ""
+msgstr "No such message"
 
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
-msgstr ""
+msgstr "This message is not currently available"
 
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
 msgid "Fetching summary information for new messages"
-msgstr ""
+msgstr "Fetching summary information for new messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
 msgid "Could not find message body in FETCH response."
-msgstr ""
+msgstr "Could not find message body in FETCH response."
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
-msgstr ""
+msgstr "Could not open cache directory: %s"
 
 #: camel/providers/imap/camel-imap-message-cache.c:252
 #: camel/providers/imap/camel-imap-message-cache.c:309
@@ -9732,77 +9884,74 @@ msgstr ""
 #: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr ""
+msgstr "Failed to cache message %s: %s"
 
 #: camel/providers/imap/camel-imap-message-cache.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to cache %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
-#, fuzzy
 msgid "Connection to Server"
-msgstr "Synchronise \"%s\""
+msgstr "Connection to Server"
 
 #: camel/providers/imap/camel-imap-provider.c:45
-#, fuzzy
 msgid "Use custom command to connect to server"
-msgstr "Synchronising \"%s\""
+msgstr "Use custom command to connect to server"
 
 #: camel/providers/imap/camel-imap-provider.c:47
-#, fuzzy
 msgid "Command:"
-msgstr "Colours"
+msgstr "Command:"
 
 #: camel/providers/imap/camel-imap-provider.c:55
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
-msgstr ""
+msgstr "Folders"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
-msgstr ""
+msgstr "Show only subscribed folders"
 
 #: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
-msgstr ""
+msgstr "Override server-supplied folder namespace"
 
 #: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
-msgstr ""
+msgstr "Namespace"
 
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr ""
+msgstr "Apply filters to new messages in INBOX on this server"
 
 #: camel/providers/imap/camel-imap-provider.c:66
 msgid "Check new messages for Junk contents"
-msgstr ""
+msgstr "Check new messages for Junk contents"
 
 #: camel/providers/imap/camel-imap-provider.c:68
 msgid "Only check for Junk messages in the INBOX folder"
-msgstr ""
+msgstr "Only check for Junk messages in the INBOX folder"
 
 #: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
-msgstr ""
+msgstr "IMAP"
 
 #: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
-msgstr ""
+msgstr "For reading and storing mail on IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
 #, c-format
 msgid "IMAP server %s"
-msgstr ""
+msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
 #, c-format
 msgid "IMAP service for %s on %s"
-msgstr ""
+msgstr "IMAP service for %s on %s"
 
-#: camel/providers/imap/camel-imap-store.c:601
-#: camel/providers/imap/camel-imap-store.c:621
+#: camel/providers/imap/camel-imap-store.c:546
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -9810,110 +9959,115 @@ msgstr ""
 #: camel/providers/smtp/camel-smtp-transport.c:285
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
-msgstr ""
+msgstr "Could not connect to %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:548
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
-msgstr ""
+msgstr "SSL unavailable"
 
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:563
+#: camel/providers/imap/camel-imap-store.c:800
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
-msgstr ""
+msgstr "Connection cancelled"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
-#, fuzzy, c-format
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
+#, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to connect to IMAP server %s in secure mode: %s"
 
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:635
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
-msgstr ""
+msgstr "SSL/TLS extension not supported."
 
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
-msgstr ""
+msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:853
-#, fuzzy, c-format
+#: camel/providers/imap/camel-imap-store.c:803
+#, c-format
 msgid "Could not connect with command \"%s\": %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not connect with command \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr ""
+msgstr "IMAP server %s does not support requested authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
-msgstr ""
+msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
+msgstr "%sPlease enter the IMAP password for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
 msgid "You didn't enter a password."
-msgstr ""
+msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
 #, c-format
 msgid "No such folder %s"
+msgstr "No such folder %s"
+
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1825
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:236
+#, c-format
 msgid "Cannot create folder `%s': folder exists."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2046
+#: camel/providers/imap/camel-imap-store.c:2102
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:2058
-#, fuzzy, c-format
 msgid "Unknown parent folder: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Unknown parent folder: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
 msgid "The parent folder is not allowed to contain subfolders"
-msgstr ""
+msgstr "The parent folder is not allowed to contain subfolders"
 
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
-msgstr ""
+msgstr "Message storage"
 
 #: camel/providers/imapp/camel-imapp-provider.c:47
 msgid "IMAP+"
-msgstr ""
+msgstr "IMAP+"
 
 #: camel/providers/imapp/camel-imapp-provider.c:49
 msgid ""
@@ -9922,250 +10076,257 @@ msgid ""
 "\n"
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 
 #: camel/providers/imapp/camel-imapp-store.c:328
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to POP server on %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not connect to POP server on %s"
 
 #: camel/providers/local/camel-local-folder.c:179
 msgid "Index message body data"
-msgstr ""
+msgstr "Index message body data"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "~%s (%s)"
-msgstr ""
+msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
 #, c-format
 msgid "mailbox:%s (%s)"
-msgstr ""
+msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: camel/providers/local/camel-local-provider.c:43
 msgid "Use the `.folders' folder summary file (exmh)"
-msgstr ""
+msgstr "Use the `.folders' folder summary file (exmh)"
 
 #: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
-msgstr ""
+msgstr "MH-format mail directories"
 
 #: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
-msgstr ""
+msgstr "For storing local mail in MH-like mail directories."
 
 #: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
-msgstr ""
+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."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
-msgstr ""
+msgstr "Apply filters to new messages in INBOX"
 
 #: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
-msgstr ""
+msgstr "Maildir-format mail directories"
 
 #: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
-msgstr ""
+msgstr "For storing local mail in maildir directories."
 
 #: camel/providers/local/camel-local-provider.c:95
 msgid "Store status headers in Elm/Pine/Mutt format"
-msgstr ""
+msgstr "Store status headers in Elm/Pine/Mutt format"
 
 #: camel/providers/local/camel-local-provider.c:101
 msgid "Standard Unix mbox spool or directory"
-msgstr ""
+msgstr "Standard Unix mbox spool or directory"
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
+"For reading and storing local mail in external standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:355
+#: camel/providers/local/camel-mbox-store.c:356
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr ""
+msgstr "Store root %s is not an absolute path"
 
 #: camel/providers/local/camel-local-store.c:145
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr ""
+msgstr "Store root %s is not a regular directory"
 
 #: camel/providers/local/camel-local-store.c:154
 #: camel/providers/local/camel-local-store.c:162
 #: camel/providers/local/camel-local-store.c:226
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr ""
+msgstr "Cannot get folder: %s: %s"
 
 #: camel/providers/local/camel-local-store.c:174
 msgid "Local stores do not have an inbox"
-msgstr ""
+msgstr "Local stores do not have an inbox"
 
 #: camel/providers/local/camel-local-store.c:186
 #, c-format
 msgid "Local mail file %s"
-msgstr ""
+msgstr "Local mail file %s"
 
 #: camel/providers/local/camel-local-store.c:295
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr ""
+msgstr "Could not rename folder %s to %s: %s"
 
 #: camel/providers/local/camel-local-store.c:360
-#, fuzzy, c-format
+#, c-format
 msgid "Could not rename '%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not rename '%s': %s"
 
 #: camel/providers/local/camel-local-store.c:385
 #: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
+msgstr "Could not delete folder summary file `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:395
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
-msgstr ""
+msgstr "Could not delete folder index file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
-#, fuzzy, c-format
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
+#, c-format
 msgid "Could not delete folder meta file `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not delete folder meta file `%s': %s"
 
 #: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
-msgstr ""
+msgstr "Could not save summary: %s: %s"
 
 #: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
-msgstr ""
+msgstr "Unable to add message to summary: unknown reason"
 
 #: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
-msgstr ""
+msgstr "Maildir append message cancelled"
 
 #: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
+msgstr "Cannot append message to maildir folder: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:234
 #: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
-msgstr ""
+msgstr "Invalid message contents"
 
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:204
+#, c-format
 msgid "Cannot get folder `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot get folder `%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:211
+#, c-format
 msgid "Cannot get folder `%s': folder does not exist."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot get folder `%s': folder does not exist."
 
 #: camel/providers/local/camel-maildir-store.c:119
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot create folder `%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot get folder `%s': not a maildir directory."
 
 #: camel/providers/local/camel-maildir-store.c:173
 #: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
-msgstr ""
+msgstr "Could not delete folder `%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
-msgstr ""
+msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
 msgid "Could not scan folder `%s': %s"
-msgstr ""
+msgstr "Could not scan folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr ""
+msgstr "Cannot open maildir directory path: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
-msgstr ""
+msgstr "Checking folder consistency"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
-msgstr ""
+msgstr "Checking for new messages"
 
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
 #: camel/providers/local/camel-mbox-summary.c:369
 #: camel/providers/local/camel-mbox-summary.c:542
 #: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
-#, fuzzy
 msgid "Storing folder"
-msgstr "Synchronising \"%s\""
+msgstr "Storing folder"
 
 #: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr ""
+msgstr "Cannot create folder lock on %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
+msgstr "Cannot open mailbox: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
-msgstr ""
+msgstr "Mail append cancelled"
 
 #: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
+msgstr "Cannot append message to mbox file: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:435
 #: camel/providers/local/camel-mbox-folder.c:466
@@ -10175,25 +10336,26 @@ msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
+msgstr "The folder appears to be irrecoverably corrupted."
 
 #: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
+msgstr "Message construction failed: Corrupt mailbox?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
-#, fuzzy
+#: camel/providers/local/camel-mbox-store.c:362
 msgid "Cannot create a folder by this name."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot create a folder by this name."
 
 #: camel/providers/local/camel-mbox-store.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get folder `%s': not a regular file."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot get folder `%s': not a regular file."
 
 #: camel/providers/local/camel-mbox-store.c:236
 #: camel/providers/local/camel-mbox-store.c:247
@@ -10203,156 +10365,158 @@ msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
+"Could not delete folder `%s':\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
-msgstr ""
+msgstr "`%s' is not a regular file."
 
 #: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
+msgstr "Folder `%s' is not empty. Not deleted."
 
-#: camel/providers/local/camel-mbox-store.c:374
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:375
+#, c-format
 msgid "Cannot create directory `%s': %s."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot create directory `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:388
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:389
+#, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot create folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
 msgid "Folder already exists"
-msgstr ""
+msgstr "Folder already exists"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
 msgid "The new folder name is illegal."
-msgstr ""
+msgstr "The new folder name is illegal."
 
-#: camel/providers/local/camel-mbox-store.c:485
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:486
+#, c-format
 msgid "Could not rename `%s': `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not rename `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:561
+#, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not rename '%s' to %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr ""
+msgstr "Could not open folder: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
+msgstr "Fatal mail parser error near position %ld in folder %s"
 
 #: camel/providers/local/camel-mbox-summary.c:479
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot check folder: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:547
 #: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
-msgstr ""
+msgstr "Could not open file: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr ""
+msgstr "Cannot open temporary mailbox: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:572
 #: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr ""
+msgstr "Could not close source folder %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
-msgstr ""
+msgstr "Could not close temp folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr ""
+msgstr "Could not rename folder: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:676
 #: camel/providers/local/camel-mbox-summary.c:684
 #: camel/providers/local/camel-mbox-summary.c:877
 #: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
+msgstr "Summary and folder mismatch, even after a sync"
 
 #: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
-msgstr ""
+msgstr "Unknown error: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:846
-#, fuzzy, c-format
+#, c-format
 msgid "Could not store folder: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not store folder: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:940
 #: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
-msgstr ""
+msgstr "Error writing to temp mailbox: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
+msgstr "Writing to tmp mailbox failed: %s: %s"
 
 #: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
-msgstr ""
+msgstr "MH append message cancelled"
 
 #: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr ""
+msgstr "Cannot append message to mh folder: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:217
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:219
+#, c-format
 msgid "Could not create folder `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not create folder `%s': %s"
 
-#: camel/providers/local/camel-mh-store.c:229
-#, fuzzy, c-format
+#: camel/providers/local/camel-mh-store.c:231
+#, c-format
 msgid "Cannot get folder `%s': not a directory."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot get folder `%s': not a directory."
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr ""
+msgstr "Cannot open MH directory path: %s: %s"
 
 #: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
-msgstr ""
+msgstr "Spool `%s' cannot be opened: %s"
 
 #: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
-msgstr ""
+msgstr "Spool `%s' is not a regular file or directory"
 
 #: camel/providers/local/camel-spool-store.c:153
 #, c-format
 msgid "Folder `%s/%s' does not exist."
-msgstr ""
+msgstr "Folder `%s/%s' does not exist."
 
 #: camel/providers/local/camel-spool-store.c:163
 #, c-format
@@ -10360,11 +10524,13 @@ msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
+"Could not open folder `%s':\n"
+"%s"
 
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid "Folder `%s' does not exist."
-msgstr ""
+msgstr "Folder `%s' does not exist."
 
 #: camel/providers/local/camel-spool-store.c:172
 #, c-format
@@ -10372,45 +10538,47 @@ msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
+"Could not create folder `%s':\n"
+"%s"
 
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
-msgstr ""
+msgstr "`%s' is not a mailbox file."
 
 #: camel/providers/local/camel-spool-store.c:197
 msgid "Store does not support an INBOX"
-msgstr ""
+msgstr "Store does not support an INBOX"
 
 #: camel/providers/local/camel-spool-store.c:209
 #, c-format
 msgid "Spool mail file %s"
-msgstr ""
+msgstr "Spool mail file %s"
 
 #: camel/providers/local/camel-spool-store.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "Spool folder tree %s"
-msgstr "Synchronising \"%s\""
+msgstr "Spool folder tree %s"
 
 #: camel/providers/local/camel-spool-store.c:217
 msgid "Spool folders cannot be renamed"
-msgstr ""
+msgstr "Spool folders cannot be renamed"
 
 #: camel/providers/local/camel-spool-store.c:225
 msgid "Spool folders cannot be deleted"
-msgstr ""
+msgstr "Spool folders cannot be deleted"
 
 #: camel/providers/local/camel-spool-summary.c:175
 #: camel/providers/local/camel-spool-summary.c:185
 #: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr ""
+msgstr "Could not sync temporary folder %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr ""
+msgstr "Could not sync spool folder %s: %s"
 
 #: camel/providers/local/camel-spool-summary.c:242
 #: camel/providers/local/camel-spool-summary.c:261
@@ -10420,25 +10588,26 @@ msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
 #: camel/providers/nntp/camel-nntp-store.c:997
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
+msgstr "Please enter the NNTP password for %s@%s"
 
 #: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
-msgstr ""
+msgstr "Server rejected username"
 
 #: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
 msgid "Failed to send username to server"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to send username to server"
 
 #: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
-msgstr ""
+msgstr "Server rejected username/password"
 
 #: camel/providers/nntp/camel-nntp-folder.c:140
 #: camel/providers/nntp/camel-nntp-folder.c:230
@@ -10447,7 +10616,7 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-folder.c:491
 #: camel/providers/pop3/camel-pop3-folder.c:509
 msgid "User cancelled"
-msgstr ""
+msgstr "User cancelled"
 
 #: camel/providers/nntp/camel-nntp-folder.c:142
 #: camel/providers/nntp/camel-nntp-folder.c:226
@@ -10456,111 +10625,112 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
 #: camel/providers/pop3/camel-pop3-folder.c:512
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get message %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot get message %s: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:157
 #: camel/providers/nntp/camel-nntp-folder.c:195
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
-msgstr ""
+msgstr "Internal error: uid in invalid format: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "Could not get article %s from NNTP server"
-msgstr "Synchronising \"%s\""
+msgstr "Could not get article %s from NNTP server"
 
 #: camel/providers/nntp/camel-nntp-folder.c:353
 msgid "Posting not allowed by news server"
-msgstr ""
+msgstr "Posting not allowed by news server"
 
 #: camel/providers/nntp/camel-nntp-folder.c:364
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
+msgstr "Failed to send newsgroups header: %s: message not posted"
 
 #: camel/providers/nntp/camel-nntp-folder.c:404
 #: camel/providers/nntp/camel-nntp-folder.c:417
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
+msgstr "Error posting to newsgroup: %s: message not posted"
 
 #: camel/providers/nntp/camel-nntp-folder.c:429
 msgid "Error reading response to posted message: message not posted"
-msgstr ""
+msgstr "Error reading response to posted message: message not posted"
 
 #: camel/providers/nntp/camel-nntp-folder.c:432
 #, c-format
 msgid "Error posting message: %s: message not posted"
-msgstr ""
+msgstr "Error posting message: %s: message not posted"
 
 #: camel/providers/nntp/camel-nntp-folder.c:448
 msgid "You cannot post NNTP messages while working offline!"
-msgstr ""
+msgstr "You cannot post NNTP messages while working offline!"
 
 #: camel/providers/nntp/camel-nntp-folder.c:459
-#, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Synchronising \"%s\""
+msgstr "You cannot copy messages from a NNTP folder!"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
 msgid "Could not get group list from server."
-msgstr "Synchronising \"%s\""
+msgstr "Could not get group list from server."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:98
 #: camel/providers/nntp/camel-nntp-grouplist.c:107
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
+msgstr "Unable to load grouplist file for %s: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save grouplist file for %s: %s"
-msgstr "Synchronising \"%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)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
-msgstr ""
+msgstr "In the subscription dialogue, show relative folder names"
 
 #: camel/providers/nntp/camel-nntp-provider.c:52
 msgid "USENET news"
-msgstr ""
+msgstr "USENET news"
 
 #: camel/providers/nntp/camel-nntp-provider.c:54
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
+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."
 
 #: camel/providers/nntp/camel-nntp-store.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "Could not read greeting from %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not read greeting from %s: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:170
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr ""
+msgstr "NNTP server %s returned error code %d: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:326
 #, c-format
 msgid "USENET News via %s"
-msgstr ""
+msgstr "USENET News via %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:640
 msgid "Stream error"
-msgstr ""
+msgstr "Stream error"
 
 #: camel/providers/nntp/camel-nntp-store.c:643
 #, c-format
@@ -10569,6 +10739,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
 
 #: camel/providers/nntp/camel-nntp-store.c:735
 msgid ""
@@ -10576,6 +10749,9 @@ msgid ""
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
 
 #: camel/providers/nntp/camel-nntp-store.c:767
 msgid ""
@@ -10583,119 +10759,123 @@ msgid ""
 "\n"
 "newsgroup does not exist!"
 msgstr ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
 
 #: camel/providers/nntp/camel-nntp-store.c:792
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
+msgstr "You cannot create a folder in a News store: subscribe instead."
 
 #: camel/providers/nntp/camel-nntp-store.c:800
-#, fuzzy
 msgid "You cannot rename a folder in a News store."
-msgstr "Synchronising \"%s\""
+msgstr "You cannot rename a folder in a News store."
 
 #: camel/providers/nntp/camel-nntp-store.c:808
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
+msgstr "You cannot remove a folder in a News store: unsubscribe instead."
 
-#: camel/providers/nntp/camel-nntp-summary.c:247
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:253
+#, c-format
 msgid "Connection error: %s"
-msgstr "Synchronise \"%s\""
+msgstr "Connection error: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:258
-#, fuzzy, c-format
+#: camel/providers/nntp/camel-nntp-summary.c:262
+#, c-format
 msgid "No such folder: %s"
-msgstr "Synchronising \"%s\""
+msgstr "No such folder: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
 #, c-format
 msgid "Could not get group: %s"
-msgstr ""
+msgstr "Could not get group: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
 msgid "Could not get messages: unspecificed error"
-msgstr ""
+msgstr "Could not get messages: unspecificed error"
 
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "NNTP Command failed: %s"
-msgstr ""
+msgstr "NNTP Command failed: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr ""
+msgstr "%s: Scanning new messages"
 
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
 #, c-format
 msgid "Unknown server response: %s"
-msgstr ""
+msgstr "Unknown server response: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
 msgid "Use cancel"
-msgstr ""
+msgstr "Use cancel"
 
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
 #, c-format
 msgid "Operation failed: %s"
-msgstr ""
+msgstr "Operation failed: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:246
 msgid "Retrieving POP summary"
-msgstr ""
+msgstr "Retrieving POP summary"
 
 #: camel/providers/pop3/camel-pop3-folder.c:265
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get POP summary: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot get POP summary: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
-msgstr ""
+msgstr "Expunging deleted messages"
 
 #: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
-msgstr ""
+msgstr "No message with uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
 #: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr ""
+msgstr "Retrieving POP message %d"
 
 #: camel/providers/pop3/camel-pop3-folder.c:501
 msgid "Unknown reason"
-msgstr ""
+msgstr "Unknown reason"
 
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
-msgstr ""
+msgstr "Leave messages on server"
 
 #: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
-msgstr ""
+msgstr "Delete after %s day(s)"
 
 #: camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable support for all POP3 extensions"
-msgstr ""
+msgstr "Disable support for all POP3 extensions"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
-msgstr ""
+msgstr "POP"
 
 #: camel/providers/pop3/camel-pop3-provider.c:56
 msgid "For connecting to and downloading mail from POP servers."
-msgstr ""
+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."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
@@ -10703,23 +10883,26 @@ msgid ""
 "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
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not connect to POP server %s (port %d): %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:227
 #: camel/providers/pop3/camel-pop3-store.c:256
 #: camel/providers/pop3/camel-pop3-store.c:268
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
+msgstr "Failed to connect to POP server %s in secure mode: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:366
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to POP server %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not connect to POP server %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:521
@@ -10728,233 +10911,239 @@ 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:423
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr ""
+msgstr "SASL `%s' Login failed for POP server %s: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr ""
+msgstr "Cannot login to POP server %s: SASL Protocol error"
 
 #: camel/providers/pop3/camel-pop3-store.c:454
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to authenticate on POP server %s: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:480
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
-msgstr ""
+msgstr "%sPlease enter the POP password for %s on host %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:535
 #: camel/providers/pop3/camel-pop3-store.c:542
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr "Synchronising \"%s\""
+msgstr ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:641
 #, c-format
 msgid "No such folder `%s'."
-msgstr ""
+msgstr "No such folder `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
 msgid "Sendmail"
-msgstr ""
+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."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
-msgstr ""
+msgstr "Could not parse recipient list"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
+msgstr "Could not create pipe to sendmail: %s: mail not sent"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
+msgstr "Could not fork sendmail: %s: mail not sent"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
-msgstr ""
+msgstr "Could not send message: %s"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
+msgstr "sendmail exited with signal %s: mail not sent."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr ""
+msgstr "Could not execute %s: mail not sent."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
+msgstr "sendmail exited with status %d: mail not sent."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
-msgstr ""
+msgstr "sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
-msgstr ""
+msgstr "Mail delivery via the sendmail program"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
-msgstr ""
+msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr ""
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr "For delivering mail by connecting to a remote mailhub using SMTP."
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
-msgstr ""
+msgstr "Syntax error, command unrecognised"
 
 #: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
-msgstr ""
+msgstr "Syntax error in parameters or arguments"
 
 #: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
-msgstr ""
+msgstr "Command not implemented"
 
 #: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
-msgstr ""
+msgstr "Command parameter not implemented"
 
 #: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
-msgstr ""
+msgstr "System status, or system help reply"
 
 #: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
-msgstr ""
+msgstr "Help message"
 
 #: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
-msgstr ""
+msgstr "Service ready"
 
 #: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
-msgstr ""
+msgstr "Service closing transmission channel"
 
 #: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
-msgstr ""
+msgstr "Service not available, closing transmission channel"
 
 #: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
-msgstr ""
+msgstr "Requested mail action okay, completed"
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
-msgstr ""
+msgstr "User not local; will forward to <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
+msgstr "Requested mail action not taken: mailbox unavailable"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
+msgstr "Requested action not taken: mailbox unavailable"
 
 #: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
-msgstr ""
+msgstr "Requested action aborted: error in processing"
 
 #: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
-msgstr ""
+msgstr "User not local; please try <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr ""
+msgstr "Requested action not taken: insufficient system storage"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
+msgstr "Requested mail action aborted: exceeded storage allocation"
 
 #: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
+msgstr "Requested action not taken: mailbox name not allowed"
 
 #: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr ""
+msgstr "Start mail input; end with <CRLF>.<CRLF>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
-msgstr ""
+msgstr "Transaction failed"
 
 #: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
-msgstr ""
+msgstr "A password transition is needed"
 
 #: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
-msgstr ""
+msgstr "Authentication mechanism is too weak"
 
 #: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
-msgstr ""
+msgstr "Encryption required for requested authentication mechanism"
 
 #: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
-msgstr ""
+msgstr "Temporary authentication failure"
 
 #: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
-msgstr ""
+msgstr "Authentication required"
 
 #: camel/providers/smtp/camel-smtp-transport.c:308
 msgid "Welcome response error"
-msgstr ""
+msgstr "Welcome response error"
 
 #: camel/providers/smtp/camel-smtp-transport.c:343
 #: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr ""
+msgstr "Failed to connect to SMTP server %s in secure mode: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
-msgstr ""
+msgstr "server does not appear to support SSL"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr ""
+msgid "STARTTLS command failed: %s"
+msgstr "STARTTLS command failed: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr ""
+msgid "STARTTLS command failed"
+msgstr "STARTTLS command failed"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr ""
+msgstr "SMTP server %s does not support requested authentication type %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr ""
+msgstr "%sPlease enter the SMTP password for %s on host %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
@@ -10963,201 +11152,201 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
-msgstr ""
+msgstr "SMTP server %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr ""
+msgstr "SMTP mail delivery via %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+msgid "Cannot send message: service not connected."
+msgstr "Cannot send message: service not connected."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
-msgstr ""
+msgstr "Cannot send message: sender address not valid."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
-msgstr ""
+msgstr "Sending message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
-msgstr ""
+msgstr "Cannot send message: no recipients defined."
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Cannot send message: one or more invalid recipients"
-msgstr ""
+msgstr "Cannot send message: one or more invalid recipients"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
-msgstr ""
+msgstr "SMTP Greeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
 #, c-format
-msgid "HELO request timed out: %s"
-msgstr ""
+msgid "HELO command failed: %s"
+msgstr "HELO command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:960
+msgid "HELO command failed"
+msgstr "HELO command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
-msgstr ""
+msgstr "SMTP Authentication"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
-msgstr ""
+msgstr "Error creating SASL authentication object."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 #, c-format
-msgid "AUTH request timed out: %s"
-msgstr ""
+msgid "AUTH command failed: %s"
+msgstr "AUTH command failed: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr ""
+msgid "AUTH command failed"
+msgstr "AUTH command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 msgid "Bad authentication response from server.\n"
-msgstr ""
+msgstr "Bad authentication response from server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
+msgid "MAIL FROM command failed: %s: mail not sent"
+msgstr "MAIL FROM command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
+msgstr "MAIL FROM command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1194
 #, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "RCPT TO command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
-msgstr ""
+msgstr "RCPT TO <%s> failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1257
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
 #, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
+msgid "DATA command failed: %s: mail not sent"
+msgstr "DATA command failed: %s: mail not sent"
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-msgid "DATA response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+msgid "DATA command failed"
+msgstr "DATA command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1368
 #, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr ""
+msgid "RSET command failed: %s"
+msgstr "RSET command failed: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
+msgid "RSET command failed"
+msgstr "RSET command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
 #, c-format
-msgid "QUIT request timed out: %s"
-msgstr ""
+msgid "QUIT command failed: %s"
+msgstr "QUIT command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+msgid "QUIT command failed"
+msgstr "QUIT command failed"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
-msgstr ""
+msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
-msgstr ""
+msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
-msgstr ""
+msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
 msgid "attachment"
-msgstr ""
+msgstr "attachment"
 
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "Remove selected items from the attachment list"
-msgstr ""
+msgstr "Remove selected items from the attachment list"
 
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Add attachment..."
-msgstr ""
+msgstr "Add attachment..."
 
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Attach a file to the message"
-msgstr ""
+msgstr "Attach a file to the message"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
-#, fuzzy, c-format
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
+#, c-format
 msgid "Cannot attach file %s: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot attach file %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
-msgstr ""
+msgstr "Cannot attach file %s: not a regular file"
 
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment Properties"
-msgstr ""
+msgstr "Attachment Properties"
 
 #: composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
-msgstr ""
+msgstr "File name:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
 msgid "MIME type:"
-msgstr ""
+msgstr "MIME type:"
 
 #: composer/e-msg-composer-attachment.glade.h:6
 #: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
-msgstr ""
+msgstr "Suggest automatic display of attachment"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
 msgid "You need to configure an account before you can compose mail."
-msgstr ""
+msgstr "You need to configure an account before you can compose mail."
 
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
-msgstr ""
+msgstr "Posting destination"
 
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
-msgstr ""
+msgstr "Choose folders to post the message to."
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
-msgstr ""
+msgstr "Click here for the address book"
 
 #.
 #. * Reply-To:
@@ -11166,227 +11355,259 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
-msgstr ""
+msgstr "Reply-To:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
-msgstr ""
+msgstr "From:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
-msgstr ""
+msgstr "Subject:"
 
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
-msgstr ""
+msgstr "To:"
 
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
-msgstr ""
+msgstr "Enter the recipients of the message"
 
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
-msgstr ""
+msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
+msgstr "Enter the addresses that will receive a carbon copy of the message"
 
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
-msgstr ""
+msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: 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."
 
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
-msgstr ""
+msgstr "Post To:"
 
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
-msgstr ""
+msgstr "Click here to select folders to post to"
 
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
-msgstr ""
+msgstr "Attach file(s)"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:660
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
+"Cannot sign outgoing message: No signing certificate set for from account"
 
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:666
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
+"Cannot encrypt outgoing message: No encryption certificate set for from "
+"account"
 
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:797
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
+"Error while reading file %s:\n"
+"%s"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
 msgid "File exists, overwrite?"
-msgstr ""
+msgstr "File exists, overwrite?"
 
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
-msgstr ""
+msgstr "Error saving file: %s"
 
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
 #, c-format
 msgid "Error loading file: %s"
-msgstr ""
+msgstr "Error loading file: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid "Error accessing file: %s"
-msgstr ""
+msgstr "Error accessing file: %s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
 msgid "Unable to retrieve message from editor"
-msgstr ""
+msgstr "Unable to retrieve message from editor"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
+"Unable to seek on file: %s\n"
+"%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
+"Unable to truncate file: %s\n"
+"%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr ""
+"Unable to copy file descriptor: %s\n"
+"%s"
 
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
+"Error autosaving message: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
 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?"
 
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
 #, c-format
 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?"
 
 #: composer/e-msg-composer.c:1567
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#: composer/e-msg-composer.c:1574
 msgid "Warning: Modified Message"
-msgstr ""
+msgstr "Warning: Modified Message"
 
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
 msgid "Open file"
-msgstr ""
+msgstr "Open file"
 
-#: composer/e-msg-composer.c:2045
+#: composer/e-msg-composer.c:2052
 msgid "Signature:"
-msgstr ""
+msgstr "Signature:"
 
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2092 mail/mail-account-gui.c:1317
 msgid "Autogenerated"
-msgstr ""
+msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2270
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<b>%d</b> File Attached"
+msgstr[1] "<b>%d</b> Files Attached"
 
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2299
 msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
+msgstr "Hide _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2302 composer/e-msg-composer.c:3178
 msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
+msgstr "Show _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2319 composer/e-msg-composer.c:3060
+#: composer/e-msg-composer.c:3061
 msgid "Compose a message"
-msgstr ""
+msgstr "Compose a message"
 
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3090
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
 
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3119
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
 "Please make sure you have the correct version\n"
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
 
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3223
 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."
 
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4246
 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>"
 
 #: data/evolution.desktop.in.in.h:1
-#, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "The Ximian Evolution Groupware Suite"
 
 #: data/evolution.desktop.in.in.h:2
-#, fuzzy
 msgid "Ximian Evolution (Unstable)"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Ximian Evolution (Unstable)"
 
 #: data/evolution.keys.in.in.h:1
 msgid "address card"
-msgstr ""
+msgstr "address card"
 
 #: data/evolution.keys.in.in.h:2
 msgid "calendar information"
-msgstr ""
+msgstr "calendar information"
 
 #: designs/OOA/ooa.glade.h:1
 msgid ""
@@ -11394,14 +11615,17 @@ msgid ""
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 msgstr ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
 
 #: designs/OOA/ooa.glade.h:4
 msgid "<b>Out of Office Message:</b>"
-msgstr ""
+msgstr "<b>Out of Office Message:</b>"
 
 #: designs/OOA/ooa.glade.h:5
 msgid "<b>Status:</b>"
-msgstr ""
+msgstr "<b>Status:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
@@ -11409,39 +11633,41 @@ msgid ""
 "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"
+"mail to you while you are out of the office.</small>"
 
 #: designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
-msgstr ""
+msgstr "I am currently in the office"
 
 #: designs/OOA/ooa.glade.h:9
 msgid "I am currently out of the office"
-msgstr ""
+msgstr "I am currently out of the office"
 
 #: designs/OOA/ooa.glade.h:10
 msgid "No, Don't Change Status"
-msgstr ""
+msgstr "No, Don't Change Status"
 
 #: designs/OOA/ooa.glade.h:12
-#, fuzzy
 msgid "Out of Office Assistant"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Out of Office Assistant"
 
 #: designs/OOA/ooa.glade.h:13
 msgid "Yes, Change Status"
-msgstr ""
+msgstr "Yes, Change Status"
 
 #: designs/read_receipts/read.glade.h:1
 msgid "      "
-msgstr ""
+msgstr "      "
 
 #: designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
-msgstr ""
+msgstr "<b>Receiving Email</b>"
 
 #: designs/read_receipts/read.glade.h:3
 msgid "<b>Sending Email:</b>"
-msgstr ""
+msgstr "<b>Sending Email:</b>"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
@@ -11450,62 +11676,70 @@ msgid ""
 "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>"
 
 #: designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
-msgstr ""
+msgstr "Always send back a read reciept"
 
 #: designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
-msgstr ""
+msgstr "Ask me if I want to send back a read receipt"
 
 #: designs/read_receipts/read.glade.h:8
 msgid "Never send back a read receipt"
-msgstr ""
+msgstr "Never send back a read receipt"
 
 #: designs/read_receipts/read.glade.h:9
 msgid "Read Receipts"
-msgstr ""
+msgstr "Read Receipts"
 
 #: designs/read_receipts/read.glade.h:10
 msgid "Request a read receipt for all messages I send"
-msgstr ""
+msgstr "Request a read receipt for all messages I send"
 
 #: designs/read_receipts/read.glade.h:11
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr ""
+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?"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
 msgid "Overwrite file?"
-msgstr ""
+msgstr "Overwrite file?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
-msgstr ""
+msgstr "Remember this password"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
-msgstr ""
+msgstr "Remember this password for the remainder of this session"
 
 #: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
-msgstr ""
+msgstr "Sync Private Records:"
 
 #: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
-msgstr ""
+msgstr "Sync Categories:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
@@ -11522,203 +11756,177 @@ msgstr "%a %d/%m/%Y %H:%M"
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:195
-#, fuzzy
 msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
 #: e-util/e-time-utils.c:200
-#, fuzzy
 msgid "%a %m/%d/%Y %H"
-msgstr "%a %d/%m/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
 #: e-util/e-time-utils.c:211
-#, fuzzy
 msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
 #: e-util/e-time-utils.c:215
-#, fuzzy
 msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
 #: e-util/e-time-utils.c:220
-#, fuzzy
 msgid "%m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
 #: e-util/e-time-utils.c:225
-#, fuzzy
 msgid "%m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
+msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
 #: e-util/e-time-utils.c:230
-#, fuzzy
 msgid "%m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
 #: e-util/e-time-utils.c:235
-#, fuzzy
 msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y"
+msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
-msgstr ""
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
-msgstr ""
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
-msgstr ""
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
-msgstr ""
+msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
 #: e-util/e-time-utils.c:356
 msgid "%I %p"
-msgstr ""
+msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, c-format
 msgid "1 second ago"
-msgstr ""
+msgid_plural "%d seconds ago"
+msgstr[0] "%d second ago"
+msgstr[1] "%d seconds ago"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
 #, c-format
-msgid "%d seconds ago"
-msgstr ""
-
-#: filter/filter-datespec.c:66
 msgid "1 minute ago"
-msgstr ""
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minute ago"
+msgstr[1] "%d minutes ago"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
 #, c-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: filter/filter-datespec.c:67
 msgid "1 hour ago"
-msgstr ""
+msgid_plural "%d hours ago"
+msgstr[0] "%d hour ago"
+msgstr[1] "%d hours ago"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
 #, c-format
-msgid "%d hours ago"
-msgstr ""
-
-#: filter/filter-datespec.c:68
 msgid "1 day ago"
-msgstr ""
+msgid_plural "%d days ago"
+msgstr[0] "%d day ago"
+msgstr[1] "%d days ago"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
 #, c-format
-msgid "%d days ago"
-msgstr ""
-
-#: filter/filter-datespec.c:69
 msgid "1 week ago"
-msgstr ""
+msgid_plural "%d weeks ago"
+msgstr[0] "%d week ago"
+msgstr[1] "%d weeks ago"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
 #, c-format
-msgid "%d weeks ago"
-msgstr ""
-
-#: filter/filter-datespec.c:70
 msgid "1 month ago"
-msgstr ""
+msgid_plural "%d months ago"
+msgstr[0] "%d month ago"
+msgstr[1] "%d months ago"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:79
 #, c-format
-msgid "%d months ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
 msgid "1 year ago"
-msgstr ""
+msgid_plural "%d years ago"
+msgstr[0] "%d year ago"
+msgstr[1] "%d years ago"
 
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr ""
-
-#: filter/filter-datespec.c:176
-#, fuzzy
+#: filter/filter-datespec.c:187
 msgid "You must choose a date."
-msgstr "Synchronising \"%s\""
+msgstr "You must choose a date."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
 msgid "<click here to select a date>"
-msgstr ""
+msgstr "<click here to select a date>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
 msgid "now"
-msgstr ""
+msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
-#, fuzzy
+#: filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
-msgstr "%m/%d/%Y"
+msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
 msgid "Select a time to compare against"
-msgstr ""
+msgstr "Select a time to compare against"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
-msgstr ""
+#: filter/filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Filter Rules"
 
 #: filter/filter-file.c:166
-#, fuzzy
 msgid "You must specify a file name."
-msgstr "Synchronising \"%s\""
+msgstr "You must specify a file name."
 
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
-msgstr ""
+msgstr "File '%s' does not exist or is not a regular file."
 
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
 msgid "Choose a file"
-msgstr ""
+msgstr "Choose a file"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-msgid "Then"
-msgstr ""
+msgid "<b>Then</b>"
+msgstr "<b>Then</b>"
 
 #: filter/filter-folder.c:153
-#, fuzzy
 msgid "You must specify a folder."
-msgstr "Synchronising \"%s\""
+msgstr "You must specify a folder."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
 msgid "Select Folder"
-msgstr ""
+msgstr "Select Folder"
 
 #: filter/filter-input.c:193
 #, c-format
@@ -11726,593 +11934,579 @@ msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
+"Error in regular expression '%s':\n"
+"%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:63 mail/mail-config.glade.h:90
 msgid "Important"
-msgstr ""
+msgstr "Important"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:145
 msgid "To Do"
-msgstr ""
+msgstr "To Do"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:94
 msgid "Later"
-msgstr ""
+msgstr "Later"
 
-#: filter/filter-part.c:531 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 ""
+msgstr "Test"
 
 #: filter/filter-rule.c:219
 msgid "You must name this filter."
-msgstr ""
+msgstr "You must name this filter."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
+#: filter/filter-rule.c:752
+msgid "Rule name:"
+msgstr "Rule name:"
 
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
 msgid "Untitled"
-msgstr ""
+msgstr "Untitled"
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr ""
+#: filter/filter-rule.c:779
+msgid "<b>If</b>"
+msgstr "<b>If</b>"
 
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
 msgid "Execute actions"
-msgstr ""
+msgstr "Execute actions"
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
 msgid "if all criteria are met"
-msgstr ""
+msgstr "if all criteria are met"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
 msgid "if any criteria are met"
-msgstr ""
+msgstr "if any criteria are met"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "incoming"
-msgstr ""
+msgstr "incoming"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
 msgid "outgoing"
-msgstr ""
+msgstr "outgoing"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr ""
+msgid "    "
+msgstr "    "
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr ""
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Filter Rules</b>"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr ""
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder Sources</b>"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Compare against"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
-msgstr ""
+msgstr "Incoming"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
-msgstr ""
+msgstr "a time relative to the current time"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
-msgstr ""
+msgstr "ago"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
-msgstr ""
+msgstr "months"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
-msgstr ""
+msgstr "seconds"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
-msgstr ""
+msgstr "specific folders only"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
-msgstr ""
+msgstr "the current time"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
-msgstr ""
-
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr ""
+msgstr "the time you specify"
 
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
 msgid "weeks"
-msgstr ""
+msgstr "weeks"
 
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
-msgstr ""
+msgstr "with all active remote folders"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
-msgstr ""
+msgstr "with all local and active remote folders"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
-msgstr ""
+msgstr "with all local folders"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
-msgstr ""
+msgstr "years"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
-msgstr ""
+msgstr "Adjust Score"
 
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
-msgstr ""
+msgstr "Assign Colour"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
-msgstr ""
+msgstr "Assign Score"
 
 #: filter/libfilter-i18n.h:5
 msgid "Attachments"
-msgstr ""
+msgstr "Attachments"
 
 #: filter/libfilter-i18n.h:6
 msgid "Beep"
-msgstr ""
+msgstr "Beep"
 
 #: filter/libfilter-i18n.h:7
 msgid "contains"
-msgstr ""
+msgstr "contains"
 
 #: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
-msgstr ""
+msgstr "Copy to Folder"
 
 #: filter/libfilter-i18n.h:9
 msgid "Date received"
-msgstr ""
+msgstr "Date received"
 
 #: filter/libfilter-i18n.h:10
 msgid "Date sent"
-msgstr ""
+msgstr "Date sent"
 
 #: filter/libfilter-i18n.h:12
 msgid "Deleted"
-msgstr ""
+msgstr "Deleted"
 
 #: filter/libfilter-i18n.h:13
 msgid "does not contain"
-msgstr ""
+msgstr "does not contain"
 
 #: filter/libfilter-i18n.h:14
 msgid "does not end with"
-msgstr ""
+msgstr "does not end with"
 
 #: filter/libfilter-i18n.h:15
 msgid "does not exist"
-msgstr ""
+msgstr "does not exist"
 
 #: filter/libfilter-i18n.h:16
 msgid "does not return"
-msgstr ""
+msgstr "does not return"
 
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
-msgstr ""
+msgstr "does not sound like"
 
 #: filter/libfilter-i18n.h:18
 msgid "does not start with"
-msgstr ""
+msgstr "does not start with"
 
 #: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
-msgstr ""
+msgstr "Do Not Exist"
 
 #: filter/libfilter-i18n.h:20
 msgid "Draft"
-msgstr ""
+msgstr "Draft"
 
 #: filter/libfilter-i18n.h:21
 msgid "ends with"
-msgstr ""
+msgstr "ends with"
 
 #: filter/libfilter-i18n.h:22
 msgid "Exist"
-msgstr ""
+msgstr "Exist"
 
 #: filter/libfilter-i18n.h:23
 msgid "exists"
-msgstr ""
+msgstr "exists"
 
 #: filter/libfilter-i18n.h:24
 msgid "Expression"
-msgstr ""
+msgstr "Expression"
 
 #: filter/libfilter-i18n.h:25
 msgid "Follow Up"
-msgstr ""
+msgstr "Follow Up"
 
 #: filter/libfilter-i18n.h:27
 msgid "is"
-msgstr ""
+msgstr "is"
 
 #: filter/libfilter-i18n.h:28
 msgid "is after"
-msgstr ""
+msgstr "is after"
 
 #: filter/libfilter-i18n.h:29
 msgid "is before"
-msgstr ""
+msgstr "is before"
 
 #: filter/libfilter-i18n.h:30
 msgid "is Flagged"
-msgstr ""
+msgstr "is Flagged"
 
 #: filter/libfilter-i18n.h:31
 msgid "is greater than"
-msgstr ""
+msgstr "is greater than"
 
 #: filter/libfilter-i18n.h:32
 msgid "is less than"
-msgstr ""
+msgstr "is less than"
 
 #: filter/libfilter-i18n.h:33
 msgid "is not"
-msgstr ""
+msgstr "is not"
 
 #: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
-msgstr ""
+msgstr "is not Flagged"
 
 #: filter/libfilter-i18n.h:36
-#, fuzzy
 msgid "Junk Test"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Junk Test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
 #: widgets/misc/e-expander.c:189
 msgid "Label"
-msgstr ""
+msgstr "Label"
 
 #: filter/libfilter-i18n.h:38
 msgid "Mailing list"
-msgstr ""
+msgstr "Mailing list"
 
 #: filter/libfilter-i18n.h:39
 msgid "Message Body"
-msgstr ""
+msgstr "Message Body"
 
 #: filter/libfilter-i18n.h:40
 msgid "Message Header"
-msgstr ""
+msgstr "Message Header"
 
 #: filter/libfilter-i18n.h:41
-#, fuzzy
 msgid "Message is Junk"
-msgstr "Colours"
+msgstr "Message is Junk"
 
 #: filter/libfilter-i18n.h:42
-#, fuzzy
 msgid "Message is not Junk"
-msgstr "Colours"
+msgstr "Message is not Junk"
 
 #: filter/libfilter-i18n.h:43
 msgid "Move to Folder"
-msgstr ""
+msgstr "Move to Folder"
 
 #: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr ""
+msgid "Pipe to Program"
+msgstr "Pipe to Program"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
-msgstr ""
+msgstr "Play Sound"
 
 #: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
 msgid "Read"
-msgstr ""
+msgstr "Read"
 
 #: filter/libfilter-i18n.h:47
 msgid "Recipients"
-msgstr ""
+msgstr "Recipients"
 
 #: filter/libfilter-i18n.h:48
 msgid "Regex Match"
-msgstr ""
+msgstr "Regex Match"
 
 #: filter/libfilter-i18n.h:49
 msgid "Replied to"
-msgstr ""
+msgstr "Replied to"
 
 #: filter/libfilter-i18n.h:50
 msgid "returns"
-msgstr ""
+msgstr "returns"
 
 #: filter/libfilter-i18n.h:51
 msgid "returns greater than"
-msgstr ""
+msgstr "returns greater than"
 
 #: filter/libfilter-i18n.h:52
 msgid "returns less than"
-msgstr ""
+msgstr "returns less than"
+
+#: filter/libfilter-i18n.h:53
+msgid "Run Program"
+msgstr "Run Program"
 
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:54
-msgid "Sender"
-msgstr ""
+msgstr "Score"
 
 #: filter/libfilter-i18n.h:55
-msgid "Set Status"
-msgstr ""
+msgid "Sender"
+msgstr "Sender"
 
 #: filter/libfilter-i18n.h:56
-#, fuzzy
-msgid "Shell Command"
-msgstr "Colours"
+msgid "Set Status"
+msgstr "Set Status"
 
 #: filter/libfilter-i18n.h:57
 msgid "Size (kB)"
-msgstr ""
+msgstr "Size (kB)"
 
 #: filter/libfilter-i18n.h:58
 msgid "sounds like"
-msgstr ""
+msgstr "sounds like"
 
 #: filter/libfilter-i18n.h:59
 msgid "Source Account"
-msgstr ""
+msgstr "Source Account"
 
 #: filter/libfilter-i18n.h:60
 msgid "Specific header"
-msgstr ""
+msgstr "Specific header"
 
 #: filter/libfilter-i18n.h:61
 msgid "starts with"
-msgstr ""
+msgstr "starts with"
 
 #: filter/libfilter-i18n.h:63
 msgid "Stop Processing"
-msgstr ""
+msgstr "Stop Processing"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
-msgstr ""
+msgstr "Subject"
 
 #: filter/libfilter-i18n.h:65
 msgid "Unset Status"
-msgstr ""
+msgstr "Unset Status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
-msgstr ""
-
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr ""
+msgstr "Rule name '%s' is not unique, choose another."
 
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
 msgid "Add Rule"
-msgstr ""
+msgstr "Add Rule"
 
 #: filter/rule-editor.c:375
 msgid "Edit Rule"
-msgstr ""
+msgstr "Edit Rule"
 
 #: filter/rule-editor.c:699
 msgid "Rule name"
-msgstr ""
+msgstr "Rule name"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
-msgstr ""
+#: filter/score-editor.c:110
+msgid "_Score Rules"
+msgstr "_Score Rules"
 
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
-msgstr ""
+msgstr "Body contains"
 
 #: filter/searchtypes.xml.h:2
 msgid "Body does not contain"
-msgstr ""
+msgstr "Body does not contain"
 
 #: filter/searchtypes.xml.h:3
 msgid "Body or subject contains"
-msgstr ""
+msgstr "Body or subject contains"
 
 #: filter/searchtypes.xml.h:4
 msgid "Message contains"
-msgstr ""
+msgstr "Message contains"
 
 #: filter/searchtypes.xml.h:5
 msgid "Recipients contain"
-msgstr ""
+msgstr "Recipients contain"
 
 #: filter/searchtypes.xml.h:6
 msgid "Sender contains"
-msgstr ""
+msgstr "Sender contains"
 
 #: filter/searchtypes.xml.h:7
 msgid "Subject contains"
-msgstr ""
+msgstr "Subject contains"
 
 #: filter/searchtypes.xml.h:8
 msgid "Subject does not contain"
-msgstr ""
+msgstr "Subject does not contain"
+
+#: filter/vfolder-editor.c:108
+msgid "Virtual _Folders"
+msgstr "Virtual _Folders"
 
 #: filter/vfolder-rule.c:215
-#, fuzzy
 msgid "You must name this vfolder."
-msgstr "Synchronising \"%s\""
+msgstr "You must name this vfolder."
 
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
 msgid "You need to to specify at least one folder as a source."
-msgstr ""
+msgstr "You need to to specify at least one folder as a source."
 
-#: filter/vfolder-rule.c:585
-#, fuzzy
+#: filter/vfolder-rule.c:587
 msgid "VFolder source"
-msgstr "Synchronising \"%s\""
+msgstr "VFolder source"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
-msgstr ""
+msgstr "Composer Preferences"
 
 #: 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:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
+msgstr "Configure spell-checking, signatures, and the message composer here"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
-msgstr ""
+msgstr "Configure your email accounts here"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
 msgid "Evolution Mail"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Mail"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
 msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Mail accounts configuration control"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Mail component"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
 msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Mail composer"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
 msgid "Evolution Mail composer configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Mail composer configuration control"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
 msgid "Evolution Mail folder viewer"
-msgstr "Cannot initialise Evolution's mail summary component."
+msgstr "Evolution Mail folder viewer"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
 msgid "Evolution Mail preferences control"
-msgstr "Cannot initialise Evolution's mail summary component."
+msgstr "Evolution Mail preferences control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
 #: mail/importers/pine-importer.c:473
 msgid "Mail"
-msgstr ""
+msgstr "Mail"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Mail Accounts"
-msgstr ""
+msgstr "Mail Accounts"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
-msgstr ""
+msgstr "Mail Preferences"
 
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
 msgid "Are you sure you want to delete this account?"
-msgstr ""
+msgstr "Are you sure you want to delete this account?"
 
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
 msgid "Don't delete"
-msgstr ""
+msgstr "Don't delete"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:439
-#, fuzzy
+#: mail/em-account-prefs.c:444
 msgid "[Default]"
-msgstr "Synchronising \"%s\""
+msgstr "[Default]"
 
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
 msgid "Account name"
-msgstr ""
+msgstr "Account name"
 
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
 msgid "Protocol"
-msgstr ""
+msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
+#: mail/em-composer-prefs.c:229 mail/em-composer-prefs.c:355
 #: mail/mail-config.c:1252
 msgid "Unnamed"
-msgstr ""
+msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:337
-#, fuzzy
+#: mail/em-composer-prefs.c:339
 msgid "You must specify a valid script name."
-msgstr "Synchronising \"%s\""
+msgstr "You must specify a valid script name."
 
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
+#: mail/em-composer-prefs.c:397 mail/em-composer-prefs.c:459
 msgid "[script]"
-msgstr ""
+msgstr "[script]"
 
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:888
 msgid "Language(s)"
-msgstr ""
+msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:922
+#: mail/em-composer-prefs.c:936
 msgid "Add script signature"
-msgstr ""
+msgstr "Add script signature"
 
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:956
 msgid "Signature(s)"
-msgstr ""
+msgstr "Signature(s)"
 
 #: mail/em-composer-utils.c:124
 #, c-format
@@ -12321,22 +12515,29 @@ msgid ""
 "the following recipients are willing and able to receive HTML mail:\n"
 "%sSend anyway?"
 msgstr ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 
 #: mail/em-composer-utils.c:138
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
+"This message has no subject.\n"
+"Really send?"
 
 #: mail/em-composer-utils.c:153
 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."
 
 #: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
-msgstr ""
+msgstr "This message contains only Bcc recipients."
 
 #: mail/em-composer-utils.c:162
 msgid ""
@@ -12344,569 +12545,638 @@ msgid ""
 "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?"
 
 #: mail/em-composer-utils.c:305
 msgid "You must specify recipients in order to send this message."
-msgstr ""
+msgstr "You must specify recipients in order to send this message."
 
 #: mail/em-composer-utils.c:578
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
 
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
 msgid "Create _Virtual Folder From Search..."
-msgstr ""
+msgstr "Create _Virtual Folder From Search..."
 
 #: mail/em-folder-properties.c:120
-#, fuzzy
 msgid "Folder properties"
-msgstr "Synchronising \"%s\""
+msgstr "Folder properties"
 
 #. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
 #: mail/em-folder-properties.c:126
 msgid "Properties"
-msgstr ""
+msgstr "Properties"
 
 #. TODO: can this be done in a loop?
 #: mail/em-folder-properties.c:135
-#, fuzzy
 msgid "Folder Name"
-msgstr "Synchronising \"%s\""
+msgstr "Folder Name"
 
 #: mail/em-folder-properties.c:146
-#, fuzzy
 msgid "Total messages"
-msgstr "Colours"
+msgstr "Total messages"
 
 #: mail/em-folder-properties.c:158
-#, fuzzy
 msgid "Unread messages"
-msgstr "Synchronising \"%s\""
+msgstr "Unread messages"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
-msgstr ""
+msgstr "<click here to select a folder>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
-#, fuzzy
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
 msgid "Create New Folder"
-msgstr "Synchronising \"%s\""
+msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
-msgstr ""
+msgstr "Specify where to create the folder:"
 
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
-msgstr ""
+msgstr "Folder _name:"
 
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
 msgid "VFolders"
-msgstr ""
+msgstr "VFolders"
 
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
-msgstr ""
+msgstr "UNMATCHED"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
 msgid "Inbox"
-msgstr ""
+msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
 msgid "Loading..."
-msgstr ""
+msgstr "Loading..."
+
+#: mail/em-folder-tree.c:877
+#, c-format
+msgid "Moving folder %s"
+msgstr "Moving folder %s"
+
+#: mail/em-folder-tree.c:879
+#, c-format
+msgid "Copying folder %s"
+msgstr "Copying folder %s"
+
+#: mail/em-folder-tree.c:886
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:888
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "Copying messages into folder %s"
+
+#: mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
-msgstr ""
+msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:1798
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:1950
+#, c-format
 msgid "Cannot move folder `%s': illegal operation"
-msgstr "Synchronising \"%s\""
+msgstr "Cannot move folder `%s': illegal operation"
 
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
 #: mail/importers/evolution-mbox-importer.c:119
-#, fuzzy
 msgid "Select folder"
-msgstr "Synchronising \"%s\""
+msgstr "Select folder"
 
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
-#, fuzzy
+#: mail/em-folder-tree.c:2035
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "Creating folder `%s'"
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
 msgid "Create folder"
-msgstr "Synchronising \"%s\""
+msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2069
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2347
+#, c-format
 msgid "Could not delete folder: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not delete folder: %s"
 
-#: mail/em-folder-tree.c:2094
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2372
+#, c-format
 msgid "Cannot delete local %s folder."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot delete local %s folder."
 
-#: mail/em-folder-tree.c:2100
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2378
+#, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Synchronising \"%s\""
+msgstr "Really delete folder \"%s\" and all of its subfolders?"
 
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
 #, c-format
 msgid "Delete \"%s\""
-msgstr ""
+msgstr "Delete \"%s\""
 
-#: mail/em-folder-tree.c:2144
-#, fuzzy, c-format
+#: mail/em-folder-tree.c:2422
+#, c-format
 msgid "Cannot rename local %s folder."
-msgstr "Synchronising \"%s\""
+msgstr "Cannot rename local %s folder."
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
 #, c-format
 msgid "Rename the \"%s\" folder to:"
-msgstr ""
+msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2155
-#, fuzzy
+#: mail/em-folder-tree.c:2433
 msgid "Rename Folder"
-msgstr "Synchronising \"%s\""
+msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
+msgstr "A folder named \"%s\" already exists. Please use a different name."
 
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 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:35
 msgid "_View"
-msgstr ""
+msgstr "_View"
 
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
 msgid "Open in _New Window"
-msgstr ""
+msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
 msgid "_Move"
-msgstr ""
+msgstr "_Move"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
-#, fuzzy
+#: mail/em-folder-tree.c:2513
 msgid "_New Folder..."
-msgstr "Synchronising \"%s\""
+msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
 msgid "_Rename"
-msgstr ""
+msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
-msgstr ""
+msgstr "_Properties..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
 msgid "_Edit as New Message..."
-msgstr ""
+msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
 msgid "_Print"
-msgstr ""
+msgstr "_Print"
 
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
-msgstr ""
+msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
-msgstr ""
+msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
-msgstr ""
+msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
-msgstr ""
+msgstr "_Forward"
 
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
 msgid "Follo_w Up..."
-msgstr ""
+msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
 msgid "Fla_g Completed"
-msgstr ""
+msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:764
-#, fuzzy
+#: mail/em-folder-view.c:754
 msgid "Cl_ear Flag"
-msgstr "Colours"
+msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
-msgstr ""
+msgstr "Mar_k as Read"
 
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
 msgid "Mark as _Unread"
-msgstr ""
+msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
 msgid "Mark as _Important"
-msgstr ""
+msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
 msgid "_Mark as Unimportant"
-msgstr ""
+msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
-msgstr ""
+msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
-msgstr ""
+msgstr "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
 msgid "U_ndelete"
-msgstr ""
+msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
 msgid "Mo_ve to Folder..."
-msgstr ""
+msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
-msgstr ""
+msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
 msgid "Add Sender to Address_book"
-msgstr ""
+msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
 msgid "Appl_y Filters"
-msgstr ""
+msgstr "Appl_y Filters"
+
+#: mail/em-folder-view.c:782
+msgid "F_ilter Junk"
+msgstr "F_ilter Junk"
 
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:785
 msgid "Crea_te Rule From Message"
-msgstr ""
+msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
 msgid "VFolder on _Subject"
-msgstr ""
+msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
 msgid "VFolder on Se_nder"
-msgstr ""
+msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
 msgid "VFolder on _Recipients"
-msgstr ""
+msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
 msgid "VFolder on Mailing _List"
-msgstr ""
+msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:800
-#, fuzzy
+#: mail/em-folder-view.c:791
 msgid "VFolder on Thread"
-msgstr "Synchronising \"%s\""
+msgstr "VFolder on Thread"
 
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
 msgid "Filter on Sub_ject"
-msgstr ""
+msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
 msgid "Filter on Sen_der"
-msgstr ""
+msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
 msgid "Filter on Re_cipients"
-msgstr ""
+msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
 msgid "Filter on _Mailing List"
-msgstr ""
+msgstr "Filter on _Mailing List"
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
 msgid "Filter on Thread"
-msgstr ""
+msgstr "Filter on Thread"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
-#, fuzzy
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
 msgid "Default"
-msgstr "Synchronising \"%s\""
+msgstr "Default"
 
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
 msgid "Print Message"
-msgstr ""
+msgstr "Print Message"
 
-#: mail/em-folder-view.c:1907
-#, fuzzy
+#: mail/em-folder-view.c:1904
 msgid "_Copy Link Location"
-msgstr "Organisation"
+msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
 #, c-format
 msgid "Click to mail %s"
-msgstr ""
+msgstr "Click to mail %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
 #, c-format
 msgid "Matches: %d"
-msgstr ""
+msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:566
 msgid "Unsigned"
-msgstr ""
+msgstr "Unsigned"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
 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:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:567
 msgid "Valid signature"
-msgstr ""
+msgstr "Valid signature"
 
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
 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:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:568
 msgid "Invalid signature"
-msgstr ""
+msgstr "Invalid signature"
 
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
 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:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:569
 msgid "Valid signature, cannot verify sender"
-msgstr ""
+msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
 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:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:575
 msgid "Unencrypted"
-msgstr ""
+msgstr "Unencrypted"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
 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:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:576
 msgid "Encrypted, weak"
-msgstr ""
+msgstr "Encrypted, weak"
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
 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:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:577
 msgid "Encrypted"
-msgstr ""
+msgstr "Encrypted"
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
 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:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:578
 msgid "Encrypted, strong"
-msgstr ""
+msgstr "Encrypted, strong"
 
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
 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:734
+#: mail/em-format-html-display.c:741
 msgid "_View Certificate"
-msgstr ""
+msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
 msgid "This certificate is not viewable"
-msgstr ""
+msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:973
-#, fuzzy
+#: mail/em-format-html-display.c:979
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+msgstr "Completed on %d %B, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
 msgid "Overdue:"
-msgstr ""
+msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:984
-#, fuzzy
+#: mail/em-format-html-display.c:990
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+msgstr "by %d %B, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
 msgid "_View Inline"
-msgstr ""
+msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
 msgid "_Hide"
-msgstr ""
+msgstr "_Hide"
 
 #: mail/em-format-html-print.c:125
 #, c-format
 msgid "Page %d of %d"
-msgstr ""
+msgstr "Page %d of %d"
 
-#: mail/em-format-html.c:455 mail/em-format-html.c:457
+#: mail/em-format-html.c:459 mail/em-format-html.c:461
 #, c-format
 msgid "Retrieving `%s'"
-msgstr ""
+msgstr "Retrieving `%s'"
 
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:838
 msgid "Malformed external-body part."
-msgstr ""
+msgstr "Malformed external-body part."
 
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:868
 #, c-format
 msgid "Pointer to FTP site (%s)"
-msgstr ""
+msgstr "Pointer to FTP site (%s)"
 
-#: mail/em-format-html.c:853
+#: mail/em-format-html.c:879
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr ""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
 
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:881
 #, c-format
 msgid "Pointer to local file (%s)"
-msgstr ""
+msgstr "Pointer to local file (%s)"
 
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:902
 #, c-format
 msgid "Pointer to remote data (%s)"
-msgstr ""
+msgstr "Pointer to remote data (%s)"
 
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:913
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
+msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1155
 msgid "Formatting message"
-msgstr ""
+msgstr "Formatting message"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
 #: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
 msgid "From"
-msgstr ""
+msgstr "From"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
 #: mail/em-mailer-prefs.c:68
 msgid "Reply-To"
-msgstr ""
+msgstr "Reply-To"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
 #: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
 msgid "To"
-msgstr ""
+msgstr "To"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
 #: mail/em-mailer-prefs.c:70
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
 #: mail/em-mailer-prefs.c:71
 msgid "Bcc"
-msgstr ""
+msgstr "Bcc"
 
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:769
 msgid "Mailer"
-msgstr ""
+msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
 msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
+msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
 msgid "<I> (%R %Z)</I>"
-msgstr ""
+msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
 #: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: mail/em-format.c:987
 #, c-format
 msgid "%s attachment"
-msgstr ""
+msgstr "%s attachment"
 
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr ""
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr "Internal error: expecting CamelMultipart, got \"%s\""
 
-#: mail/em-format.c:1151
+#: mail/em-format.c:1178
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
+msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
 msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
+msgstr "Could not parse MIME message. Displaying as source."
 
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
 msgid "Unsupported signature format"
-msgstr ""
+msgstr "Unsupported signature format"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Error verifying signature"
-msgstr ""
+msgstr "Error verifying signature"
 
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
 msgid "Unknown error verifying signature"
-msgstr ""
+msgstr "Unknown error verifying signature"
+
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "Internal error: expecting CamelMimeMessage, got \"%s\""
 
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
-msgstr ""
+msgstr "Spamassassin (built-in)"
+
+#: mail/em-mailer-prefs.c:85
+msgid "Every time"
+msgstr "Every time"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr "Once per day"
+
+#: mail/em-mailer-prefs.c:87
+msgid "Once per week"
+msgstr "Once per week"
+
+#: mail/em-mailer-prefs.c:88
+msgid "Once per month"
+msgstr "Once per month"
 
 #: mail/em-migrate.c:1079
 msgid ""
@@ -12915,158 +13185,164 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 
 #: mail/em-migrate.c:1843 mail/em-migrate.c:1858
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to migrate pop3 uid caches: %s"
 
 #: mail/em-migrate.c:1946 mail/em-migrate.c:2047
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to migrate folder expand state: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to migrate folder expand state: %s"
 
 #: mail/em-migrate.c:2171 mail/em-migrate.c:2343
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create directory `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to create directory `%s': %s"
 
 #: mail/em-migrate.c:2183
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open store for `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to open store for `%s': %s"
 
 #: mail/em-popup.c:698
 msgid "Save As..."
-msgstr ""
+msgstr "Save As..."
 
 #: mail/em-popup.c:716
 #, c-format
 msgid "untitled_image.%s"
-msgstr ""
+msgstr "untitled_image.%s"
 
 #: mail/em-popup.c:805
 msgid "Set as _Background"
-msgstr ""
+msgstr "Set as _Background"
 
 #: mail/em-popup.c:807
 msgid "_Reply to sender"
-msgstr ""
+msgstr "_Reply to sender"
 
 #: mail/em-popup.c:855
 msgid "_Open Link in Browser"
-msgstr ""
+msgstr "_Open Link in Browser"
 
 #: mail/em-popup.c:856
-#, fuzzy
 msgid "Se_nd message to..."
-msgstr "Synchronising \"%s\""
+msgstr "Se_nd message to..."
 
 #: mail/em-popup.c:857
-#, fuzzy
 msgid "_Add to Addressbook"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "_Add to Addressbook"
 
 #: mail/em-popup.c:963
 #, c-format
 msgid "Open in %s..."
-msgstr ""
+msgstr "Open in %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
+msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
 msgid "Subscribed"
-msgstr ""
+msgstr "Subscribed"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
-msgstr ""
+msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
 msgid "Please select a server."
-msgstr ""
+msgstr "Please select a server."
 
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
-msgstr ""
+msgstr "No server has been selected"
 
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
 msgid "Don't show this message again."
-msgstr ""
+msgstr "Don't show this message again."
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
+"Error loading filter information:\n"
+"%s"
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
 msgid "Filters"
-msgstr ""
+msgstr "Filters"
 
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
 msgid "-------- Forwarded Message --------"
-msgstr ""
+msgstr "-------- Forwarded Message --------"
 
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
 msgid "an unknown sender"
-msgstr ""
+msgstr "an unknown sender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
+msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
-#, fuzzy, c-format
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
+#, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
-msgstr "Synchronising \"%s\""
+msgstr ""
+"Cannot save to `%s'\n"
+" %s"
 
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
 #, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
+"`%s' already exists.\n"
+"Overwrite it?"
 
-#: mail/em-utils.c:1474
-#, fuzzy
+#: mail/em-utils.c:1483
 msgid "message"
-msgstr "Colours"
+msgstr "message"
 
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
 #, c-format
 msgid "Error: '%s' exists and is not a regular file"
-msgstr ""
+msgstr "Error: '%s' exists and is not a regular file"
 
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
 msgid "Save Message..."
-msgstr ""
+msgstr "Save Message..."
 
-#: mail/em-utils.c:1618
-#, fuzzy
+#: mail/em-utils.c:1638
 msgid "Add address"
-msgstr "Colours"
+msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
-#, fuzzy, c-format
+#: mail/em-utils.c:2073
+#, c-format
 msgid "Messages from %s"
-msgstr "Colours"
+msgstr "Messages from %s"
 
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
 #, c-format
 msgid "Could not create temporary directory: %s"
-msgstr ""
+msgstr "Could not create temporary directory: %s"
 
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
 #, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -13074,533 +13350,584 @@ msgid ""
 "\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?"
 
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
 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?"
 
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
-msgstr ""
+msgstr "Automatic link recognition"
 
 #: mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
-msgstr ""
+msgstr "Automatic smiley recognition"
 
 #: mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
-msgstr ""
+msgstr "Check incoming mail being junk"
 
 #: mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight colour"
-msgstr ""
+msgstr "Citation highlight colour"
 
 #: mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight colour."
-msgstr ""
+msgstr "Citation highlight colour."
 
 #: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
-msgstr ""
+msgstr "Composer Window default height"
 
 #: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
-msgstr ""
+msgstr "Composer Window default width"
 
 #: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
-msgstr ""
+msgstr "Default charset in which to compose messages"
 
 #: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
-msgstr ""
+msgstr "Default charset in which to compose messages."
 
 #: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
-msgstr ""
+msgstr "Default charset in which to display messages"
 
 #: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
-msgstr ""
+msgstr "Default charset in which to display messages."
 
 #: mail/evolution-mail.schemas.in.in.h:12
-#, fuzzy
 msgid "Default forward style"
-msgstr "Synchronising \"%s\""
+msgstr "Default forward style"
 
 #: mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
-msgstr ""
+msgstr "Default height of the Composer Window"
 
 #: mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
-msgstr ""
+msgstr "Default height of the Message Window"
 
 #: mail/evolution-mail.schemas.in.in.h:15
-msgid "Default reply style"
-msgstr ""
+msgid "Default height of the Subscribe dialog"
+msgstr "Default height of the Subscribe dialogue"
 
 #: mail/evolution-mail.schemas.in.in.h:16
-msgid "Default width of the Composer Window"
-msgstr ""
+msgid "Default reply style"
+msgstr "Default reply style"
 
 #: mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Message Window"
-msgstr ""
+msgid "Default width of the Composer Window"
+msgstr "Default width of the Composer Window"
 
 #: mail/evolution-mail.schemas.in.in.h:18
-msgid "Draw spelling error indicators on words as you type."
-msgstr ""
+msgid "Default width of the Message Window"
+msgstr "Default width of the Message Window"
 
 #: mail/evolution-mail.schemas.in.in.h:19
-msgid "Empty Trash folders on exit"
-msgstr ""
+msgid "Default width of the Subscribe dialog"
+msgstr "Default width of the Subscribe dialogue"
 
 #: mail/evolution-mail.schemas.in.in.h:20
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr ""
+msgid "Draw spelling error indicators on words as you type."
+msgstr "Draw spelling error indicators on words as you type."
 
 #: mail/evolution-mail.schemas.in.in.h:21
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
+msgid "Empty Trash folders on exit"
+msgstr "Empty Trash folders on exit"
 
 #: mail/evolution-mail.schemas.in.in.h:22
-msgid "Enable/disable caret mode"
-msgstr ""
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Empty all Trash folders when exiting Evolution."
 
 #: mail/evolution-mail.schemas.in.in.h:23
-msgid "Height of the message-list pane"
-msgstr ""
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
 #: mail/evolution-mail.schemas.in.in.h:24
-msgid "Height of the message-list pane."
-msgstr ""
+msgid "Enable/disable caret mode"
+msgstr "Enable/disable caret mode"
 
 #: mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr "Height of the message-list pane"
+
+#: mail/evolution-mail.schemas.in.in.h:26
+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."
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr "Last time empty trash was run"
+
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "List of Labels and their associated colours"
-msgstr ""
+msgstr "List of Labels and their associated colours"
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "List of accounts"
-msgstr ""
+msgstr "List of accounts"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
 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:29
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "List of custom headers and whether they are enabled."
-msgstr ""
+msgstr "List of custom headers and whether they are enabled."
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour 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:31
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
+msgstr "List of mime types to check for bonobo component viewers"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Load images for HTML messages over http"
-msgstr ""
+msgstr "Load images for HTML messages over http"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
 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:34
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Log filter actions"
-msgstr ""
+msgstr "Log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "Log filter actions to the specified log file."
-msgstr ""
+msgstr "Log filter actions to the specified log file."
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Logfile to log filter actions"
-msgstr ""
+msgstr "Logfile to log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Logfile to log filter actions."
-msgstr ""
+msgstr "Logfile to log filter actions."
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Mark as Seen after specified timeout"
-msgstr ""
+msgstr "Mark as Seen after specified timeout"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Mark as Seen after specified timeout."
-msgstr ""
+msgstr "Mark as Seen after specified timeout."
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark citations in the message \"Preview\""
-msgstr ""
+msgstr "Mark citations in the message \"Preview\""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark citations in the message \"Preview\"."
-msgstr ""
+msgstr "Mark citations in the message \"Preview\"."
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Message Window default hight"
-msgstr ""
+msgstr "Message Window default hight"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Message Window default width"
-msgstr ""
+msgstr "Message Window default width"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message-display style (normal, full headers, source)"
-msgstr ""
+msgstr "Message-display style (normal, full headers, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr "Minimum days between emptying the trash on exit"
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Minimum time between emptying the trash on exit, in days."
+
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "New Mail Notify sound file"
-msgstr ""
+msgstr "New Mail Notify sound file"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "New Mail Notify type"
-msgstr ""
+msgstr "New Mail Notify type"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "Prompt on empty subject"
-msgstr ""
+msgstr "Prompt on empty subject"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
+msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
 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:50
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt when user expunges"
-msgstr ""
+msgstr "Prompt when user expunges"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt when user only fills Bcc"
-msgstr ""
+msgstr "Prompt when user only fills Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
 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:53
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
+msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
+msgstr "Prompt when user tries to send unwanted HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Recognize links in text and replace them."
-msgstr ""
+msgstr "Recognise links in text and replace them."
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Recognize smileys in text and replace them with images."
-msgstr ""
+msgstr "Recognise smileys in text and replace them with images."
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Run junk test on incoming mail"
-msgstr ""
+msgstr "Run junk test on incoming mail"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "S3kr3t 0pt10n"
-msgstr ""
+msgstr "S3kr3t 0pt10n"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "S3kr3t 0pt10n."
-msgstr ""
+msgstr "S3kr3t 0pt10n."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
-msgstr ""
+msgstr "Send HTML mail by default"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
-msgstr ""
+msgstr "Send HTML mail by default."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
-msgstr ""
+msgstr "Show Animations"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
-msgstr ""
+msgstr "Show animated images as animations."
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
+msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
-msgstr ""
+msgstr "Show deleted messages in the message-list"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
-msgstr ""
+msgstr "Show the \"Preview\" pane"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
-msgstr ""
+msgstr "Show the \"Preview\" pane."
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
-msgstr ""
+msgstr "Sound file to play when new mail arrives."
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
+msgstr "Specifies the type of New Mail Notification the user wishes to use."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
-msgstr ""
+msgstr "Spell check inline"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr "Subscribe dialogue default hight"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr "Subscribe dialogue default width"
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
-msgstr ""
+msgstr "Terminal font"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr "The last time empty trash was run, in days since the epoch."
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
-msgstr ""
+msgstr "The terminal font for mail display"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
-msgstr ""
+msgstr "The variable width font for mail display"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: 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."
 
-#: mail/evolution-mail.schemas.in.in.h:75
-#, fuzzy
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
-msgstr "Synchronising \"%s\""
+msgstr "Thread the message list."
 
-#: mail/evolution-mail.schemas.in.in.h:76
-#, fuzzy
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
-msgstr "Synchronising \"%s\""
+msgstr "Thread the message-list"
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
-msgstr ""
+msgstr "Thread the message-list based on Subject"
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
-msgstr ""
+msgstr "Timeout for marking message as Seen"
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
-msgstr ""
+msgstr "Timeout for marking message as Seen."
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
-msgstr ""
+msgstr "UID string of the default account."
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
-msgstr ""
+msgstr "Use Spamasssassin daemon and client"
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "Use Spamasssassin daemon and client (spamc/spamd)"
-msgstr ""
+msgstr "Use Spamasssassin daemon and client (spamc/spamd)"
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
-msgstr ""
+msgstr "Use custom fonts"
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
-msgstr ""
+msgstr "Use custom fonts for displaying mail"
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
 msgid "Use only local spam tests."
-msgstr ""
+msgstr "Use only local spam tests."
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
 msgid "Use only the local spam tests (no DNS)."
-msgstr ""
+msgstr "Use only the local spam tests (no DNS)."
 
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
-msgstr ""
+msgstr "Variable width font"
 
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
-msgstr ""
+msgstr "View/Bcc menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
-msgstr ""
+msgstr "View/Bcc menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
-msgstr ""
+msgstr "View/Cc menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
-msgstr ""
+msgstr "View/Cc menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
-msgstr ""
+msgstr "View/From menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
-msgstr ""
+msgstr "View/From menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
-msgstr ""
+msgstr "View/PostTo menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
-msgstr ""
+msgstr "View/PostTo menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
-msgstr ""
+msgstr "View/ReplyTo menu item is checked"
 
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
-msgstr ""
+msgstr "View/ReplyTo menu item is checked."
 
-#: mail/evolution-mail.schemas.in.in.h:98
+#: 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."
 
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
 msgid "port for starting user runned spamd"
-msgstr ""
+msgstr "port for starting user runned spamd"
 
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
 msgid "spamd port"
-msgstr ""
+msgstr "spamd port"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Elm importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Elm importer"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Netscape Mail importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Netscape Mail importer"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
-msgstr ""
+msgstr "Evolution Outlook Express 4 importer"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
 msgid "Evolution Pine importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Pine importer"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
 msgid "Evolution mbox importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution mbox importer"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
 msgid "MBox (mbox)"
-msgstr ""
+msgstr "MBox (mbox)"
 
 #: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
 msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
-msgstr ""
+msgstr "Evolution is importing your old Elm mail"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
 #: mail/importers/evolution-outlook-importer.c:225
 #: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
 msgid "Importing..."
-msgstr ""
+msgstr "Importing..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
 #: mail/importers/evolution-outlook-importer.c:227
 #: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
 msgid "Please wait"
-msgstr ""
+msgstr "Please wait"
 
 #: mail/importers/elm-importer.c:244
 msgid "Importing Elm data"
-msgstr ""
+msgstr "Importing Elm data"
 
 #: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 
 #: mail/importers/elm-importer.c:444
 msgid "Elm"
-msgstr ""
+msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
-#, fuzzy
 msgid "Destination folder:"
-msgstr "Synchronising \"%s\""
+msgstr "Destination folder:"
 
 #: mail/importers/evolution-mbox-importer.c:119
-#, fuzzy
 msgid "Select folder to import into"
-msgstr "Synchronising \"%s\""
+msgstr "Select folder to import into"
 
 #: mail/importers/evolution-mbox-importer.c:219
 #: mail/importers/evolution-outlook-importer.c:224
 #: mail/importers/mail-importer.c:220
-#, fuzzy, c-format
+#, c-format
 msgid "Importing `%s'"
-msgstr "Synchronise \"%s\""
+msgstr "Importing `%s'"
 
 #: mail/importers/evolution-outlook-importer.c:271
 #: mail/importers/mail-importer.c:134
-#, fuzzy
 msgid "Importing mailbox"
-msgstr "Organisation"
+msgstr "Importing mailbox"
 
 #: mail/importers/mail-importer.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "Scanning %s"
-msgstr "Synchronise \"%s\""
+msgstr "Scanning %s"
 
 #: mail/importers/netscape-importer.c:72
 #, c-format
 msgid "Priority Filter \"%s\""
-msgstr ""
+msgstr "Priority Filter \"%s\""
 
 #: mail/importers/netscape-importer.c:650
 msgid ""
@@ -13616,6 +13943,17 @@ msgid ""
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
 msgstr ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
 
 #: mail/importers/netscape-importer.c:674
 msgid ""
@@ -13624,6 +13962,10 @@ msgid ""
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
 msgstr ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
 
 #: mail/importers/netscape-importer.c:691
 msgid ""
@@ -13633,226 +13975,209 @@ msgid ""
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
 msgstr ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
 
 #: mail/importers/netscape-importer.c:1219
 msgid "Evolution is importing your old Netscape data"
-msgstr ""
+msgstr "Evolution is importing your old Netscape data"
 
 #: mail/importers/netscape-importer.c:1677
 msgid "Importing Netscape data"
-msgstr ""
+msgstr "Importing Netscape data"
 
 #: mail/importers/netscape-importer.c:1877
 msgid "Settings"
-msgstr ""
+msgstr "Settings"
 
 #: mail/importers/netscape-importer.c:1882
 msgid "Mail Filters"
-msgstr ""
+msgstr "Mail Filters"
 
 #: mail/importers/netscape-importer.c:1903
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 
 #: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
-msgstr ""
+msgstr "Evolution is importing your old Pine data"
 
 #: mail/importers/pine-importer.c:313
 msgid "Importing Pine data"
-msgstr ""
+msgstr "Importing Pine data"
 
 #: mail/importers/pine-importer.c:478
 msgid "Addressbook"
-msgstr ""
+msgstr "Addressbook"
 
 #: mail/importers/pine-importer.c:497
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 
 #: mail/importers/pine-importer.c:505
 msgid "Pine"
-msgstr ""
-
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr ""
+msgstr "Pine"
 
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr ""
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr ""
-
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
 msgid "You have not filled in all of the required information."
-msgstr ""
+msgstr "You have not filled in all of the required information."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
-msgstr ""
+msgstr "Evolution Account Editor"
 
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
 msgid "_Host:"
-msgstr ""
+msgstr "_Host:"
 
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
 msgid "User_name:"
-msgstr ""
+msgstr "User_name:"
 
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
 msgid "_Path:"
-msgstr ""
+msgstr "_Path:"
 
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2086
 msgid "You may not create two accounts with the same name."
-msgstr ""
+msgstr "You may not create two accounts with the same name."
 
 #: mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
-msgstr ""
+msgstr "Mail to %s"
 
 #: mail/mail-autofilter.c:261
 #, c-format
 msgid "Subject is %s"
-msgstr ""
+msgstr "Subject is %s"
 
 #: mail/mail-autofilter.c:277
 #, c-format
 msgid "Mail from %s"
-msgstr ""
+msgstr "Mail from %s"
 
 #: mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
-msgstr ""
+msgstr "%s mailing list"
 
 #: mail/mail-autofilter.c:318
 #, c-format
 msgid "Replies to %s"
-msgstr ""
+msgstr "Replies to %s"
 
 #: mail/mail-autofilter.c:373
 msgid "Add Filter Rule"
-msgstr ""
+msgstr "Add Filter Rule"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
 msgid "The following filter rule(s):\n"
-msgstr ""
+msgstr "The following filter rule(s):\n"
 
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
 #, c-format
 msgid ""
 "Used the removed folder:\n"
 "    '%s'\n"
 "And have been updated."
 msgstr ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
+msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: mail/mail-component.c:546
-#, fuzzy
+#: mail/mail-component.c:587
 msgid "New Mail Message"
-msgstr "Colours"
+msgstr "New Mail Message"
 
-#: mail/mail-component.c:547
-#, fuzzy
+#: mail/mail-component.c:588
 msgid "_Mail Message"
-msgstr "Colours"
+msgstr "_Mail Message"
 
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
 msgid "Compose a new mail message"
-msgstr ""
+msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:553
-#, fuzzy
+#: mail/mail-component.c:594
 msgid "New Mail Folder"
-msgstr "Synchronising \"%s\""
+msgstr "New Mail Folder"
 
-#: mail/mail-component.c:554
-#, fuzzy
+#: mail/mail-component.c:595
 msgid "Mail _Folder"
-msgstr "Synchronising \"%s\""
+msgstr "Mail _Folder"
 
-#: mail/mail-component.c:555
-#, fuzzy
+#: mail/mail-component.c:596
 msgid "Create a new mail folder"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
 msgid "URI of the mail source that the view will display"
-msgstr ""
+msgstr "URI of the mail source that the view will display"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
 msgid "Identity"
-msgstr ""
+msgstr "Identity"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
 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:375 mail/mail-config-druid.c:382
-#, fuzzy
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
-msgstr "Synchronise \"%s\""
+msgstr "Receiving Mail"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
 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:384
+#: mail/mail-config-druid.c:383
 msgid "Please select among the following options"
-msgstr ""
+msgstr "Please select among the following options"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
 msgid "Sending Mail"
-msgstr ""
+msgstr "Sending Mail"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
 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:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
 msgid "Account Management"
-msgstr ""
+msgstr "Account Management"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -13860,959 +14185,983 @@ msgid ""
 "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:1092
 msgid "Checking Service"
-msgstr ""
+msgstr "Checking Service"
 
 #: mail/mail-config.c:1170 mail/mail-config.c:1174
 msgid "Connecting to server..."
-msgstr ""
+msgstr "Connecting to server..."
+
+#: mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
+msgstr " Ch_eck for Supported Types "
 
 #: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
-msgstr ""
+msgid "<b>Preview</b>"
+msgstr "<b>Preview</b>"
 
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr ""
+msgid "<b>SSL is not supported in this build of evolution</b>"
+msgstr "<b>SSL is not supported in this build of evolution</b>"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr ""
+msgid "<b>S_ignatures</b>"
+msgstr "<b>S_ignatures</b>"
+
+#: mail/mail-config.glade.h:6
+msgid "<b>_Languages</b>"
+msgstr "<b>_Languages</b>"
 
 #: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr ""
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr "<span weight=\"bold\">Account Information</span>"
 
 #: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr ""
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Alerts</span>"
 
 #: mail/mail-config.glade.h:9
-msgid "Account Editor"
-msgstr ""
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr "<span weight=\"bold\">Authentication Type</span>"
 
 #: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr ""
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr "<span weight=\"bold\">Authentication</span>"
+
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "<span weight=\"bold\">Checking for New Mail</span>"
 
 #: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr ""
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr "<span weight=\"bold\">Composing Messages</span>"
 
 #: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr ""
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr "<span weight=\"bold\">Configuration</span>"
 
 #: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr ""
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr "<span weight=\"bold\">Default Behavior</span>"
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr "<span weight=\"bold\">Delete Mail</span>"
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr ""
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr "<span weight=\"bold\">Filter Options</span>"
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
-msgstr ""
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">General</span>"
 
 #: mail/mail-config.glade.h:19
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr ""
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr "<span weight=\"bold\">Labels and Colours</span>"
 
 #: mail/mail-config.glade.h:20
-msgid "Attach original message"
-msgstr ""
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr "<span weight=\"bold\">Loading Images</span>"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr ""
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "<span weight=\"bold\">Message Display</span>"
 
 #: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr ""
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr "<span weight=\"bold\">Message Fonts</span>"
 
 #: mail/mail-config.glade.h:23
-msgid "Baltic (ISO-8859-13)"
-msgstr ""
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr "<span weight=\"bold\">New Mail Notification</span>"
 
 #: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-4)"
-msgstr ""
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr "<span weight=\"bold\">Optional Information</span>"
 
 #: mail/mail-config.glade.h:25
-msgid "C_haracter set:"
-msgstr ""
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">Options</span>"
 
 #: mail/mail-config.glade.h:26
-#, fuzzy
-msgid "C_olors"
-msgstr "Colours"
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
 #: mail/mail-config.glade.h:27
-msgid "Check _Incoming Mail"
-msgstr ""
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr "<span weight=\"bold\">Printed Fonts</span>"
 
 #: mail/mail-config.glade.h:28
-msgid "Check spelling while I _type"
-msgstr ""
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr "<span weight=\"bold\">Required Information</span>"
 
 #: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr ""
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
 #: mail/mail-config.glade.h:30
-msgid "Checks incoming mail messages to be Junk"
-msgstr ""
+msgid "<span weight=\"bold\">Security</span>"
+msgstr "<span weight=\"bold\">Security</span>"
 
 #: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Color for _misspelled words:"
-msgstr "Colours for display"
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
 
 #: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr ""
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr "<span weight=\"bold\">Server Configuration</span>"
 
 #: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr ""
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "A_lso encrypt to self when sending encrypted mail"
 
 #: mail/mail-config.glade.h:34
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
+msgid "Account Editor"
+msgstr "Account Editor"
 
-#: mail/mail-config.glade.h:40
-msgid "De_fault"
-msgstr ""
+#: mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr "Add Ne_w Signature..."
+
+#: mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr "Add _Script"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Al_ways encrypt to myself when sending encrypted mail"
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Alway_s carbon-copy (cc) to:"
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Always _blind carbon-copy (bcc) to:"
 
 #: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr ""
+msgid "Always _sign outgoing messages when using this account"
+msgstr "Always _sign outgoing messages when using this account"
 
 #: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
-msgstr ""
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Always _trust keys in my keyring when encrypting"
 
 #: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr ""
+msgid "Attach original message"
+msgstr "Attach original message"
+
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Attachment"
 
 #: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr ""
+msgid "Automatically _insert smiley images"
+msgstr "Automatically _insert smiley images"
 
 #: mail/mail-config.glade.h:47
-msgid "Do not quote original message"
-msgstr ""
+msgid "Automatically check for _new mail every"
+msgstr "Automatically check for _new mail every"
 
 #: mail/mail-config.glade.h:48
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr ""
+msgid "Baltic (ISO-8859-13)"
+msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Done"
-msgstr ""
+#: mail/mail-config.glade.h:49
+msgid "Baltic (ISO-8859-4)"
+msgstr "Baltic (ISO-8859-4)"
 
 #: mail/mail-config.glade.h:50
-#, fuzzy
-msgid "Drafts _folder:"
-msgstr "Synchronising \"%s\""
+msgid "Beep w_hen new mail arrives"
+msgstr "Beep w_hen new mail arrives"
+
+#: mail/mail-config.glade.h:51
+msgid "C_haracter set:"
+msgstr "C_haracter set:"
 
 #: mail/mail-config.glade.h:52
-msgid "Email Accounts"
-msgstr ""
+msgid "Ch_eck for Supported Types "
+msgstr "Ch_eck for Supported Types "
 
 #: mail/mail-config.glade.h:53
-msgid "Email _address:"
-msgstr ""
+msgid "Check _Incoming Mail"
+msgstr "Check _Incoming Mail"
 
 #: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
-msgstr ""
+msgid "Check spelling while I _type"
+msgstr "Check spelling while I _type"
 
 #: mail/mail-config.glade.h:55
-msgid "Encry_ption certificate:"
-msgstr ""
+msgid "Checks incoming mail messages to be Junk"
+msgstr "Checks incoming mail messages to be Junk"
 
 #: mail/mail-config.glade.h:56
-msgid "Evolution Account Assistant"
-msgstr ""
+msgid "Color for _misspelled words:"
+msgstr "Colour for _misspelled words:"
 
 #: mail/mail-config.glade.h:57
-msgid "Execute Command..."
-msgstr ""
+msgid "Colors"
+msgstr "Colours"
 
 #: mail/mail-config.glade.h:58
-msgid "Fi_xed -width:"
-msgstr ""
+msgid "Confirm _when expunging a folder"
+msgstr "Confirm _when expunging a folder"
 
 #: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Filter Options"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-config.glade.h:60
-msgid "Font Properties"
-msgstr ""
-
-#: mail/mail-config.glade.h:61
-msgid "Format messages in _HTML"
-msgstr ""
-
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
-msgid "Highlight _quotations with"
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
 msgstr ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
 
-#: mail/mail-config.glade.h:64
-msgid "IMAPv4 "
-msgstr ""
+#: mail/mail-config.glade.h:65
+msgid "De_fault"
+msgstr "De_fault"
 
 #: mail/mail-config.glade.h:67
-msgid "Inline"
-msgstr ""
+msgid "Default character e_ncoding:"
+msgstr "Default character e_ncoding:"
 
 #: mail/mail-config.glade.h:68
-msgid "Kerberos "
-msgstr ""
+msgid "Defaults"
+msgstr "Defaults"
 
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr ""
+#: mail/mail-config.glade.h:70
+msgid "Do not quote original message"
+msgstr "Do not quote original message"
 
 #: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr ""
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgstr "Don't sign _meeting requests (for Outlook compatibility)"
 
-#: mail/mail-config.glade.h:72
-msgid "Mail Configuration"
-msgstr ""
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Done"
+msgstr "Done"
 
-#: mail/mail-config.glade.h:74
-msgid "Mailbox location"
-msgstr ""
+#: mail/mail-config.glade.h:73
+msgid "Drafts _Folder:"
+msgstr "Drafts _Folder:"
 
 #: mail/mail-config.glade.h:75
-#, fuzzy
-msgid "Message Composer"
-msgstr "Colours"
+msgid "Email Accounts"
+msgstr "Email Accounts"
 
 #: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr ""
+msgid "Email _Address:"
+msgstr "Email _Address:"
 
 #: mail/mail-config.glade.h:77
-#, fuzzy
-msgid "Message Fonts"
-msgstr "Colours"
+msgid "Empty trash folders on e_xit"
+msgstr "Empty trash folders on e_xit"
+
+#: mail/mail-config.glade.h:78
+msgid "Encry_ption certificate:"
+msgstr "Encry_ption certificate:"
 
 #: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr ""
+msgid "Evolution Account Assistant"
+msgstr "Evolution Account Assistant"
+
+#: mail/mail-config.glade.h:80
+msgid "Execute Command..."
+msgstr "Execute Command..."
 
 #: mail/mail-config.glade.h:81
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
+msgid "Fi_xed -width:"
+msgstr "Fi_xed -width:"
 
 #: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr ""
+msgid "Font Properties"
+msgstr "Font Properties"
 
-#: mail/mail-config.glade.h:84
-#, fuzzy
-msgid "Or_ganization:"
-msgstr "Organisation:"
+#: mail/mail-config.glade.h:83
+msgid "Format messages in _HTML"
+msgstr "Format messages in _HTML"
 
 #: mail/mail-config.glade.h:85
-msgid "PGP/GPG _Key ID:"
-msgstr ""
+msgid "HTML Mail"
+msgstr "HTML Mail"
 
-#: mail/mail-config.glade.h:89
-msgid "Pick a color"
-msgstr "Pick a colour"
+#: mail/mail-config.glade.h:86
+msgid "Headers"
+msgstr "Headers"
 
-#: mail/mail-config.glade.h:90
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
+#: mail/mail-config.glade.h:87
+msgid "Highlight _quotations with"
+msgstr "Highlight _quotations with"
 
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr ""
+#: mail/mail-config.glade.h:88
+msgid "IMAPv4 "
+msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
-msgstr ""
+#: mail/mail-config.glade.h:91
+msgid "Inline"
+msgstr "Inline"
 
 #: mail/mail-config.glade.h:93
-msgid "Qmail maildir "
-msgstr ""
-
-#: mail/mail-config.glade.h:94
-msgid "Quote original message"
-msgstr ""
+msgid "Kerberos "
+msgstr "Kerberos "
 
 #: mail/mail-config.glade.h:95
-msgid "Quoted"
-msgstr ""
-
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr ""
+msgid "Mail Configuration"
+msgstr "Mail Configuration"
 
 #: mail/mail-config.glade.h:97
-msgid "Re_ply-To:"
-msgstr ""
+msgid "Mailbox location"
+msgstr "Mailbox location"
 
 #: mail/mail-config.glade.h:98
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config.glade.h:99
-#, fuzzy
-msgid "Receiving _Options"
-msgstr "Synchronise \"%s\""
-
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr ""
+msgid "Message Composer"
+msgstr "Message Composer"
 
 #: mail/mail-config.glade.h:101
-msgid "Required Information"
+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:102
-#, fuzzy
-msgid "Restore Defaults"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr ""
+msgid "Or_ganization:"
+msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:106
-msgid "Select HTML fixed width font"
-msgstr ""
+#: mail/mail-config.glade.h:103
+msgid "PGP/GPG _Key ID:"
+msgstr "PGP/GPG _Key ID:"
 
 #: mail/mail-config.glade.h:107
-msgid "Select HTML fixed width font for printing"
-msgstr ""
+msgid "Pick a color"
+msgstr "Pick a colour"
 
 #: mail/mail-config.glade.h:108
-msgid "Select HTML variable width font"
-msgstr ""
+msgid "Play sound file when new mail arri_ves"
+msgstr "Play sound file when new mail arri_ves"
 
 #: mail/mail-config.glade.h:109
-msgid "Select HTML variable width font for printing"
-msgstr ""
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
 
 #: mail/mail-config.glade.h:110
-msgid "Sending Email"
-msgstr ""
+msgid "Qmail maildir "
+msgstr "Qmail maildir "
+
+#: mail/mail-config.glade.h:111
+msgid "Quote original message"
+msgstr "Quote original message"
 
 #: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Sent _messages folder:"
-msgstr "Synchronising \"%s\""
+msgid "Quoted"
+msgstr "Quoted"
 
 #: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr ""
+msgid "Re_member password"
+msgstr "Re_member password"
 
 #: mail/mail-config.glade.h:114
-msgid "Ser_ver requires authentication"
-msgstr ""
+msgid "Re_ply-To:"
+msgstr "Re_ply-To:"
 
 #: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config.glade.h:116
-msgid "Server _Type: "
-msgstr ""
+msgid "Receiving Email"
+msgstr "Receiving Email"
 
 #: mail/mail-config.glade.h:117
-msgid "Si_gning certificate:"
-msgstr ""
+msgid "Receiving Options"
+msgstr "Receiving Options"
 
 #: mail/mail-config.glade.h:118
-msgid "Specify _filename:"
-msgstr ""
-
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
-msgstr ""
+msgid "Remember _password"
+msgstr "Remember _password"
 
 #: mail/mail-config.glade.h:120
-msgid "Standard Unix mbox"
-msgstr ""
+msgid "S_tandard Font:"
+msgstr "S_tandard Font:"
 
 #: mail/mail-config.glade.h:121
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
+msgid "Security"
+msgstr "Security"
+
+#: mail/mail-config.glade.h:122
+msgid "Select HTML fixed width font"
+msgstr "Select HTML fixed width font"
+
+#: mail/mail-config.glade.h:123
+msgid "Select HTML fixed width font for printing"
+msgstr "Select HTML fixed width font for printing"
 
 #: mail/mail-config.glade.h:124
-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 ""
+msgid "Select HTML variable width font"
+msgstr "Select HTML variable width font"
+
+#: mail/mail-config.glade.h:125
+msgid "Select HTML variable width font for printing"
+msgstr "Select HTML variable width font for printing"
 
 #: mail/mail-config.glade.h:126
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
+msgid "Select..."
+msgstr "Select..."
 
-#: mail/mail-config.glade.h:128
-msgid "Use _Daemon"
-msgstr ""
+#: mail/mail-config.glade.h:127
+msgid "Sending Email"
+msgstr "Sending Email"
 
 #: mail/mail-config.glade.h:130
-msgid "V_ariable-width:"
-msgstr ""
+msgid "Sent _Messages Folder:"
+msgstr "Sent _Messages Folder:"
 
 #: mail/mail-config.glade.h:131
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-msgstr ""
+msgid "Ser_ver requires authentication"
+msgstr "Ser_ver requires authentication"
+
+#: mail/mail-config.glade.h:132
+msgid "Server _Type: "
+msgstr "Server _Type: "
+
+#: mail/mail-config.glade.h:133
+msgid "Si_gning certificate:"
+msgstr "Si_gning certificate:"
+
+#: mail/mail-config.glade.h:134
+msgid "Signat_ure:"
+msgstr "Signat_ure:"
+
+#: mail/mail-config.glade.h:135
+msgid "Signatures"
+msgstr "Signatures"
 
 #: mail/mail-config.glade.h:136
-msgid "_Add Signature"
-msgstr ""
+msgid "Specify _filename:"
+msgstr "Specify _filename:"
 
 #: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
-msgstr ""
+msgid "Spell Checking"
+msgstr "Spell Checking"
 
 #: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr ""
+msgid "Standard Unix mbox"
+msgstr "Standard Unix mbox"
 
 #: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr ""
+msgid "T_erminal Font:"
+msgstr "T_erminal Font:"
 
 #: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr ""
+msgid "T_ype: "
+msgstr "T_ype: "
 
 #: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr ""
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 
 #: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr ""
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
+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:146
-msgid "_Defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:147
-msgid "_Do not notify me when new mail arrives"
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
 msgstr ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
 
-#: mail/mail-config.glade.h:149
-msgid "_Enable"
-msgstr ""
+#: mail/mail-config.glade.h:148
+msgid "Use _Daemon"
+msgstr "Use _Daemon"
 
 #: mail/mail-config.glade.h:150
-msgid "_Encrypt outgoing messages (by default)"
-msgstr ""
+msgid "V_ariable-width:"
+msgstr "V_ariable-width:"
 
 #: mail/mail-config.glade.h:151
-msgid "_Forward style:"
-msgstr ""
-
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
 msgstr ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
 
 #: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr ""
+msgid "_Add Signature"
+msgstr "_Add Signature"
 
 #: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr ""
+msgid "_Always load images from the Internet"
+msgstr "_Always load images from the Internet"
 
 #: mail/mail-config.glade.h:158
-msgid "_Load images if sender is in address book"
-msgstr ""
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "_Digitally sign outgoing messages (by default)"
 
 #: mail/mail-config.glade.h:159
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:160
-msgid "_Make this my default account"
-msgstr ""
+msgid "_Do not notify me when new mail arrives"
+msgstr "_Do not notify me when new mail arrives"
 
 #: mail/mail-config.glade.h:161
-msgid "_Mark messages as read after"
-msgstr ""
+msgid "_Enable"
+msgstr "_Enable"
 
 #: mail/mail-config.glade.h:162
-msgid "_Name:"
-msgstr ""
+msgid "_Encrypt outgoing messages (by default)"
+msgstr "_Encrypt outgoing messages (by default)"
 
 #: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr ""
+msgid "_Forward style:"
+msgstr "_Forward style:"
 
 #: mail/mail-config.glade.h:166
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
+msgid "_Load images if sender is in address book"
+msgstr "_Load images if sender is in address book"
 
 #: mail/mail-config.glade.h:167
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr ""
+msgid "_Local Tests Only"
+msgstr "_Local Tests Only"
 
 #: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr ""
+msgid "_Make this my default account"
+msgstr "_Make this my default account"
 
 #: mail/mail-config.glade.h:169
-msgid "_Reply style:"
-msgstr ""
+msgid "_Mark messages as read after"
+msgstr "_Mark messages as read after"
 
 #: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr ""
+msgid "_Name:"
+msgstr "_Name:"
 
 #: mail/mail-config.glade.h:171
-msgid "_Script:"
-msgstr ""
-
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Synchronising \"%s\""
+msgid "_Never load images from the Internet"
+msgstr "_Never load images from the Internet"
 
 #: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr ""
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "_Prompt when sending HTML messages to contacts that don't want them"
 
 #: mail/mail-config.glade.h:174
-msgid "_Show animated images"
-msgstr ""
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "_Prompt when sending messages with an empty subject line"
 
 #: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr ""
+msgid "_Reply style:"
+msgstr "_Reply style:"
 
 #: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr ""
+msgid "_Script:"
+msgstr "_Script:"
 
 #: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr ""
+msgid "_Show animated images"
+msgstr "_Show animated images"
 
 #: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
-msgstr ""
+msgid "_Use Secure Connection (SSL):"
+msgstr "_Use Secure Connection (SSL):"
 
 #: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
-msgstr ""
+msgstr "_Use the same fonts as other applications"
+
+#: mail/mail-config.glade.h:180
+msgid "_minute(s)"
+msgstr "_minute(s)"
 
 #: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "colour"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
-msgstr ""
+msgstr "description"
 
-#: mail/mail-folder-cache.c:792
-#, fuzzy, c-format
+#: mail/mail-folder-cache.c:796
+#, c-format
 msgid "Pinging %s"
-msgstr "Synchronise \"%s\""
+msgstr "Pinging %s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
+"Error while '%s':\n"
+"%s"
 
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
+"Error while performing operation:\n"
+"%s"
 
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
 msgid "Working"
-msgstr ""
+msgstr "Working"
 
-#: mail/mail-ops.c:88
-#, fuzzy
+#: mail/mail-ops.c:87
 msgid "Filtering Folder"
-msgstr "Synchronising \"%s\""
+msgstr "Filtering Folder"
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:248
 msgid "Fetching Mail"
-msgstr ""
+msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:528
-#, fuzzy, c-format
+#: mail/mail-ops.c:533
+#, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:558
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:562
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-ops.c:604
+#: mail/mail-ops.c:567
 #, c-format
-msgid "Sending \"%s\""
-msgstr ""
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:663
 #, c-format
 msgid "Sending message %d of %d"
-msgstr ""
+msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:741
+#: mail/mail-ops.c:694
 #, c-format
-msgid "Failed on message %d of %d"
-msgstr ""
+msgid "Failed to send %d of %d messages"
+msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:698
 msgid "Complete."
-msgstr ""
+msgstr "Complete."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:795
 msgid "Saving message to folder"
-msgstr ""
+msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:880
 #, c-format
 msgid "Moving messages to %s"
-msgstr ""
+msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:880
 #, c-format
 msgid "Copying messages to %s"
-msgstr ""
+msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:993
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr ""
+msgstr "Scanning folders in \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
-msgstr ""
+msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1232
 #, c-format
 msgid "Opening folder %s"
-msgstr ""
+msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1304
 #, c-format
 msgid "Opening store %s"
-msgstr ""
+msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1424
-#, fuzzy, c-format
+#: mail/mail-ops.c:1382
+#, c-format
 msgid "Removing folder %s"
-msgstr "Synchronising \"%s\""
+msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1518
-#, fuzzy, c-format
+#: mail/mail-ops.c:1476
+#, c-format
 msgid "Storing folder '%s'"
-msgstr "Synchronising \"%s\""
+msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1541
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr ""
+msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1584
-#, fuzzy, c-format
+#: mail/mail-ops.c:1542
+#, c-format
 msgid "Storing account '%s'"
-msgstr "Synchronising \"%s\""
+msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1639
-#, fuzzy
+#: mail/mail-ops.c:1597
 msgid "Refreshing folder"
-msgstr "Synchronising \"%s\""
+msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1633 mail/mail-ops.c:1684
 msgid "Expunging folder"
-msgstr ""
+msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1681
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr ""
+msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1682
 msgid "Local Folders"
-msgstr ""
+msgstr "Local Folders"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1765
 #, c-format
 msgid "Retrieving message %s"
-msgstr ""
+msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1879
+#: mail/mail-ops.c:1837
 #, c-format
-msgid "Retrieving %d message(s)"
-msgstr ""
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Retrieving %d message"
+msgstr[1] "Retreiving %d messages"
 
-#: mail/mail-ops.c:1963
+#: mail/mail-ops.c:1923
 #, c-format
-msgid "Saving %d messsage(s)"
-msgstr ""
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Saving %d message"
+msgstr[1] "Saving %d messages"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1973
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
+"Unable to create output file: %s\n"
+" %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2001
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
+"Error saving messages to: %s:\n"
+" %s"
 
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2072
 msgid "Saving attachment"
-msgstr ""
+msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2089
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
+"Cannot create output file: %s:\n"
+" %s"
 
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2119
 #, c-format
 msgid "Could not write data: %s"
-msgstr ""
+msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2267
 #, c-format
 msgid "Disconnecting from %s"
-msgstr ""
+msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2305
-#, fuzzy, c-format
+#: mail/mail-ops.c:2267
+#, c-format
 msgid "Reconnecting to %s"
-msgstr "Synchronise \"%s\""
-
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
+msgstr "Reconnecting to %s"
 
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
-msgstr ""
+msgstr "Case Sensitive"
 
 #: mail/mail-search.glade.h:3
 msgid "Find in Message"
-msgstr ""
+msgstr "Find in Message"
 
 #: mail/mail-search.glade.h:4
 msgid "Find:"
-msgstr ""
+msgstr "Find:"
 
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr ""
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digital Signature</span>"
 
 #: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr ""
-
-#: mail/mail-security.glade.h:3
-#, fuzzy
-msgid "Encryption"
-msgstr "Synchronising \"%s\""
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Encryption</span>"
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
-msgstr ""
+msgstr "Security Information"
 
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
 msgid "Cancelling..."
-msgstr ""
+msgstr "Cancelling..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
 #, c-format
 msgid "Server: %s, Type: %s"
-msgstr ""
+msgstr "Server: %s, Type: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Path: %s, Type: %s"
-msgstr ""
+msgstr "Path: %s, Type: %s"
 
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Type: %s"
-msgstr ""
+msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
 msgid "Send & Receive Mail"
-msgstr ""
+msgstr "Send & Receive Mail"
 
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
 msgid "Cancel _All"
-msgstr ""
+msgstr "Cancel _All"
 
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
 msgid "Updating..."
-msgstr ""
+msgstr "Updating..."
 
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
 msgid "Waiting..."
-msgstr ""
+msgstr "Waiting..."
 
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
 msgid "User canceled operation."
-msgstr ""
+msgstr "User cancelled operation."
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 #, c-format
 msgid "Enter Password for %s"
-msgstr ""
+msgstr "Enter Password for %s"
 
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
 msgid "Enter Password"
-msgstr ""
+msgstr "Enter Password"
 
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
 msgid "_Remember this password"
-msgstr ""
+msgstr "_Remember this password"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
-msgstr ""
+msgstr "_Remember this password for the remainder of this session"
 
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:84
 #, c-format
 msgid "Could not save signature file: %s"
-msgstr ""
+msgstr "Could not save signature file: %s"
 
-#: mail/mail-signature-editor.c:226
+#: mail/mail-signature-editor.c:230
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
 
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:233
 msgid "_Discard changes"
-msgstr ""
+msgstr "_Discard changes"
 
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:237
 msgid "Save signature"
-msgstr ""
+msgstr "Save signature"
 
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:386
 msgid "Edit signature"
-msgstr ""
+msgstr "Edit signature"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:426
 msgid "Enter a name for this signature."
-msgstr ""
+msgstr "Enter a name for this signature."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:429
 msgid "Name:"
-msgstr ""
+msgstr "Name:"
 
 #: mail/mail-tools.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Synchronising \"%s\""
+msgstr "Could not create spool directory `%s': %s"
 
 #: mail/mail-tools.c:141
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
+msgstr "Trying to movemail a non-mbox source `%s'"
 
 #: mail/mail-tools.c:276
 #, c-format
 msgid "Forwarded message - %s"
-msgstr ""
+msgstr "Forwarded message - %s"
 
 #: mail/mail-tools.c:278
 msgid "Forwarded message"
-msgstr ""
+msgstr "Forwarded message"
 
 #: mail/mail-tools.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid folder: `%s'"
-msgstr "Synchronising \"%s\""
+msgstr "Invalid folder: `%s'"
 
-#: mail/mail-vfolder.c:87
-#, fuzzy, c-format
+#: mail/mail-vfolder.c:88
+#, c-format
 msgid "Setting up vfolder: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Setting up vfolder: %s"
 
-#: mail/mail-vfolder.c:206
-#, fuzzy, c-format
+#: mail/mail-vfolder.c:207
+#, c-format
 msgid "Updating vfolders for uri: %s"
-msgstr "Synchronising \"%s\""
+msgstr "Updating vfolders for uri: %s"
 
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14820,351 +15169,341 @@ msgid ""
 "    '%s'\n"
 "And have been updated."
 msgstr ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
 
-#: mail/mail-vfolder.c:925
-#, fuzzy
+#: mail/mail-vfolder.c:926
 msgid "vFolders"
-msgstr "Synchronising \"%s\""
+msgstr "vFolders"
 
-#: mail/mail-vfolder.c:964
-#, fuzzy
+#: mail/mail-vfolder.c:965
 msgid "Edit VFolder"
-msgstr "Synchronising \"%s\""
+msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr ""
+msgstr "Trying to edit a vfolder '%s' which doesn't exist."
 
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
 msgid "New VFolder"
-msgstr ""
+msgstr "New VFolder"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:935
 msgid "Unseen"
-msgstr ""
+msgstr "Unseen"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:936
 msgid "Seen"
-msgstr ""
+msgstr "Seen"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:937
 msgid "Answered"
-msgstr ""
+msgstr "Answered"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:938
 msgid "Multiple Unseen Messages"
-msgstr ""
+msgstr "Multiple Unseen Messages"
 
-#: mail/message-list.c:931
+#: mail/message-list.c:939
 msgid "Multiple Messages"
-msgstr ""
+msgstr "Multiple Messages"
 
-#: mail/message-list.c:935
+#: mail/message-list.c:943
 msgid "Lowest"
-msgstr ""
+msgstr "Lowest"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:944
 msgid "Lower"
-msgstr ""
+msgstr "Lower"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:948
 msgid "Higher"
-msgstr ""
+msgstr "Higher"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:949
 msgid "Highest"
-msgstr ""
+msgstr "Highest"
 
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "Today %l:%M %p"
-msgstr ""
+msgstr "Today %l:%M %p"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
 msgid "Yesterday %l:%M %p"
-msgstr ""
+msgstr "Yesterday %l:%M %p"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
 msgid "%a %l:%M %p"
-msgstr ""
+msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
 msgid "%b %d %l:%M %p"
-msgstr ""
+msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
 msgid "%b %d %Y"
-msgstr ""
+msgstr "%d %b %Y"
 
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
 msgid "Generating message list"
-msgstr ""
+msgstr "Generating message list"
 
 #: mail/message-list.etspec.h:3
 msgid "Due By"
-msgstr ""
+msgstr "Due By"
 
 #: mail/message-list.etspec.h:4
 msgid "Flag Status"
-msgstr ""
+msgstr "Flag Status"
 
 #: mail/message-list.etspec.h:5
 msgid "Flagged"
-msgstr ""
+msgstr "Flagged"
 
 #: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr ""
+msgstr "Follow Up Flag"
 
 #: mail/message-list.etspec.h:8
-#, fuzzy
 msgid "Original Location"
-msgstr "Organisation"
+msgstr "Original Location"
 
 #: mail/message-list.etspec.h:9
 msgid "Received"
-msgstr ""
+msgstr "Received"
 
 #: mail/message-list.etspec.h:11
 msgid "Size"
-msgstr ""
+msgstr "Size"
 
 #: mail/message-tag-followup.c:62
 msgid "Call"
-msgstr ""
+msgstr "Call"
 
 #: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
-msgstr ""
+msgstr "Do Not Forward"
 
 #: mail/message-tag-followup.c:64
 msgid "Follow-Up"
-msgstr ""
+msgstr "Follow-Up"
 
 #: mail/message-tag-followup.c:65
 msgid "For Your Information"
-msgstr ""
+msgstr "For Your Information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
-msgstr ""
+msgstr "Forward"
 
 #: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
-msgstr ""
+msgstr "No Response Necessary"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
-msgstr ""
+msgstr "Reply"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
-msgstr ""
+msgstr "Reply to All"
 
 #: mail/message-tag-followup.c:71
 msgid "Review"
-msgstr ""
+msgstr "Review"
 
 #: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
-msgstr ""
+msgstr "Flag to Follow Up"
 
 #: mail/message-tags.glade.h:2
 msgid "C_ompleted"
-msgstr ""
+msgstr "C_ompleted"
 
 #: 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."
 msgstr ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
-msgstr ""
+msgid "_Due By:"
+msgstr "_Due By:"
 
 #: mail/message-tags.glade.h:7
 msgid "_Flag:"
-msgstr ""
+msgstr "_Flag:"
 
 #: mail/subscribe-dialog.glade.h:1
-#, fuzzy
 msgid "Folder Subscriptions"
-msgstr "Synchronising \"%s\""
+msgstr "Folder Subscriptions"
 
 #: mail/subscribe-dialog.glade.h:2
-#, fuzzy
 msgid "None Selected"
-msgstr "Synchronising \"%s\""
+msgstr "None Selected"
 
 #: mail/subscribe-dialog.glade.h:3
-#, fuzzy
 msgid "S_erver:"
-msgstr "Synchronising \"%s\""
+msgstr "S_erver:"
 
 #: mail/subscribe-dialog.glade.h:4
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Subscribe"
 
 #: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
-msgstr ""
+msgstr "_Unsubscribe"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Shell"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Shell"
 
 #: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Test"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Test"
 
 #: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Test component"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution Test component"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
-msgstr ""
+msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
 msgid "Default shortcut group"
-msgstr "Synchronising \"%s\""
+msgstr "Default shortcut group"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
-msgstr ""
+msgstr "Default width of the folder bar pane"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default width of the shortcut bar pane"
-msgstr ""
+msgstr "Default width of the shortcut bar pane"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window height"
-msgstr ""
+msgstr "Default window height"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
-msgstr ""
+msgstr "Default window width"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:7
-#, fuzzy
 msgid "Evolution configuration version"
-msgstr "Cannot initialise Evolution's mail component."
+msgstr "Evolution configuration version"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
+msgstr "ID or alias of the component to be shown by default at start-up."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
 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:10
 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:11
 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:12
 msgid "Path to the default calendar folder"
-msgstr ""
+msgstr "Path to the default calendar folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
 msgid "Path to the default contacts folder"
-msgstr "Synchronising \"%s\""
+msgstr "Path to the default contacts folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
 msgid "Path to the default mail folder"
-msgstr "Synchronising \"%s\""
+msgstr "Path to the default mail folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
 msgid "Path to the default tasks folder"
-msgstr "Synchronising \"%s\""
+msgstr "Path to the default tasks folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "Physical URI to the default calendar folder"
-msgstr ""
+msgstr "Physical URI to the default calendar folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "Physical URI to the default contacts folder"
-msgstr ""
+msgstr "Physical URI to the default contacts folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Physical URI to the default mail folder"
-msgstr ""
+msgstr "Physical URI to the default mail folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
 msgid "Physical URI to the default tasks folder"
-msgstr "Synchronising \"%s\""
+msgstr "Physical URI to the default tasks folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution should start up in offline mode"
-msgstr ""
+msgstr "Whether Evolution should start up in offline mode"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether to show the folder bar"
-msgstr ""
+msgstr "Whether to show the folder bar"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether to show the shortcut bar"
-msgstr ""
+msgstr "Whether to show the shortcut bar"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether to skip the development warning dialog"
-msgstr ""
+msgstr "Whether to skip the development warning dialogue"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:24
-#, fuzzy
 msgid "mail"
-msgstr "Colours"
+msgstr "mail"
 
 #: shell/e-shell-about-box.c:45
 msgid "Brought to you by"
-msgstr ""
+msgstr "Brought to you by"
 
 #: shell/e-shell-config-autocompletion.c:110
-#, fuzzy
 msgid "Extra Completion folders"
-msgstr "Synchronising \"%s\""
+msgstr "Extra Completion folders"
 
 #: shell/e-shell-config-default-folders.c:149
-#, fuzzy
 msgid "Select Default Folder"
-msgstr "Synchronising \"%s\""
+msgstr "Select Default Folder"
 
 #: shell/e-shell-config-folder-settings.c:70
-#, fuzzy
 msgid "Default Folders"
-msgstr "Synchronising \"%s\""
+msgstr "Default Folders"
 
 #: shell/e-shell-config-folder-settings.c:73
-#, fuzzy
 msgid "Offline Folders"
-msgstr "Synchronising \"%s\""
+msgstr "Offline Folders"
 
 #: shell/e-shell-config-folder-settings.c:76
-#, fuzzy
 msgid "Autocompletion Folders"
-msgstr "Synchronising \"%s\""
+msgstr "Autocompletion Folders"
 
 #: shell/e-shell-folder-creation-dialog.c:137
 #, c-format
@@ -15172,19 +15511,21 @@ msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
+"Cannot create the specified folder:\n"
+"%s"
 
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
-msgstr ""
+msgstr "The specified folder name is not valid: %s"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
-msgstr ""
+msgstr "(Untitled)"
 
 #: shell/e-shell-importer.c:145
 msgid "Choose the type of importer to run:"
-msgstr ""
+msgstr "Choose the type of importer to run:"
 
 #: shell/e-shell-importer.c:148
 msgid ""
@@ -15194,14 +15535,19 @@ msgid ""
 "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"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 
 #: shell/e-shell-importer.c:154
 msgid "Choose the destination for this import"
-msgstr ""
+msgstr "Choose the destination for this import"
 
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
 msgid "Please select the information that you would like to import:"
-msgstr ""
+msgstr "Please select the information that you would like to import:"
 
 #: shell/e-shell-importer.c:160
 msgid ""
@@ -15210,6 +15556,10 @@ msgid ""
 "that could be imported where found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 msgstr ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"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:228 shell/e-shell-importer.c:259
 #, c-format
@@ -15217,137 +15567,138 @@ msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
+"Importing %s\n"
+"Importing item %d."
 
 #: shell/e-shell-importer.c:332
-#, fuzzy
 msgid "Select importer"
-msgstr "Synchronising \"%s\""
+msgstr "Select importer"
 
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
 #, c-format
 msgid "File %s does not exist"
-msgstr ""
+msgstr "File %s does not exist"
 
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
 msgid "Importing"
-msgstr ""
+msgstr "Importing"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
 #, c-format
 msgid "Importing %s.\n"
-msgstr ""
+msgstr "Importing %s.\n"
 
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
 #, c-format
 msgid "Error loading %s"
-msgstr ""
+msgstr "Error loading %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
+"Importing %s\n"
+"Importing item 1."
 
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
 msgid "Automatic"
-msgstr ""
+msgstr "Automatic"
 
-#: shell/e-shell-importer.c:593
-#, fuzzy
+#: shell/e-shell-importer.c:595
 msgid "_Filename:"
-msgstr "Synchronising \"%s\""
+msgstr "_Filename:"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
 msgid "Select a file"
-msgstr ""
+msgstr "Select a file"
 
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
 msgid "File _type:"
-msgstr ""
+msgstr "File _type:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
 msgid "Import data and settings from _older programs"
-msgstr ""
+msgstr "Import data and settings from _older programs"
 
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
 msgid "Import a _single file"
-msgstr ""
+msgstr "Import a _single file"
 
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
+"Please wait...\n"
+"Scanning for existing setups"
 
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
 msgid "Starting Intelligent Importers"
-msgstr ""
+msgstr "Starting Intelligent Importers"
 
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
 #, c-format
 msgid "From %s:"
-msgstr ""
+msgstr "From %s:"
 
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
 #, c-format
 msgid "No importer available for file %s"
-msgstr ""
+msgstr "No importer available for file %s"
 
-#: shell/e-shell-importer.c:1046
-#, fuzzy
+#: shell/e-shell-importer.c:1049
 msgid "Unable to execute importer"
-msgstr "Synchronising \"%s\""
+msgstr "Unable to execute importer"
 
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
 msgid "_Import"
-msgstr ""
+msgstr "_Import"
 
 #: shell/e-shell-offline-handler.c:595
 msgid "Closing connections..."
-msgstr ""
+msgstr "Closing connections..."
 
-#: shell/e-shell-settings-dialog.c:346
-#, fuzzy
+#: shell/e-shell-settings-dialog.c:327
 msgid "Evolution Settings"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Settings"
 
 #. It would be nice to insensitivize the OK button appropriately
 #. instead of doing this, but unfortunately we can't do this for the
 #. Bonobo control.
 #: shell/e-shell-shared-folder-picker-dialog.c:281
 msgid "Please select a user."
-msgstr ""
+msgstr "Please select a user."
 
 #: shell/e-shell-shared-folder-picker-dialog.c:387
-#, fuzzy
 msgid "Opening Folder"
-msgstr "Synchronising \"%s\""
+msgstr "Opening Folder"
 
 #: shell/e-shell-shared-folder-picker-dialog.c:393
-#, fuzzy, c-format
+#, c-format
 msgid "Opening Folder \"%s\""
-msgstr "Synchronising \"%s\""
+msgstr "Opening Folder \"%s\""
 
 #: shell/e-shell-shared-folder-picker-dialog.c:398
 #, c-format
 msgid "in \"%s\" ..."
-msgstr ""
+msgstr "in \"%s\" ..."
 
 #: shell/e-shell-shared-folder-picker-dialog.c:482
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open shared folder: %s."
-msgstr "Synchronising \"%s\""
+msgstr "Could not open shared folder: %s."
 
 #: shell/e-shell-shared-folder-picker-dialog.c:535
 msgid "Cannot find the specified shared folder."
-msgstr ""
+msgstr "Cannot find the specified shared folder."
 
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
 msgid "Starting import"
-msgstr ""
+msgstr "Starting import"
 
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
 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 "
@@ -15355,79 +15706,80 @@ msgid ""
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
-
-#: shell/e-shell-startup-wizard.c:795
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Cannot initialise the Evolution shell."
+"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?"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
-msgstr ""
+msgstr "No folder name specified."
 
 #: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr ""
+msgstr "Folder name cannot contain the Return character."
 
 #: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
-msgstr ""
+msgstr "Folder name cannot contain the character \"/\"."
 
 #: shell/e-shell-utils.c:135
 msgid "Folder name cannot contain the character \"#\"."
-msgstr ""
+msgstr "Folder name cannot contain the character \"#\"."
 
 #: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
-msgstr ""
+msgstr "'.' and '..' are reserved folder names."
 
 #: shell/e-shell-window-commands.c:63
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
+msgstr "The GNOME Pilot tools do not appear to be installed on this system."
 
 #: shell/e-shell-window-commands.c:71
 #, c-format
 msgid "Error executing %s."
-msgstr ""
+msgstr "Error executing %s."
 
 #: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
-msgstr ""
+msgstr "Bug buddy is not installed."
 
 #: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
-msgstr ""
+msgstr "Bug buddy could not be run."
 
 #: shell/e-shell-window-commands.c:171
-#, fuzzy
 msgid "About Ximian Evolution"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "About Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
-msgstr ""
+msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
-msgstr ""
+msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
-msgstr ""
+msgstr "Work Offline"
 
 #: shell/e-shell-window.c:327
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 
 #: shell/e-shell-window.c:334
 msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
+msgstr "Ximian Evolution is in the process of going offline."
 
 #: shell/e-shell-window.c:340
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 
 #: shell/e-shell.c:537
 #, c-format
@@ -15436,33 +15788,35 @@ msgid ""
 "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"
 
 #: shell/e-shell.c:1063
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Invalid arguments"
 
 #: shell/e-shell.c:1065
 msgid "Cannot register on OAF"
-msgstr ""
+msgstr "Cannot register on OAF"
 
 #: shell/e-shell.c:1067
 msgid "Configuration Database not found"
-msgstr ""
+msgstr "Configuration Database not found"
 
 #: shell/e-shell.c:1069
 msgid "Generic error"
-msgstr ""
+msgstr "Generic error"
 
 #: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
 msgid "Checkbox"
-msgstr "Colours"
+msgstr "Checkbox"
 
 #: shell/e-user-creatable-items-handler.c:601
 #: shell/e-user-creatable-items-handler.c:642
 #: widgets/misc/e-charset-picker.c:109
 msgid "New"
-msgstr ""
+msgstr "New"
 
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
@@ -15471,6 +15825,9 @@ msgid ""
 "\n"
 "Unknown error."
 msgstr ""
+"%s\n"
+"\n"
+"Unknown error."
 
 #: shell/evolution-shell-component-utils.c:127
 #, c-format
@@ -15480,6 +15837,10 @@ msgid ""
 "The error from the component system is:\n"
 "%s"
 msgstr ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
 
 #: shell/evolution-shell-component-utils.c:134
 #, c-format
@@ -15489,88 +15850,86 @@ msgid ""
 "The error from the activation system is:\n"
 "%s"
 msgstr ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
 
 #: shell/evolution-test-component.c:140
-#, fuzzy
 msgid "New Test"
-msgstr "Organisation:"
+msgstr "New Test"
 
 #: shell/evolution-test-component.c:141
 msgid "_Test"
-msgstr ""
+msgstr "_Test"
 
 #: shell/evolution-test-component.c:142
-#, fuzzy
 msgid "Create a new test item"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new test item"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-#, fuzzy
-msgid "Active Connections"
-msgstr "Synchronise \"%s\""
+msgid "<b>Active Connections</b>"
+msgstr "<b>Active Connections</b>"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr ""
+msgid "Active Connections"
+msgstr "Active Connections"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr ""
+msgid "Click OK to close these connections and go offline"
+msgstr "Click OK to close these connections and go offline"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:1
-#, fuzzy
 msgid "C_alendar:"
-msgstr "Colours"
+msgstr "C_alendar:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
 msgid "_Contacts:"
-msgstr "Organisation:"
+msgstr "_Contacts:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:3
 msgid "_Mail:"
-msgstr ""
+msgstr "_Mail:"
 
 #: shell/glade/e-shell-config-default-folders.glade.h:4
 msgid "_Tasks:"
-msgstr ""
+msgstr "_Tasks:"
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
-msgstr ""
+msgstr "Folder _type:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
 msgid "Open Other User's Folder"
-msgstr ""
+msgstr "Open Other User's Folder"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
 msgid "_Account:"
-msgstr ""
+msgstr "_Account:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
 msgid "_Folder Name:"
-msgstr ""
+msgstr "_Folder Name:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
 msgid "_User:"
-msgstr ""
+msgstr "_User:"
 
 #: shell/glade/evolution-startup-wizard.glade.h:2
-#, fuzzy
 msgid "Evolution Setup Assistant"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Evolution Setup Assistant"
 
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
-msgstr ""
+msgstr "Importing Files"
 
 #: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
-msgstr ""
+msgstr "Timezone "
 
 #: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
-msgstr ""
+msgstr "Welcome"
 
 #: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
@@ -15580,6 +15939,11 @@ msgid ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
 
 #: shell/glade/evolution-startup-wizard.glade.h:11
 msgid ""
@@ -15588,37 +15952,38 @@ msgid ""
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
+msgstr "Click \"Import\" to begin importing the file into Evolution. "
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
-msgstr ""
+msgstr "Evolution Import Assistant"
 
 #: shell/importer/import.glade.h:3
 msgid "Import File"
-msgstr ""
+msgstr "Import File"
 
 #: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import Location"
-msgstr "Organisation"
+msgstr "Import Location"
 
 #: shell/importer/import.glade.h:5
 msgid "Importer Type"
-msgstr ""
+msgstr "Importer Type"
 
 #: shell/importer/import.glade.h:6
-#, fuzzy
 msgid "Select Importers"
-msgstr "Synchronising \"%s\""
+msgstr "Select Importers"
 
 #: shell/importer/import.glade.h:7
-#, fuzzy
 msgid "Select a File"
-msgstr "Synchronising \"%s\""
+msgstr "Select a File"
 
 #: shell/importer/import.glade.h:8
 msgid ""
@@ -15626,29 +15991,32 @@ msgid ""
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
-msgstr ""
+msgstr "Importers"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
-msgstr ""
+msgstr "Import"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
-msgstr ""
+msgstr "Don't import"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
-msgstr ""
+msgstr "Don't ask me again"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
-msgstr ""
+msgstr "Evolution can import data from the following files:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15667,102 +16035,125 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 
-#: shell/main.c:241
-#, fuzzy
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
-msgstr "Cannot initialise the Evolution shell."
+msgstr ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
 
-#: shell/main.c:249
+#: shell/main.c:262
 msgid "Don't tell me again"
-msgstr ""
+msgstr "Don't tell me again"
 
-#: shell/main.c:381
-#, fuzzy
+#: shell/main.c:392
 msgid "Cannot access the Ximian Evolution shell."
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Cannot access the Ximian Evolution shell."
 
-#: shell/main.c:390
-#, fuzzy, c-format
+#: shell/main.c:401
+#, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Cannot initialise the Ximian Evolution shell: %s"
 
-#: shell/main.c:487
+#: shell/main.c:498
 msgid "Start Evolution activating the specified component"
-msgstr ""
+msgstr "Start Evolution activating the specified component"
 
-#: shell/main.c:489
+#: shell/main.c:500
 msgid "Start in offline mode"
-msgstr ""
+msgstr "Start in offline mode"
 
-#: shell/main.c:491
+#: shell/main.c:502
 msgid "Start in online mode"
-msgstr ""
+msgstr "Start in online mode"
 
-#: shell/main.c:494
+#: shell/main.c:505
 msgid "Forcibly shut down all evolution components"
-msgstr ""
+msgstr "Forcibly shut down all evolution components"
 
-#: shell/main.c:498
+#: shell/main.c:509
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr ""
+msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: shell/main.c:501
+#: shell/main.c:512
 msgid "Send the debugging output of all components to a file."
-msgstr ""
+msgstr "Send the debugging output of all components to a file."
 
-#: shell/main.c:524
+#: shell/main.c:535
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
-#: shell/main.c:528
+#: shell/main.c:539
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
 
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
-#, fuzzy
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
 msgid "Select a cert to import..."
-msgstr "Synchronising \"%s\""
+msgstr "Select a cert to import..."
 
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
 msgid "Certificate Name"
-msgstr ""
+msgstr "Certificate Name"
 
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
-#, fuzzy
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 msgid "Purposes"
-msgstr "Colours"
+msgstr "Purposes"
 
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
-msgstr ""
+msgstr "Serial Number"
 
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
 msgid "Expires"
-msgstr ""
+msgstr "Expires"
 
-#: smime/gui/certificate-manager.c:408
-#, fuzzy
+#: smime/gui/certificate-manager.c:417
 msgid "E-Mail Address"
-msgstr "Synchronising \"%s\""
+msgstr "E-Mail Address"
 
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
-msgstr ""
+msgstr "Certificate Viewer: %s"
 
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
-msgstr ""
+msgstr "Enter the password for `%s'"
+
+#. we're setting the password initially
+#: smime/gui/component.c:68
+msgid "Enter new password for certificate database"
+msgstr "Enter new password for certificate database"
+
+#: smime/gui/component.c:70
+msgid "Enter new password"
+msgstr "Enter new password"
 
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
@@ -15771,6 +16162,8 @@ msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
+"Issued to:\n"
+"  Subject: %s\n"
 
 #: smime/gui/e-cert-selector.c:122
 #, c-format
@@ -15778,708 +16171,715 @@ msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
+"Issued by:\n"
+"  Subject: %s\n"
 
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
-msgstr ""
+msgstr "<Not Part of Certificate>"
 
 #: smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
-msgstr ""
+msgstr "<b>Certificate Fields</b>"
 
 #: smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b>Certificate Hierarchy</b>"
 
 #: smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
-msgstr ""
+msgstr "<b>Field Value</b>"
 
 #: smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
-msgstr ""
+msgstr "<b>Fingerprints</b>"
 
 #: smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
-msgstr ""
+msgstr "<b>Issued By</b>"
 
 #: smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
-msgstr ""
+msgstr "<b>Issued To</b>"
 
 #: smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
+msgstr "<b>This certificate has been verified for the following uses:</b>"
 
 #: smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
-msgstr ""
+msgstr "<b>Validity</b>"
 
 #: smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
-msgstr ""
+msgstr "Authorities"
 
 #: smime/gui/smime-ui.glade.h:11
 msgid "Backup"
-msgstr ""
+msgstr "Backup"
 
 #: smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
-msgstr ""
+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)."
 
 #: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
 msgid "Certificate"
-msgstr ""
+msgstr "Certificate"
 
 #: smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
-msgstr ""
+msgstr "Certificate Authority Trust"
 
 #: smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
-msgstr ""
+msgstr "Certificate details"
 
 #: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
-msgstr ""
+msgstr "Common Name (CN)"
 
 #: smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
-msgstr ""
+msgstr "Contact Certificates"
 
 #: smime/gui/smime-ui.glade.h:21
 #, no-c-format
 msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr ""
+msgstr "Do you want to trust \"%s\" for the following purposes?"
 
 #: smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
-msgstr ""
+msgstr "Dummy window only"
 
 #: smime/gui/smime-ui.glade.h:23
-#, fuzzy
 msgid "Edit"
-msgstr "Synchronising \"%s\""
+msgstr "Edit"
 
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
-msgstr ""
+msgstr "Email Recipient Certificate"
 
 #: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
-msgstr ""
+msgstr "Email Signer Certificate"
 
 #: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
-msgstr ""
+msgstr "Expires On"
 
 #: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
-msgstr ""
+msgstr "Issued On"
 
 #: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
-msgstr ""
+msgstr "MD5 Fingerprint"
 
 #: smime/gui/smime-ui.glade.h:31
-#, fuzzy
 msgid "Organization (O)"
-msgstr "Organisation"
+msgstr "Organisation (O)"
 
 #: smime/gui/smime-ui.glade.h:32
-#, fuzzy
 msgid "Organizational Unit (OU)"
-msgstr "Organisation"
+msgstr "Organisational Unit (OU)"
 
 #: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
-msgstr ""
+msgstr "SHA1 Fingerprint"
 
 #: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
 msgid "SSL Client Certificate"
-msgstr ""
+msgstr "SSL Client Certificate"
 
 #: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
 msgid "SSL Server Certificate"
-msgstr ""
+msgstr "SSL Server Certificate"
 
 #: smime/gui/smime-ui.glade.h:37
 msgid "Trust this CA to identify email users."
-msgstr ""
+msgstr "Trust this CA to identify email users."
 
 #: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify software developers."
-msgstr ""
+msgstr "Trust this CA to identify software developers."
 
 #: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify web sites."
-msgstr ""
+msgstr "Trust this CA to identify web sites."
 
 #: smime/gui/smime-ui.glade.h:40
 msgid "View"
-msgstr ""
+msgstr "View"
 
 #: smime/gui/smime-ui.glade.h:41
 msgid "View Certificate"
-msgstr ""
+msgstr "View Certificate"
 
 #: smime/gui/smime-ui.glade.h:42
 msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
+msgstr "You have been asked to trust a new Certificate Authority (CA)."
 
 #: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
+msgstr "You have certificates from these organisations that identify you:"
 
 #: smime/gui/smime-ui.glade.h:44
 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:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
+msgstr "You have certificates on file that identify these people:"
 
 #: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
-msgstr ""
+msgstr "Your Certificates"
 
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
 msgid "Certificate already exists"
-msgstr ""
+msgstr "Certificate already exists"
 
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
-msgstr "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
 #: smime/lib/e-cert.c:478
 msgid "Version"
-msgstr ""
+msgstr "Version"
 
 #: smime/lib/e-cert.c:493
 msgid "Version 1"
-msgstr ""
+msgstr "Version 1"
 
 #: smime/lib/e-cert.c:496
 msgid "Version 2"
-msgstr ""
+msgstr "Version 2"
 
 #: smime/lib/e-cert.c:499
 msgid "Version 3"
-msgstr ""
+msgstr "Version 3"
 
 #: smime/lib/e-cert.c:581
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 MD2 With RSA Encryption"
 
 #: smime/lib/e-cert.c:584
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 MD5 With RSA Encryption"
 
 #: smime/lib/e-cert.c:587
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
 #: smime/lib/e-cert.c:590
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: smime/lib/e-cert.c:593
 msgid "CN"
-msgstr ""
+msgstr "CN"
 
 #: smime/lib/e-cert.c:596
 msgid "OU"
-msgstr ""
+msgstr "OU"
 
 #: smime/lib/e-cert.c:599
 msgid "O"
-msgstr ""
+msgstr "O"
 
 #: smime/lib/e-cert.c:602
 msgid "L"
-msgstr ""
+msgstr "L"
 
 #: smime/lib/e-cert.c:605
 msgid "DN"
-msgstr ""
+msgstr "DN"
 
 #: smime/lib/e-cert.c:608
 msgid "DC"
-msgstr ""
+msgstr "DC"
 
 #: smime/lib/e-cert.c:611
 msgid "ST"
-msgstr ""
+msgstr "ST"
 
 #: smime/lib/e-cert.c:614
 msgid "PKCS #1 RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 RSA Encryption"
 
 #: smime/lib/e-cert.c:617
 msgid "Certificate Key Usage"
-msgstr ""
+msgstr "Certificate Key Usage"
 
 #: smime/lib/e-cert.c:620
 msgid "Netscape Certificate Type"
-msgstr ""
+msgstr "Netscape Certificate Type"
 
 #: smime/lib/e-cert.c:623
 msgid "Certificate Authority Key Identifier"
-msgstr ""
+msgstr "Certificate Authority Key Identifier"
 
 #: smime/lib/e-cert.c:626
 msgid "UID"
-msgstr ""
+msgstr "UID"
 
 #: smime/lib/e-cert.c:635
 #, c-format
 msgid "Object Identifier (%s)"
-msgstr ""
+msgstr "Object Identifier (%s)"
 
 #: smime/lib/e-cert.c:686
 msgid "Algorithm Identifier"
-msgstr ""
+msgstr "Algorithm Identifier"
 
 #: smime/lib/e-cert.c:694
 msgid "Algorithm Parameters"
-msgstr ""
+msgstr "Algorithm Parameters"
 
 #: smime/lib/e-cert.c:716
 msgid "Subject Public Key Info"
-msgstr ""
+msgstr "Subject Public Key Info"
 
 #: smime/lib/e-cert.c:721
 msgid "Subject Public Key Algorithm"
-msgstr ""
+msgstr "Subject Public Key Algorithm"
 
 #: smime/lib/e-cert.c:736
 msgid "Subject's Public Key"
-msgstr ""
+msgstr "Subject's Public Key"
 
 #: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
 msgid "Error: Unable to process extension"
-msgstr ""
+msgstr "Error: Unable to process extension"
 
 #: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
-msgstr ""
+msgstr "Object Signer"
 
 #: smime/lib/e-cert.c:782
 msgid "SSL Certificate Authority"
-msgstr ""
+msgstr "SSL Certificate Authority"
 
 #: smime/lib/e-cert.c:786
 msgid "Email Certificate Authority"
-msgstr ""
+msgstr "Email Certificate Authority"
 
 #: smime/lib/e-cert.c:814
-#, fuzzy
 msgid "Signing"
-msgstr "Synchronise \"%s\""
+msgstr "Signing"
 
 #: smime/lib/e-cert.c:818
 msgid "Non-repudiation"
-msgstr ""
+msgstr "Non-repudiation"
 
 #: smime/lib/e-cert.c:822
 msgid "Key Encipherment"
-msgstr ""
+msgstr "Key Encipherment"
 
 #: smime/lib/e-cert.c:826
 msgid "Data Encipherment"
-msgstr ""
+msgstr "Data Encipherment"
 
 #: smime/lib/e-cert.c:830
 msgid "Key Agreement"
-msgstr ""
+msgstr "Key Agreement"
 
 #: smime/lib/e-cert.c:834
 msgid "Certificate Signer"
-msgstr ""
+msgstr "Certificate Signer"
 
 #: smime/lib/e-cert.c:838
 msgid "CRL Signer"
-msgstr ""
+msgstr "CRL Signer"
 
 #: smime/lib/e-cert.c:886
-#, fuzzy
 msgid "Critical"
-msgstr "Organisation"
+msgstr "Critical"
 
 #: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
-msgstr ""
+msgstr "Not Critical"
 
 #: smime/lib/e-cert.c:912
 msgid "Extensions"
-msgstr ""
+msgstr "Extensions"
 
 #: smime/lib/e-cert.c:983
 #, c-format
 msgid "%s = %s"
-msgstr ""
+msgstr "%s = %s"
 
 #: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
-msgstr ""
+msgstr "Certificate Signature Algorithm"
 
 #: smime/lib/e-cert.c:1048
 msgid "Issuer"
-msgstr ""
+msgstr "Issuer"
 
 #: smime/lib/e-cert.c:1102
 msgid "Issuer Unique ID"
-msgstr ""
+msgstr "Issuer Unique ID"
 
 #: smime/lib/e-cert.c:1121
 msgid "Subject Unique ID"
-msgstr ""
+msgstr "Subject Unique ID"
 
 #: smime/lib/e-cert.c:1164
 msgid "Certificate Signature Value"
-msgstr ""
+msgstr "Certificate Signature Value"
 
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
-msgstr ""
+msgstr "PKCS12 File Password"
 
 #: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
-msgstr ""
+msgstr "Enter password for PKCS12 file:"
 
 #: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
-msgstr ""
+msgstr "Imported Certificate"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
-msgstr ""
+msgstr "An attachment to add."
 
 #: tools/evolution-launch-composer.c:325
 msgid "Content type of the attachment."
-msgstr ""
+msgstr "Content type of the attachment."
 
 #: tools/evolution-launch-composer.c:326
 msgid "The filename to display in the mail."
-msgstr ""
+msgstr "The filename to display in the mail."
 
 #: tools/evolution-launch-composer.c:327
 msgid "Description of the attachment."
-msgstr ""
+msgstr "Description of the attachment."
 
 #: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
-msgstr ""
+msgstr "Mark attachment to be shown inline by default."
 
 #: tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
-msgstr ""
+msgstr "Default subject for the message."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
 #: tools/killev.c:63
-#, fuzzy, c-format
+#, c-format
 msgid "Could not execute '%s': %s\n"
-msgstr "Synchronising \"%s\""
+msgstr "Could not execute '%s': %s\n"
 
 #: tools/killev.c:78
 #, c-format
 msgid "Shutting down %s (%s)\n"
-msgstr ""
+msgstr "Shutting down %s (%s)\n"
 
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
-msgstr ""
+msgstr "Copy Contact(s) to Another Folder..."
 
 #: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr ""
+msgstr "Copy the selection"
 
 #: ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Copy to Folder..."
-msgstr "Synchronising \"%s\""
+msgstr "Copy to Folder..."
 
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
-msgstr ""
+msgstr "Cut the selection"
 
 #: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
-msgstr ""
+msgstr "Delete selected contacts"
 
 #: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
-msgstr ""
+msgstr "Move Contact(s) to Another Folder..."
 
 #: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
-msgstr ""
+msgstr "Move to Folder..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
-msgstr ""
+msgstr "Paste the clipboard"
 
 #: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
-msgstr ""
+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:79
-#: ui/evolution-tasks.xml.h:13
+#: 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 ""
+msgstr "Print Pre_view"
 
 #: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
-msgstr ""
+msgstr "Print selected contacts"
 
 #: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
-msgstr ""
+msgstr "Save selected contacts as a VCard."
 
 #: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
-msgstr ""
+msgstr "Select All"
 
 #: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
-msgstr ""
+msgstr "Select all contacts"
 
 #: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
-msgstr ""
+msgstr "Send a mess to the selected contacts."
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
-msgstr ""
+msgstr "Send message to contact"
 
 #: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
-msgstr ""
+msgstr "Send selected contacts to another person."
 
 #: ui/evolution-addressbook.xml.h:26
 msgid "Show contact preview window"
-msgstr ""
+msgstr "Show contact preview window"
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
-msgstr ""
+msgstr "Stop Loading"
 
 #: ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
-msgstr ""
+msgstr "View the current contact"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: 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:105
+#: 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:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
-msgstr ""
+msgstr "_Actions"
 
 #: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
-msgstr ""
+msgstr "_Forward Contact..."
 
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
-msgstr ""
+msgstr "_Move to Folder..."
 
 #: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
-msgstr ""
+msgstr "_Preview Pane"
 
 #: ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard"
-msgstr ""
+msgstr "_Save as VCard"
 
 #: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
-msgstr ""
+msgstr "_Select All"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
-msgstr ""
+msgstr "_Send Message to Contact..."
 
 #: ui/evolution-calendar.xml.h:4
 msgid "Day"
-msgstr ""
+msgstr "Day"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
-msgstr ""
+msgstr "Delete All Occurrences"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
-msgstr ""
+msgstr "Delete the appointment"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
-msgstr ""
+msgstr "Delete this Occurrence"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
-msgstr ""
+msgstr "Delete this occurrence"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
-msgstr ""
+msgstr "Go To"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
-msgstr ""
+msgstr "Go back"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
-msgstr ""
+msgstr "Go forward"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr ""
+#: ui/evolution-calendar.xml.h:13
+msgid "List"
+msgstr "List"
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr ""
+msgid "Month"
+msgstr "Month"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr ""
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Next"
 
 #: ui/evolution-calendar.xml.h:17
-msgid "Month"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:19
 msgid "Previews the calendar to be printed"
-msgstr ""
+msgstr "Previews the calendar to be printed"
+
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Previous"
 
 #: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
-msgstr ""
+msgstr "Print this calendar"
 
 #: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
-msgstr ""
+msgstr "Publish Free/Busy information for this calendar"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
-msgstr ""
+msgstr "Purg_e"
 
 #: ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
-msgstr ""
+msgstr "Purge old appointments and meetings"
 
 #: ui/evolution-calendar.xml.h:25
+msgid "Select _Date"
+msgstr "Select _Date"
+
+#: ui/evolution-calendar.xml.h:27
+msgid "Select a specific date"
+msgstr "Select a specific date"
+
+#: ui/evolution-calendar.xml.h:28
+msgid "Select today"
+msgstr "Select today"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
-msgstr ""
+msgstr "Show as list"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
-msgstr ""
+msgstr "Show one day"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
-msgstr ""
+msgstr "Show one month"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
-msgstr ""
+msgstr "Show one week"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
-msgstr ""
+msgstr "Show the working week"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "Today"
+
+#: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
-msgstr ""
+msgstr "View the current appointment"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
-msgstr ""
+msgstr "Week"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
-msgstr ""
+msgstr "_Open Appointment"
 
 #: 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.xml.h:3
-#, fuzzy
 msgid "Close"
-msgstr "Colours"
+msgstr "Close"
 
 #: ui/evolution-comp-editor.xml.h:3
-#, fuzzy
 msgid "Close this item"
-msgstr "Colours"
+msgstr "Close this item"
 
 #: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
-msgstr ""
+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:11
 msgid "Main toolbar"
-msgstr ""
+msgstr "Main toolbar"
 
 #: ui/evolution-comp-editor.xml.h:7
 msgid "Preview the printed item"
-msgstr ""
+msgstr "Preview the printed item"
 
 #: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
-msgstr ""
+msgstr "Print this item"
 
 #: 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 ""
+msgstr "Save _As..."
 
 #: 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 ""
+msgstr "Save and Close"
 
 #: 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"
-msgstr ""
+msgstr "Save and _Close"
 
 #: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
-msgstr ""
+msgstr "Save the item and close the dialogue box"
 
 #: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
-msgstr ""
+msgstr "Save this item to disk"
 
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13
@@ -16488,1162 +16888,1148 @@ msgstr ""
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:27
 msgid "_File"
-msgstr ""
+msgstr "_File"
 
 #: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
 #: ui/evolution-contact-list-editor.xml.h:14
 #: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
-msgstr ""
+msgstr "_Save"
 
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
-msgstr ""
+msgstr "Copy selected text to the clipboard"
 
 #: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
-msgstr ""
+msgstr "Cu_t"
 
 #: ui/evolution-composer-entries.xml.h:3
 msgid "Cut selected text to the clipboard"
-msgstr ""
+msgstr "Cut selected text to the clipboard"
 
 #: ui/evolution-composer-entries.xml.h:4
 msgid "Paste text from the clipboard"
-msgstr ""
+msgstr "Paste text from the clipboard"
 
 #: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
-msgstr ""
+msgstr "Select _All"
 
 #: ui/evolution-composer-entries.xml.h:6
-#, fuzzy
 msgid "Select all text"
-msgstr "Synchronising \"%s\""
+msgstr "Select all text"
 
 #: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
-msgstr ""
+msgstr "Print En_velope..."
 
 #: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
-msgstr ""
+msgstr "Save the contact and close the dialogue box"
 
 #: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
-msgstr ""
+msgstr "Send _Message to Contact..."
 
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
-msgstr ""
+msgstr "Delete this list"
 
 #: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
-msgstr ""
+msgstr "Save the list and close the dialogue box"
 
 #: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
-msgstr ""
+msgstr "Se_nd list to other..."
 
 #: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
-msgstr ""
+msgstr "Send _message to list..."
 
 #: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
 msgid "_Delete..."
-msgstr "Synchronising \"%s\""
+msgstr "_Delete..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
-msgstr ""
+msgstr "Cancel Mee_ting"
 
 #: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
-msgstr ""
+msgstr "Cancel the meeting for this item"
 
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
-msgstr ""
+msgstr "Forward as i_Calendar"
 
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
-msgstr ""
+msgstr "Forward this item via email"
 
 #: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
-msgstr ""
+msgstr "Obtain the latest meeting information"
 
 #: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
-msgstr ""
+msgstr "Re_fresh Meeting"
 
 #: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
-msgstr ""
+msgstr "Schedule _Meeting"
 
 #: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
-msgstr ""
+msgstr "Schedule a meeting for this item"
 
 #: ui/evolution-executive-summary.xml.h:1
-#, fuzzy
 msgid "Customize My Evolution"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Customise My Evolution"
 
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
-msgstr ""
+msgstr "Cancel the current mail operation"
 
 #: ui/evolution-mail-global.xml.h:3
 msgid "Compose _New Message"
-msgstr ""
+msgstr "Compose _New Message"
 
 #: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
-msgstr ""
+msgstr "Create or edit rules for filtering new mail"
 
 #: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
-msgstr ""
+msgstr "Create or edit virtual folder definitions"
 
 #: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
-msgstr ""
+msgstr "Empty _Trash"
 
 #: ui/evolution-mail-global.xml.h:7
 msgid "Open a window for composing a mail message"
-msgstr ""
+msgstr "Open a window for composing a mail message"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
+msgstr "Permanently remove all deleted messages from all folders"
 
 #: ui/evolution-mail-global.xml.h:9
-#, fuzzy
 msgid "Post Ne_w Message"
-msgstr "Colours"
+msgstr "Post Ne_w Message"
 
 #: ui/evolution-mail-global.xml.h:10
 msgid "Post a message to a Public folder"
-msgstr ""
+msgstr "Post a message to a Public folder"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "S_ubscribe to Folders..."
-msgstr "Synchronising \"%s\""
+msgstr "S_ubscribe to Folders..."
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
-msgstr ""
+msgstr "Show message preview window"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
+msgstr "Subscribe or unsubscribe to folders on remote servers"
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
-msgstr ""
+msgstr "Virtual Folder _Editor..."
 
 #: ui/evolution-mail-global.xml.h:16
 msgid "_Filters..."
-msgstr ""
+msgstr "_Filters..."
 
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
-msgstr ""
+msgstr "Change the properties of this folder"
 
 #: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
-msgstr ""
+msgstr "Copy selected message(s) to the clipboard"
 
 #: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
-msgstr ""
+msgstr "Cut selected message(s) to the clipboard"
 
 #: ui/evolution-mail-list.xml.h:4
 msgid "E_xpunge"
-msgstr ""
+msgstr "E_xpunge"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
-msgstr ""
+msgstr "Hide S_elected Messages"
 
 #: ui/evolution-mail-list.xml.h:6
 msgid "Hide _Deleted Messages"
-msgstr ""
+msgstr "Hide _Deleted Messages"
 
 #: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Read Messages"
-msgstr ""
+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"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
-msgstr ""
+msgstr "Mark All as _Read"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
-msgstr ""
+msgstr "Mark all visible messages as read"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
-msgstr ""
+msgstr "Paste message(s) from the clipboard"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr ""
+msgstr "Permanently remove all deleted messages from this folder"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
-msgstr ""
+msgstr "Select _Thread"
 
 #: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
-msgstr ""
+msgstr "Select all and only the messages that are not currently selected"
 
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
+msgstr "Select all messages in the same thread as the selected message"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
-msgstr ""
+msgstr "Select all visible messages"
 
 #: ui/evolution-mail-list.xml.h:18
 msgid "Sh_ow Hidden Messages"
-msgstr ""
+msgstr "Sh_ow Hidden Messages"
 
 #: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
-msgstr ""
+msgstr "Show messages that have been temporarily hidden"
 
 #: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
-msgstr ""
+msgstr "Temporarily hide all messages that have already been read"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
-msgstr ""
+msgstr "Temporarily hide the selected messages"
 
 #: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
-msgstr ""
+msgstr "Threaded Message list"
 
 #: ui/evolution-mail-list.xml.h:25
 msgid "_Folder"
-msgstr ""
+msgstr "_Folder"
 
 #: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
-msgstr ""
+msgstr "_Invert Selection"
 
 #: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
-msgstr ""
+msgstr "_Threaded Message List"
 
 #: ui/evolution-mail-message.xml.h:1
-#, fuzzy
 msgid "A_dd Sender to Address Book"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "A_dd Sender to Address Book"
 
 #: ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
-msgstr ""
+msgstr "A_pply Filters"
 
 #: ui/evolution-mail-message.xml.h:3
-#, fuzzy
 msgid "Add Sender to Address Book"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Add Sender to Address Book"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
-msgstr ""
+msgstr "Apply filter rules to the selected messages"
 
 #: ui/evolution-mail-message.xml.h:5
 msgid "Caret _Mode"
-msgstr ""
+msgstr "Caret _Mode"
 
 #: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr ""
+msgstr "Compose a reply to all of the recipients of the selected message"
 
 #: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr ""
+msgstr "Compose a reply to the mailing list of the selected message"
 
 #: ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to the sender of the selected message"
-msgstr ""
+msgstr "Compose a reply to the sender of the selected message"
 
 #: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
-msgstr ""
+msgstr "Copy selected messages to another folder"
 
 #: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
-msgstr ""
+msgstr "Create _Virtual Folder From Message"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
-msgstr ""
+msgstr "Create a rule to filter messages from this sender"
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
-msgstr ""
+msgstr "Create a rule to filter messages to these recipients"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
+msgstr "Create a rule to filter messages to this mailing list"
 
 #: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
-msgstr ""
+msgstr "Create a rule to filter messages with this subject"
 
 #: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
-msgstr ""
+msgstr "Create a virtual folder for these recipients"
 
 #: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
-msgstr ""
+msgstr "Create a virtual folder for this mailing list"
 
 #: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
-msgstr ""
+msgstr "Create a virtual folder for this sender"
 
 #: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
-msgstr ""
+msgstr "Create a virtual folder for this subject"
 
 #: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
-msgstr ""
+msgstr "Decrease the text size"
 
 #: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
-msgstr ""
+msgstr "Display the next important message"
 
 #: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
-msgstr ""
+msgstr "Display the next message"
 
 #: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
-msgstr ""
+msgstr "Display the next unread message"
 
 #: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
-msgstr ""
+msgstr "Display the next unread thread"
 
 #: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
-msgstr ""
+msgstr "Display the previous important message"
 
 #: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
-msgstr ""
+msgstr "Display the previous message"
 
 #: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
-msgstr ""
+msgstr "Display the previous unread message"
 
 #: ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
-msgstr ""
+msgstr "F_orward As..."
 
 #: ui/evolution-mail-message.xml.h:33
-msgid "Filter on Mailing _List..."
-msgstr ""
+msgid "Filter _Junk"
+msgstr "Filter _Junk"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Filter on Se_nder..."
-msgstr ""
+msgid "Filter on Mailing _List..."
+msgstr "Filter on Mailing _List..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Filter on _Recipients..."
-msgstr ""
+msgid "Filter on Se_nder..."
+msgstr "Filter on Se_nder..."
 
 #: ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Subject..."
-msgstr ""
+msgid "Filter on _Recipients..."
+msgstr "Filter on _Recipients..."
 
 #: ui/evolution-mail-message.xml.h:37
-msgid "Flag selected message(s) for follow-up"
-msgstr ""
+msgid "Filter on _Subject..."
+msgstr "Filter on _Subject..."
 
 #: ui/evolution-mail-message.xml.h:38
-msgid "Follow _Up..."
-msgstr ""
+msgid "Filter the selected messages for junk status"
+msgstr "Filter the selected messages for junk status"
 
 #: ui/evolution-mail-message.xml.h:39
-msgid "Force images in HTML mail to be loaded"
-msgstr ""
+msgid "Flag selected message(s) for follow-up"
+msgstr "Flag selected message(s) for follow-up"
+
+#: ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
+msgstr "Follow _Up..."
 
 #: ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr "Force images in HTML mail to be loaded"
+
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
-msgstr ""
+msgstr "Forward the selected message in the body of a new message"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
-msgstr ""
+msgstr "Forward the selected message quoted like a reply"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
-msgstr ""
+msgstr "Forward the selected message to someone"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
-msgstr ""
+msgstr "Forward the selected message to someone as an attachment"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
-msgstr ""
+msgstr "Increase the text size"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
-msgstr ""
+msgstr "Load _Images"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
-msgstr ""
+msgstr "Mark as I_mportant"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
-msgstr ""
+msgstr "Mark as U_nread"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
-msgstr ""
+msgstr "Mark as Unimp_ortant"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
-msgstr ""
+msgstr "Mark the selected message(s) as having been read"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
-msgstr ""
+msgstr "Mark the selected message(s) as important"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
-msgstr ""
+msgstr "Mark the selected message(s) as junk"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
-msgstr ""
+msgstr "Mark the selected message(s) as not being junk"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
-msgstr ""
+msgstr "Mark the selected message(s) as not having been read"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
-msgstr ""
+msgstr "Mark the selected message(s) as unimportant"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
-msgstr ""
+msgstr "Mark the selected messages for deletion"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
-msgstr ""
+msgstr "Move"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr ""
+msgstr "Move selected message(s) to another folder"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
-msgstr ""
+msgstr "Next _Important Message"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
-msgstr ""
+msgstr "Next _Thread"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
-msgstr ""
+msgstr "Next _Unread Message"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
-msgstr ""
+msgstr "Not Junk"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
-msgstr ""
+msgstr "Open the selected message in a new window"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Open the selected message in the composer to re-send it"
-msgstr ""
+msgstr "Open the selected message in the composer to re-send it"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
-msgstr ""
+msgstr "Original Si_ze"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
-msgstr ""
+msgstr "P_revious Unread Message"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
-msgstr ""
+msgstr "Post a Repl_y"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
-msgstr ""
+msgstr "Post a reply to a message in a Public folder"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
-msgstr ""
+msgstr "Pr_evious Important Message"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
-msgstr ""
+msgstr "Preview the message to be printed"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
-msgstr ""
+msgstr "Print this message"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
-msgstr ""
+msgstr "Re_direct"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
-msgstr ""
+msgstr "Redirect (bounce) the selected message to someone"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
-msgstr ""
+msgstr "Reset the text to its original size"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
-msgstr ""
+msgstr "S_earch in Message..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
-msgstr ""
+msgstr "S_maller"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
-msgstr ""
+msgstr "Save the message as a text file"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
-msgstr ""
+msgstr "Search for text in the body of the displayed message"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
-msgstr ""
+msgstr "Set up the page settings for your current printer"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
-msgstr ""
+msgstr "Show Email _Source"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
-msgstr ""
+msgstr "Show Full _Headers"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr ""
+msgstr "Show a blinking cursor in the body of displayed messages"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
-msgstr ""
+msgstr "Show message in the normal style"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
-msgstr ""
+msgstr "Show message with all email headers"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
-msgstr ""
+msgstr "Show the raw email source of the message"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
-msgstr ""
+msgstr "Text Si_ze"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
-msgstr ""
+msgstr "Un-delete the selected messages"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
-msgstr ""
+msgstr "VFolder on Mailing _List..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
-msgstr ""
+msgstr "VFolder on Se_nder..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
-msgstr ""
+msgstr "VFolder on _Recipients..."
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
-msgstr ""
+msgstr "VFolder on _Subject..."
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
-msgstr ""
+msgstr "_Attached"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
-msgstr ""
+msgstr "_Copy to Folder"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
-msgstr ""
+msgstr "_Create Filter From Message"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Go To"
-msgstr ""
+msgstr "_Go To"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Inline"
-msgstr ""
+msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Larger"
-msgstr ""
+msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Message Display"
-msgstr ""
+msgstr "_Message Display"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
-msgstr ""
+msgstr "_Move to Folder"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
-msgstr ""
+msgstr "_Next Message"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Normal Display"
-msgstr ""
+msgstr "_Normal Display"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Open Message"
-msgstr ""
+msgstr "_Open Message"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
-msgstr ""
+msgstr "_Previous Message"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
-msgstr ""
+msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
 msgid "_Resend..."
-msgstr ""
+msgstr "_Resend..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
-msgstr ""
+msgstr "_Tools"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
-msgstr ""
+msgstr "_Undelete"
 
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
 msgid "Close this window"
-msgstr ""
+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.xml.h:26
-#, fuzzy
 msgid "_Close"
-msgstr "Colours"
+msgstr "_Close"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
-msgstr ""
+msgstr "Attach"
 
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
-msgstr ""
+msgstr "Attach a file"
 
 #: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
-msgstr ""
+msgstr "Close the current file"
 
 #: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
-msgstr ""
+msgstr "Delete all but signature"
 
 #: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
-msgstr ""
+msgstr "Encrypt this message with PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr ""
+msgstr "Encrypt this message with your S/MIME Encryption Cetificate"
 
 #: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
-msgstr ""
+msgstr "For_mat"
 
 #: ui/evolution-message-composer.xml.h:9
 msgid "HT_ML"
-msgstr ""
+msgstr "HT_ML"
 
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
-msgstr ""
+msgstr "Open a file"
 
 #: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
-msgstr ""
+msgstr "PGP Encrypt"
 
 #: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
-msgstr ""
+msgstr "PGP Sign"
 
 #: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
-msgstr ""
+msgstr "S/MIME Encrypt"
 
 #: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
-msgstr ""
+msgstr "S/MIME Sign"
 
 #: ui/evolution-message-composer.xml.h:16
 #: ui/evolution-signature-editor.xml.h:6
 msgid "Save"
-msgstr ""
+msgstr "Save"
 
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
-msgstr ""
+msgstr "Save As"
 
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
-msgstr ""
+msgstr "Save _Draft"
 
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
-msgstr ""
+msgstr "Save in folder..."
 
 #: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
-msgstr ""
+msgstr "Save the current file"
 
 #: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
-msgstr ""
+msgstr "Save the current file with a different name"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
-msgstr ""
+msgstr "Save the message in a specified folder"
 
 #: ui/evolution-message-composer.xml.h:24
 msgid "Send"
-msgstr ""
+msgstr "Send"
 
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
-msgstr ""
+msgstr "Send the mail in HTML format"
 
 #: ui/evolution-message-composer.xml.h:26
-#, fuzzy
 msgid "Send this message"
-msgstr "Synchronising \"%s\""
+msgstr "Send this message"
 
 #: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
-msgstr ""
+msgstr "Show / hide attachments"
 
 #: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
-msgstr ""
+msgstr "Show _attachments"
 
 #: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
-msgstr ""
+msgstr "Show attachments"
 
 #: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
-msgstr ""
+msgstr "Sign this message with your PGP key"
 
 #: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr ""
+msgstr "Sign this message with your S/MIME Signature Certificate"
 
 #: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
-msgstr ""
+msgstr "Toggles whether the BCC field is displayed"
 
 #: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
-msgstr ""
+msgstr "Toggles whether the CC field is displayed"
 
 #: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
-msgstr ""
+msgstr "Toggles whether the From chooser is displayed"
 
 #: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Post-To field is displayed"
-msgstr ""
+msgstr "Toggles whether the Post-To field is displayed"
 
 #: ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
+msgstr "Toggles whether the Reply-To field is displayed"
 
 #: ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the To field is displayed"
-msgstr ""
+msgstr "Toggles whether the To field is displayed"
 
 #: ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
-msgstr ""
+msgstr "_Attachment..."
 
 #: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
-msgstr ""
+msgstr "_Bcc Field"
 
 #: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
-msgstr ""
+msgstr "_Cc Field"
 
 #: ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
-msgstr ""
+msgstr "_Delete all"
 
 #: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
-msgstr ""
+msgstr "_From Field"
 
 #: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
-msgstr ""
+msgstr "_Insert"
 
 #: ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
-msgstr ""
+msgstr "_Open..."
 
 #: ui/evolution-message-composer.xml.h:48
 msgid "_Post-To Field"
-msgstr ""
+msgstr "_Post-To Field"
 
 #: ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
-msgstr ""
+msgstr "_Reply-To Field"
 
 #: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
-msgstr ""
+msgstr "_Security"
 
 #: ui/evolution-message-composer.xml.h:52
 msgid "_To Field"
-msgstr ""
+msgstr "_To Field"
 
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
-msgstr ""
+msgstr "H_TML"
 
 #: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
-msgstr ""
+msgstr "Save the current file and close the window"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
-msgstr ""
+msgstr "Add folder to your list of subscribed folders"
 
 #: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
-msgstr ""
+msgstr "F_older"
 
 #: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
-msgstr ""
+msgstr "Refresh List"
 
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
-msgstr ""
+msgstr "Refresh List of Folders"
 
 #: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
-msgstr ""
+msgstr "Remove folder from your list of subscribed folders"
 
 #: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
-msgstr ""
+msgstr "Subscribe"
 
 #: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Unsubscribe"
 
 #: ui/evolution-task-editor.xml.h:1
 msgid "Assign Task"
-msgstr ""
+msgstr "Assign Task"
 
 #: ui/evolution-task-editor.xml.h:2
 msgid "Assign this task to others"
-msgstr ""
+msgstr "Assign this task to others"
 
 #: ui/evolution-task-editor.xml.h:3
 msgid "Cancel Task"
-msgstr ""
+msgstr "Cancel Task"
 
 #: ui/evolution-task-editor.xml.h:4
 msgid "Cancel this task"
-msgstr ""
+msgstr "Cancel this task"
 
 #: ui/evolution-task-editor.xml.h:7
 msgid "Obtain the latest task information"
-msgstr ""
+msgstr "Obtain the latest task information"
 
 #: ui/evolution-task-editor.xml.h:8
 msgid "Re_fresh Task"
-msgstr ""
+msgstr "Re_fresh Task"
 
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
-msgstr ""
+msgstr "Copy selected task"
 
 #: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
-msgstr ""
+msgstr "Cut selected task"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
-msgstr ""
+msgstr "Delete completed tasks"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
-msgstr ""
+msgstr "Delete selected tasks"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
-msgstr ""
+msgstr "Mar_k as Complete"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
-msgstr ""
+msgstr "Mark selected tasks as complete"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
-msgstr ""
+msgstr "Paste task from the clipboard"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
-msgstr ""
+msgstr "Previews the list of tasks to be printed"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
-msgstr ""
+msgstr "Print the list of tasks"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
 msgid "View the selected task"
-msgstr ""
+msgstr "View the selected task"
 
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
 msgid "_Open Task"
-msgstr ""
+msgstr "_Open Task"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
-msgstr ""
+msgstr "About Ximian Evolution..."
 
 #: ui/evolution.xml.h:2
-#, fuzzy
 msgid "Change Evolution's settings"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Change Evolution's settings"
 
 #: ui/evolution.xml.h:5
-#, fuzzy
 msgid "Create a new window"
-msgstr "Synchronising \"%s\""
+msgstr "Create a new window"
 
 #: ui/evolution.xml.h:6
 msgid "E_xit"
-msgstr ""
+msgstr "E_xit"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
-msgstr ""
+msgstr "Exit the program"
 
 #: ui/evolution.xml.h:8
 msgid "Forget _Passwords"
-msgstr ""
+msgstr "Forget _Passwords"
 
 #: ui/evolution.xml.h:9
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
+msgstr "Forget remembered passwords so you will be prompted for them again"
 
 #: ui/evolution.xml.h:10
 msgid "Import data from other programs"
-msgstr ""
+msgstr "Import data from other programs"
 
 #: ui/evolution.xml.h:12
 msgid "Open a new window"
-msgstr ""
+msgstr "Open a new window"
 
 #: ui/evolution.xml.h:13
-#, fuzzy
 msgid "Pi_lot Settings..."
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Pi_lot Settings..."
 
 #: ui/evolution.xml.h:14
 msgid "Send / Receive"
-msgstr ""
+msgstr "Send / Receive"
 
 #: ui/evolution.xml.h:15
 msgid "Send queued items and retrieve new items"
-msgstr ""
+msgstr "Send queued items and retrieve new items"
 
 #: ui/evolution.xml.h:16
 msgid "Set up Pilot configuration"
-msgstr ""
+msgstr "Set up Pilot configuration"
 
 #: ui/evolution.xml.h:17
 msgid "Show information about Ximian Evolution"
-msgstr ""
+msgstr "Show information about Ximian Evolution"
 
 #: ui/evolution.xml.h:18
 msgid "Submit Bug Report"
-msgstr ""
+msgstr "Submit Bug Report"
 
 #: ui/evolution.xml.h:19
 msgid "Submit _Bug Report"
-msgstr ""
+msgstr "Submit _Bug Report"
 
 #: ui/evolution.xml.h:20
 msgid "Submit a bug report using Bug Buddy"
-msgstr ""
+msgstr "Submit a bug report using Bug Buddy"
 
 #: ui/evolution.xml.h:21
 msgid "Toggle whether we are working offline."
-msgstr ""
+msgstr "Toggle whether we are working offline."
 
 #: ui/evolution.xml.h:23
-#, fuzzy
 msgid "Ximian Evolution _FAQ"
-msgstr "Cannot initialise the Evolution shell."
+msgstr "Ximian Evolution _FAQ"
 
 #: ui/evolution.xml.h:24
 msgid "_About Ximian Evolution..."
-msgstr ""
+msgstr "_About Ximian Evolution..."
 
 #: ui/evolution.xml.h:28
 msgid "_Help"
-msgstr ""
+msgstr "_Help"
 
 #: ui/evolution.xml.h:29
 msgid "_Import..."
-msgstr ""
+msgstr "_Import..."
 
 #: ui/evolution.xml.h:30
 msgid "_New"
-msgstr ""
+msgstr "_New"
 
 #: ui/evolution.xml.h:31
 msgid "_Quick Reference"
-msgstr ""
+msgstr "_Quick Reference"
 
 #: ui/evolution.xml.h:32
 msgid "_Send / Receive"
-msgstr ""
+msgstr "_Send / Receive"
 
 #: ui/evolution.xml.h:36
 msgid "_Window"
-msgstr ""
+msgstr "_Window"
 
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
-msgstr ""
+msgstr "By _Company"
 
 #: views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
-msgstr ""
+msgstr "_Address Cards"
 
 #: views/addressbook/galview.xml.h:3
 msgid "_Phone List"
-msgstr ""
+msgstr "_Phone List"
 
 #: views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr ""
+msgstr "W_eek View"
 
 #: views/calendar/galview.xml.h:2
 msgid "_Day View"
-msgstr ""
+msgstr "_Day View"
 
 #: views/calendar/galview.xml.h:3
 msgid "_Month View"
-msgstr ""
+msgstr "_Month View"
 
 #: views/calendar/galview.xml.h:4
 msgid "_Work Week View"
-msgstr ""
+msgstr "_Work Week View"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
 msgid "As _Sent Folder"
-msgstr "Synchronising \"%s\""
+msgstr "As _Sent Folder"
 
 #: views/mail/galview.xml.h:2
 msgid "By S_tatus"
-msgstr ""
+msgstr "By S_tatus"
 
 #: views/mail/galview.xml.h:3
 msgid "By Se_nder"
-msgstr ""
+msgstr "By Se_nder"
 
 #: views/mail/galview.xml.h:4
 msgid "By Su_bject"
-msgstr ""
+msgstr "By Su_bject"
 
 #: views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
-msgstr ""
+msgstr "By _Follow Up Flag"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
 msgid "_Messages"
-msgstr "Colours"
+msgstr "_Messages"
 
 #: views/tasks/galview.xml.h:1
 msgid "With _Category"
-msgstr ""
+msgstr "With _Category"
 
 #: views/tasks/galview.xml.h:2
 msgid "_Tasks"
-msgstr ""
+msgstr "_Tasks"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:198
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
-msgstr ""
+msgstr "UTC"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "Select a Time Zone"
-msgstr ""
+msgstr "Select a Time Zone"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "Time Zones"
-msgstr ""
+msgstr "Time Zones"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid ""
@@ -17651,259 +18037,393 @@ msgid ""
 "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 right mouse button to zoom out."
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
 msgid "_Selection:"
-msgstr "Synchronising \"%s\""
+msgstr "_Selection:"
 
 #: widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
-msgstr ""
+msgstr "_Current View"
 
 #. bonobo displays this string so it must be in locale
 #: widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
-msgstr ""
+msgstr "Custom View"
 
 #: widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
-msgstr ""
+msgstr "Save Custom View..."
 
 #: widgets/menus/gal-view-menus.c:373
 msgid "Define Views..."
-msgstr ""
+msgstr "Define Views..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
-msgstr ""
+msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
-msgstr ""
+msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr ""
+msgstr "Now"
 
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
-msgstr ""
+msgstr "The time must be in the format: %s"
 
 #: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
+msgstr "The percent value must be between 0 and 100, inclusive"
 
 #: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
-msgstr ""
+msgstr "Baltic"
 
 #: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
-msgstr ""
+msgstr "Central European"
 
 #: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
-msgstr ""
+msgstr "Chinese"
 
 #: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
-msgstr ""
+msgstr "Cyrillic"
 
 #: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
-msgstr ""
+msgstr "Greek"
 
 #: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
-msgstr ""
+msgstr "Hebrew"
 
 #: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
-msgstr ""
+msgstr "Japanese"
 
 #: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
-msgstr ""
+msgstr "Korean"
 
 #: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
-msgstr ""
+msgstr "Turkish"
 
 #: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
 
 #: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
-msgstr ""
+msgstr "Western European"
 
 #: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
 #: widgets/misc/e-charset-picker.c:90
-#, fuzzy
 msgid "Traditional"
-msgstr "Organisation"
+msgstr "Traditional"
 
 #: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
 msgid "Simplified"
-msgstr ""
+msgstr "Simplified"
 
 #: widgets/misc/e-charset-picker.c:97
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ukrainian"
 
 #: widgets/misc/e-charset-picker.c:100
 msgid "Visual"
-msgstr ""
+msgstr "Visual"
 
 #: widgets/misc/e-charset-picker.c:168
 #, c-format
 msgid "Unknown character set: %s"
-msgstr ""
+msgstr "Unknown character set: %s"
 
 #: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
 msgid "Character Encoding"
-msgstr ""
+msgstr "Character Encoding"
 
 #: widgets/misc/e-charset-picker.c:222
 msgid "Enter the character set to use"
-msgstr ""
+msgstr "Enter the character set to use"
 
 #: widgets/misc/e-charset-picker.c:318
 msgid "Other..."
-msgstr ""
+msgstr "Other..."
 
 #: widgets/misc/e-clipped-label.c:111
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
-msgstr ""
+msgstr "Expanded"
 
 #: widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
-msgstr ""
+msgstr "Whether or not the expander is expanded"
 
 #: widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
-msgstr ""
+msgstr "Text of the expander's label"
 
 #: widgets/misc/e-expander.c:197
 msgid "Use underline"
-msgstr ""
+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"
 
 #: widgets/misc/e-expander.c:205
-#, fuzzy
 msgid "Spacing"
-msgstr "Synchronise \"%s\""
+msgstr "Spacing"
 
 #: widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
-msgstr ""
+msgstr "Space to put between the label and the child"
 
 #: widgets/misc/e-expander.c:215
 msgid "Label widget"
-msgstr ""
+msgstr "Label widget"
 
 #: widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
-msgstr ""
+msgstr "A widget to display in place of the usual expander label"
 
 #: widgets/misc/e-expander.c:222
 msgid "Expander Size"
-msgstr ""
+msgstr "Expander Size"
 
 #: widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
-msgstr ""
+msgstr "Size of the expander arrow"
 
 #: widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
-msgstr ""
+msgstr "Indicator Spacing"
 
 #: widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
-msgstr ""
+msgstr "Spacing around expander arrow"
 
 #: widgets/misc/e-filter-bar.c:191
+msgid "_Searches"
+msgstr "_Searches"
+
+#: widgets/misc/e-filter-bar.c:193
 msgid "Search Editor"
-msgstr ""
+msgstr "Search Editor"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
 msgid "Save Search"
-msgstr ""
+msgstr "Save Search"
 
 #: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
-msgstr ""
+msgstr "_Save Search..."
 
 #: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
-msgstr ""
+msgstr "_Edit Saved Searches..."
 
 #: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
-msgstr ""
+msgstr "_Advanced..."
 
 #: widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
-msgstr ""
+msgstr "Choose Image"
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
-msgstr ""
+msgstr "_Search"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
-msgstr ""
+msgstr "_Find Now"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
-#, fuzzy
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
-msgstr "Colours"
+msgstr "_Clear"
 
 #: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
-msgstr ""
+msgstr "Item ID"
 
 #: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
-msgstr ""
+msgstr "Subitem ID"
 
 #: widgets/misc/e-search-bar.c:851
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
 #: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
-msgstr ""
+msgstr "Find _Now"
 
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
-msgstr ""
+msgstr "%s (...)"
 
 #: widgets/misc/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
-msgstr ""
+msgstr "%s (%d%% complete)"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Address Book Sources"
+
+#~ msgid "Unexpected response from IMAP server %s: %s"
+#~ msgstr "Unexpected response from IMAP server %s: %s"
+
+#~ msgid "Cannot select folder `%s': Invalid mailbox name"
+#~ msgstr "Cannot select folder `%s': Invalid mailbox name"
+
+#~ msgid "Cannot select folder `%s': Bad command"
+#~ msgstr "Cannot select folder `%s': Bad command"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP server %s unexpectedly disconnected: %s"
+
+#~ msgid "Got BYE response"
+#~ msgstr "Got BYE response"
+
+#~ 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 ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+
+#~ msgid "%sPlease enter the IMAP password for %s on host %s"
+#~ msgstr "%sPlease enter the IMAP password for %s on host %s"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Cannot authenticate to IMAP server %s using %s"
+
+#~ msgid "Cannot create folder `%s': Invalid mailbox name"
+#~ msgstr "Cannot create folder `%s': Invalid mailbox name"
+
+#~ msgid "Cannot create folder `%s': Bad command"
+#~ msgstr "Cannot create folder `%s': Bad command"
+
+#~ msgid "Cannot delete folder `%s': Special folder"
+#~ msgstr "Cannot delete folder `%s': Special folder"
+
+#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
+#~ msgstr "Cannot delete folder `%s': Invalid mailbox name"
+
+#~ msgid "Cannot delete folder `%s': Bad command"
+#~ msgstr "Cannot delete folder `%s': Bad command"
+
+#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+#~ msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
+
+#~ msgid "Cannot subscribe to folder `%s': Bad command"
+#~ msgstr "Cannot subscribe to folder `%s': Bad command"
+
+#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+#~ msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+
+#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
+#~ msgstr "Cannot unsubscribe from folder `%s': Bad command"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Unexpected token in response from IMAP server %s: "
+
+#~ msgid "No data"
+#~ msgstr "No data"
+
+#~ 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 "The following connections are currently active:"
+#~ msgstr "The following connections are currently active:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Search for Contacts"
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "Organisation:"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "Organisation:"
+
+#, fuzzy
+#~ msgid "List View"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "LDAP Server Name:"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Search base:"
+#~ msgstr "Organisation:"
+
+#, 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 ""
@@ -17956,10 +18476,6 @@ msgstr ""
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Move to folder..."
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
 #~ msgid "Work Address"
 #~ msgstr "Colours"
 
@@ -18008,10 +18524,6 @@ msgstr ""
 #~ msgstr "Organisation:"
 
 #, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
 #~ msgid "Could not create cache for new calendar"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -18146,10 +18658,6 @@ msgstr ""
 #~ msgstr "Organisation:"
 
 #, fuzzy
-#~ msgid "Card"
-#~ msgstr "Colours"
-
-#, fuzzy
 #~ msgid "Public Calendar"
 #~ msgstr "Colours"
 
@@ -18190,10 +18698,6 @@ msgstr ""
 #~ msgstr "Cannot initialise Evolution's mail summary component."
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -18635,19 +19139,15 @@ msgstr ""
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
-#, fuzzy
 #~ msgid "Colors for Tasks"
 #~ msgstr "Colours for display"
 
-#, fuzzy
 #~ msgid "Organizer: "
 #~ msgstr "Organisation:"
 
-#, fuzzy
 #~ msgid "Factory for the test bonobo component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
-#, fuzzy
 #~ msgid "Factory for the test component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
@@ -18657,7 +19157,6 @@ msgstr ""
 #~ msgid "Synchronize Action"
 #~ msgstr "Synchronise Action"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
author	Gareth Owen <gowen@src.gnome.org>	2004-04-01 07:55:17 +0800
committer	Gareth Owen <gowen@src.gnome.org>	2004-04-01 07:55:17 +0800
commit	052b3979aea1184559f66cf914aa2da27a3345d3 (patch)
tree	677993523954661029f916e044aa2b1fc81ed796 /po
parent	16a061d1bf45a585189e91b82e95eabe2e0d33d6 (diff)
download	gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.gz gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.bz2 gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.lz gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.xz gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.tar.zst gsoc2013-evolution-052b3979aea1184559f66cf914aa2da27a3345d3.zip