Translation updated by David Lodge.

2006-04-21  David Lodge  <dave@cirt.net>

	* en_GB.po: Translation updated by David Lodge.

svn path=/trunk/; revision=31861

1 files changed, 1834 insertions, 2381 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index e75c4f2239..936bfaec6c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: evolution gnome-2.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2005-04-07 21:52-0400\n"
+"PO-Revision-Date: 2006-04-21 23:05-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -94,7 +94,8 @@ msgstr "New Appointment"
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:308
+#: ../calendar/gui/e-calendar-view.c:1505
 msgid "New Meeting"
 msgstr "New Meeting"
 
@@ -111,14 +112,16 @@ msgstr "Go to Date"
 msgid "a table to view and select the current time range"
 msgstr "a table to view and select the current time range"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146
+#: ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "It has %d event."
 msgstr[1] "It has %d events."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148
+#: ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
 msgstr "It has no events."
 
@@ -153,7 +156,8 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
+#: ../calendar/gui/e-day-view-top-item.c:719
+#: ../calendar/gui/e-day-view.c:1510
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -185,7 +189,8 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
+#: ../calendar/gui/e-day-view-top-item.c:723
+#: ../calendar/gui/e-day-view.c:1526
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
@@ -287,9 +292,8 @@ msgid "click"
 msgstr "click"
 
 #: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
-#, fuzzy
 msgid "sort"
-msgstr "Unsort"
+msgstr "sort"
 
 #: ../a11y/widgets/ea-calendar-item.c:296
 #: ../a11y/widgets/ea-calendar-item.c:302
@@ -318,13 +322,8 @@ msgid "Popup Menu"
 msgstr "Popup Menu"
 
 #: ../addressbook/addressbook.error.xml.h:1
-#, fuzzy
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"A contact already exists with this address.  Would you like to add a new "
-"card with the same address anyway?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgstr "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
 
 #: ../addressbook/addressbook.error.xml.h:2
 msgid "Address '{0}' already exists."
@@ -339,14 +338,8 @@ msgid "Category editor not available."
 msgstr "Category editor not available."
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
@@ -365,9 +358,8 @@ msgid "Error loading addressbook."
 msgstr "Error loading addressbook."
 
 #: ../addressbook/addressbook.error.xml.h:10
-#, fuzzy
 msgid "Error saving {0} to {1}: {2}"
-msgstr "Error saving contacts to {0}: {1}"
+msgstr "Error saving {0} to {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid "Failed to authenticate with LDAP server."
@@ -383,29 +375,21 @@ msgstr "Server Version"
 
 #: ../addressbook/addressbook.error.xml.h:14
 #: ../calendar/calendar.error.xml.h:44
-#, fuzzy
 msgid "Some features may not work properly with your current server"
-msgstr "Some features may not work correctly with your current server version"
+msgstr "Some features may not work properly with your current server"
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "The Evolution addressbook has quit unexpectedly."
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "The image you have selected is large. Do you want to resize and store it?"
 
 #  addressbook:ldap-search-base secondary
 #: ../addressbook/addressbook.error.xml.h:17
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+msgstr "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
 
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "This address book will be removed permanently."
@@ -420,12 +404,8 @@ msgid "This addressbook server does not have any suggested search bases."
 msgstr "This addressbook server does not have any suggested search bases."
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelt or your network connection could be down."
+msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgstr "This addressbook server might be unreachable or the server name may be misspelt or your network connection could be down."
 
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "This server does not support LDAPv3 schema information."
@@ -440,45 +420,32 @@ msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
 #: ../addressbook/addressbook.error.xml.h:25
-#, fuzzy
 msgid "Unable to save {0}."
-msgstr "Unable to save contact(s)."
+msgstr "Unable to save {0}."
 
 #: ../addressbook/addressbook.error.xml.h:26
 msgid "Would you like to save your changes?"
 msgstr "Would you like to save your changes?"
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"You are attempting to move a contact from one addressbook to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
+msgid "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?"
 
 #: ../addressbook/addressbook.error.xml.h:28
 #: ../calendar/calendar.error.xml.h:59
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+msgstr "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
+msgstr "You have made modifications to this contact. Do you want to save these changes?"
 
 #: ../addressbook/addressbook.error.xml.h:30
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "Your contacts for {0} will not be available until Evolution is restarted."
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:31
+#: ../mail/em-vfolder-rule.c:494
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -531,7 +498,8 @@ msgstr "Configure autocomplete here"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1133
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:246
+#: ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -571,10 +539,14 @@ msgstr "Manage your S/MIME certificates here"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:208
+#: ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555
+#: ../calendar/gui/tasks-component.c:188
+#: ../mail/em-folder-tree-model.c:197
+#: ../mail/em-folder-tree-model.c:199
+#: ../mail/mail-component.c:292
+#: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -586,10 +558,14 @@ msgstr "On This Computer"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:216
+#: ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563
+#: ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78
+#: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Personal"
 
@@ -652,7 +628,8 @@ msgstr "Copy book content locally for offline operation"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: ../calendar/gui/dialogs/calendar-setup.c:366
 #: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:215
+#: ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
@@ -672,7 +649,8 @@ msgstr "Authentication"
 
 #: ../addressbook/gui/component/addressbook-config.c:912
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:7
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Details"
 
@@ -690,12 +668,14 @@ msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../calendar/gui/migration.c:142
+#: ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "Migrating..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../calendar/gui/migration.c:189
+#: ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
@@ -710,13 +690,11 @@ msgstr "Autocompletion Settings"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1134
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
@@ -753,9 +731,12 @@ msgstr ""
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
+#: ../calendar/gui/tasks-component.c:441
+#: ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:8
+#: ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
@@ -797,24 +778,16 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML for the list of completion URIs."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
+msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgstr "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
 msgstr "Show preview pane"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgstr "The number of characters that must be typed before Evolution will attempt to autocomplete."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -908,7 +881,8 @@ msgid "Add Address Book"
 msgstr "Add Address Book"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../mail/em-account-editor.c:302
+#: ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Always"
 
@@ -929,10 +903,8 @@ msgid "Email address"
 msgstr "Email address"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution will use this email address to authenticate you with the server."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 msgid "Find Possible Search Bases"
@@ -943,7 +915,8 @@ msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:300
+#: ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Never"
 
@@ -956,34 +929,16 @@ msgid "Search _base:"
 msgstr "Search _base:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
-msgstr ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
+msgstr "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
-msgstr ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
+msgstr "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
-msgstr ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+msgid "Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
+msgstr "Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Sub"
@@ -994,70 +949,32 @@ msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"The search base is the distinguished name (DN)  of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
+msgid "The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgstr "The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgstr "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
-"\"."
+msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+msgstr "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
+msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgstr "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
-msgstr ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
+msgstr "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
+msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgstr "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
+msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgstr "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "Using distinguished name (DN)"
@@ -1085,9 +1002,8 @@ msgid "_Find Possible Search Bases"
 msgstr "_Find Possible Search Bases"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
-#, fuzzy
 msgid "_Login method:"
-msgstr "_Log in method:"
+msgstr "_Login method:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
@@ -1126,7 +1042,8 @@ msgstr "cards"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
+#: ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:1951
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1227,8 +1144,10 @@ msgstr "Telephone"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122
+#: ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77
+#: ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "Work"
 
@@ -1360,8 +1279,10 @@ msgstr "Address"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
+#: ../widgets/table/e-cell-text.c:1768
+#: ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313
+#: ../widgets/text/e-text.c:3584
 #: ../widgets/text/e-text.c:3585
 msgid "Editable"
 msgstr "Editable"
@@ -2429,9 +2350,9 @@ msgstr "Changed"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:535
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
-#, fuzzy, c-format
+#, c-format
 msgid "Contact Editor - %s"
-msgstr "Contact Editor"
+msgstr "Contact Editor - %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
@@ -2470,31 +2391,30 @@ msgid "E-_mail:"
 msgstr "E-_mail:"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s) ?"
 msgstr ""
 "Are you sure you want\n"
-"to delete these contacts?"
+"to delete contact list (%s) ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:326
-#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr ""
 "Are you sure you want\n"
-"to delete these contacts?"
+"to delete these contact lists?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s) ?"
 msgstr ""
 "Are you sure you want\n"
-"to delete these contacts?"
+"to delete contact (%s) ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
@@ -2622,9 +2542,8 @@ msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#, fuzzy
 msgid "Insert email addresses from Address Book"
-msgstr "Insert email adresses from Adress Book"
+msgstr "Insert email addresses from Address Book"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
@@ -2742,8 +2661,10 @@ msgstr "Error getting book view"
 #: ../widgets/table/e-table-selection-model.c:311
 #: ../widgets/table/e-table.c:3344
 #: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-entry.c:1235
+#: ../widgets/text/e-entry.c:1236
+#: ../widgets/text/e-text.c:3448
+#: ../widgets/text/e-text.c:3449
 msgid "Model"
 msgstr "Model"
 
@@ -2800,7 +2721,8 @@ msgstr "Save as VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
 #: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-view.c:1528
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
@@ -2818,28 +2740,28 @@ msgid "Forward Contact"
 msgstr "Forward Contact"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:938
-#, fuzzy
 msgid "Forward Contacts"
-msgstr "Forward Contact"
+msgstr "Forward Contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "Send Message to Contact"
 msgstr "Send Message to Contact"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:940
-#, fuzzy
 msgid "Send Message to List"
-msgstr "Send Message to Contact"
+msgstr "Send Message to List"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-#, fuzzy
 msgid "Send Message to Contacts"
-msgstr "Send Message to Contact"
+msgstr "Send Message to Contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/print.c:2501
+#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Print"
 
@@ -2852,19 +2774,23 @@ msgid "Move to Address Book..."
 msgstr "Move to Address Book..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cut"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/tasks-component.c:440
+#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copy"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Paste"
 
@@ -3052,8 +2978,10 @@ msgstr "Web Site"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
+#: ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-canvas-vbox.c:97
+#: ../widgets/misc/e-reflow.c:1437
+#: ../widgets/misc/e-reflow.c:1438
 #: ../widgets/table/e-table-click-to-add.c:517
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:667
@@ -3061,23 +2989,29 @@ msgstr "Web Site"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3013
+#: ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3627
 msgid "Width"
 msgstr "Width"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
+#: ../widgets/misc/e-canvas-vbox.c:108
+#: ../widgets/misc/e-canvas-vbox.c:109
+#: ../widgets/misc/e-reflow.c:1445
+#: ../widgets/misc/e-reflow.c:1446
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-field-chooser-item.c:674
 #: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3019
+#: ../widgets/text/e-text.c:3634
+#: ../widgets/text/e-text.c:3635
 msgid "Height"
 msgstr "Height"
 
@@ -3283,7 +3217,8 @@ msgstr "Protocol not supported"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
+#: ../calendar/gui/e-calendar-table.c:456
+#: ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Cancelled"
 
@@ -3316,9 +3251,8 @@ msgstr "No such source"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
-#, fuzzy
 msgid "Not available in offline mode"
-msgstr "Start in offline mode"
+msgstr "Not available in offline mode"
 
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
@@ -3327,54 +3261,29 @@ msgstr "Other error"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#, fuzzy
 msgid "Invalid server version"
-msgstr "Server Version"
+msgstr "Invalid server version"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:93
-msgid ""
-"We were unable to open this addressbook. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
-msgstr ""
-"We were unable to open this addressbook. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+msgid "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
+msgstr "We were unable to open this addressbook. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the addressbook once in online mode to download its contents"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy, c-format
-msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
-"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."
+#, c-format
+msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
+msgstr "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
+msgstr "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:115
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
+msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
+msgstr "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:122
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
+msgstr "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid ""
@@ -3471,11 +3380,10 @@ msgstr "Overwrite"
 #.
 #: ../addressbook/gui/widgets/eab-gui-util.c:368
 #: ../addressbook/gui/widgets/eab-gui-util.c:371
-#, fuzzy
 msgid "contact"
 msgid_plural "contacts"
-msgstr[0] "Contact"
-msgstr[1] "Contact"
+msgstr[0] "contact"
+msgstr[1] "contacts"
 
 #. This is a filename. Translators take note.
 #: ../addressbook/gui/widgets/eab-gui-util.c:418
@@ -3581,8 +3489,8 @@ msgstr "GTK Tree View"
 #: ../addressbook/importers/evolution-ldif-importer.c:486
 #: ../addressbook/importers/evolution-vcard-importer.c:249
 #: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:643
+#: ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "Importing..."
 
@@ -3856,20 +3764,16 @@ msgid "Export in asynchronous mode"
 msgstr "Export in asynchronous mode"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
-msgstr ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgstr "The number of cards in one output file in asychronous mode, default size 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Command line arguments error, please use --help option to see the usage."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
@@ -3900,79 +3804,48 @@ msgid "No filename provided."
 msgstr "No filename provided."
 
 #: ../calendar/calendar.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
+msgid " There are few attachments getting downloaded. Saving the appointment will cause the appointment to be saved without those pending attachments "
+msgstr " There are a few attachments getting downloaded. Saving the appointment will cause the appointment to be saved without those pending attachments "
 
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
+msgid " There are few attachments getting downloaded. Saving the task will cause the task to be saved without those pending attachments "
+msgstr " There are a few attachments getting downloaded. Saving the task will cause the task to be saved without those pending attachments "
 
 #: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+msgid "Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about."
+msgstr "Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your task is about."
+msgid "Adding a meaningful Summary to your task will give your recipients an idea of what your task is about."
+msgstr "Adding a meaningful Summary to your task will give your recipients an idea of what your task is about."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
+msgid "All information in these journal entries will be deleted and can not be restored."
+msgstr "All information in these journal entries will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
+msgstr "All information in this journal will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
+msgstr "All information on these appointments will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"All information on these tasks will be deleted and can not be restored."
+msgstr "All information on these tasks will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "All information on this appointment will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:10
-msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
+msgid "All information on this journal entry will be deleted and can not be restored."
+msgstr "All information on this journal entry will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
+msgstr "All information on this meeting will be deleted and can not be restored."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid "All information on this task will be deleted and can not be restored."
@@ -4043,31 +3916,24 @@ msgid "Don't Send"
 msgstr "Don't Send"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Are you sure you want to delete this appointment?"
+msgstr "Download in progress. Do you want to save the appointment?"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
-msgstr ""
+msgstr "Download in progress. Do you want to save the task?"
 
 #: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "Editor could not be loaded."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
-msgstr ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+msgid "Email invitations will be sent to all participants and allow them to RSVP."
+msgstr "Email invitations will be sent to all participants and allow them to RSVP."
 
 #: ../calendar/calendar.error.xml.h:33
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgstr "Email invitations will be sent to all participants and allow them to accept this task."
 
 #: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
@@ -4078,28 +3944,16 @@ msgid "Error loading task list"
 msgstr "Error loading task list"
 
 #: ../calendar/calendar.error.xml.h:36
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+msgid "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
+msgstr "If you don't send a cancellation notice, the other participants may not know the journal has been deleted."
 
 #: ../calendar/calendar.error.xml.h:37
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is cancelled."
+msgid "If you don't send a cancellation notice, the other participants may not know the meeting is canceled."
+msgstr "If you don't send a cancellation notice, the other participants may not know the meeting is cancelled."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+msgid "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
+msgstr "If you don't send a cancellation notice, the other participants may not know the task has been deleted."
 
 #: ../calendar/calendar.error.xml.h:39
 msgid "Save Changes"
@@ -4115,20 +3969,12 @@ msgid "Send Notice"
 msgstr "Send Notice"
 
 #: ../calendar/calendar.error.xml.h:42
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgstr "Sending updated information allows other participants to keep their calendars up to date."
 
 #: ../calendar/calendar.error.xml.h:43
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgstr "Sending updated information allows other participants to keep their task lists up to date."
 
 #: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
@@ -4210,7 +4056,8 @@ msgid "_Save"
 msgstr "_Save"
 
 #: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
+#: ../composer/mail-composer.error.xml.h:31
+#: ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Send"
 
@@ -4218,7 +4065,8 @@ msgstr "_Send"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
+#: ../calendar/common/authentication.c:49
+#: ../calendar/gui/e-pub-utils.c:301
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Enter password"
@@ -4286,9 +4134,11 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution's Tasks component"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
+#: ../calendar/gui/e-tasks.c:1257
+#: ../calendar/gui/print.c:1822
 #: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-component.c:1006
+#: ../calendar/gui/tasks-control.c:457
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
@@ -4317,9 +4167,8 @@ msgstr[0] "minute"
 msgstr[1] "minutes"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
-#, fuzzy
 msgid "Start time"
-msgstr "Start time:"
+msgstr "Start time"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
@@ -4327,12 +4176,13 @@ msgid ""
 "<big><b>%s</b></big>\n"
 "%s until %s"
 msgstr ""
+"<big><b>%s</b></big>\n"
+"%s until %s"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-#, fuzzy
 msgid "Appointments"
-msgstr "Appointment"
+msgstr "Appointments"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
@@ -4348,14 +4198,17 @@ msgstr "Snooze _time:"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../filter/filter.glade.h:11
+#: ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:34
+#: ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-subscribe.xml.h:10
+#: ../ui/evolution-tasks.xml.h:23
 #: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "_Edit"
@@ -4369,9 +4222,8 @@ msgid "description of appointment"
 msgstr "description of appointment"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#, fuzzy
 msgid "location of appointment"
-msgstr "description of appointment"
+msgstr "location of appointment"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:954
 msgid "Dismiss"
@@ -4427,15 +4279,13 @@ msgstr ""
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1205
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -4478,13 +4328,12 @@ msgid "Calendars to run alarms for"
 msgstr "Calendars to run alarms for"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr ""
+msgstr "Colour to draw the Marcus Bains line in the Day View."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Compress weekends in month view"
@@ -4543,11 +4392,8 @@ msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-#, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
-"minutes."
+msgstr "Intervals shown in Day and Work Week views, in minutes."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
@@ -4559,20 +4405,19 @@ msgstr "List of server urls for free/busy publishing."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
-msgstr ""
+msgstr "Marcus Bains Line"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
-msgstr ""
+msgstr "Marcus Bains Line Colour - Day View"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
-msgstr ""
+msgstr "Marcus Bains Line Colour - Time bar"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-#, fuzzy
 msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minute the workday ends on, 0 to 59"
+msgstr "Minute the workday ends on, 0 to 59."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
@@ -4599,45 +4444,24 @@ msgid "Overdue tasks color"
 msgstr "Overdue tasks colour"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
-#, fuzzy
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"Position of the vertical pane, between task list and the task preview pane, "
-"in pixels."
+msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
+msgstr "Position of the vertical pane, between the task list and the task preview pane, in pixels."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
@@ -4664,26 +4488,17 @@ msgid "Tasks vertical pane position"
 msgstr "Tasks vertical pane position"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
-msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+msgid "The url template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "The url template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-#, fuzzy
 msgid "Time divisions"
-msgstr "_Time divisions:"
+msgstr "Time divisions"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
@@ -4702,10 +4517,8 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
@@ -4728,21 +4541,16 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Whether to ask for confirmation when expunging appointments and tasks."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgstr "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Whether to display the end time of events in the week and month views."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Whether to hide completed tasks in the tasks view."
@@ -4753,10 +4561,8 @@ msgid "Whether to set a default reminder for appointments."
 msgstr "Whether to set a default reminder for appointments."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Whether to show times in twenty four hour format instead of using am/pm."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to show week numbers in the date navigator."
@@ -4813,14 +4619,8 @@ msgid "Calendar"
 msgstr "Calendar"
 
 #: ../calendar/gui/calendar-commands.c:354
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 
 #: ../calendar/gui/calendar-commands.c:360
 msgid "Purge events older than"
@@ -4829,7 +4629,8 @@ msgstr "Purge events older than"
 #: ../calendar/gui/calendar-commands.c:365
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:265
 #: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
@@ -4838,12 +4639,15 @@ msgstr "days"
 #. Create the On the web source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234
+#: ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582
+#: ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "On The Web"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:252
+#: ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
@@ -4951,7 +4755,8 @@ msgstr "Method not supported when opening the calendar"
 msgid "Permission denied to open the calendar"
 msgstr "Permission denied to open the calendar"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:444
+#: ../shell/e-shell.c:1267
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -5050,7 +4855,8 @@ msgstr "hour(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
+#: ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgstr "hours"
@@ -5099,8 +4905,10 @@ msgstr "%.0fG"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
 #: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
+#: ../composer/e-msg-composer-attachment-bar.c:307
+#: ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481
+#: ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "attachment"
 
@@ -5118,7 +4926,8 @@ msgstr "_Remove"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
 #: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
+#: ../composer/e-msg-composer.c:3401
+#: ../mail/em-folder-tree.c:2047
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Properties"
@@ -5159,8 +4968,10 @@ msgstr "Attach file(s)"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
+#: ../widgets/misc/e-attachment.c:221
+#: ../widgets/misc/e-attachment.c:237
+#: ../widgets/misc/e-attachment.c:425
+#: ../widgets/misc/e-attachment.c:441
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Cannot attach file %s: %s"
@@ -5169,7 +4980,8 @@ msgstr "Cannot attach file %s: %s"
 #: ../calendar/gui/dialogs/cal-attachment.c:327
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
+#: ../widgets/misc/e-attachment.c:229
+#: ../widgets/misc/e-attachment.c:433
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Cannot attach file %s: not a regular file"
@@ -5185,7 +4997,8 @@ msgstr "Attachment Properties"
 #: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Description:"
 
@@ -5203,7 +5016,8 @@ msgstr "MIME type:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
+#: ../mail/em-account-prefs.c:504
+#: ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Enabled"
@@ -5223,7 +5037,8 @@ msgstr "Don't Remove"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
+#: ../mail/em-account-prefs.c:330
+#: ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "Disable"
@@ -5231,7 +5046,8 @@ msgstr "Disable"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
+#: ../mail/em-account-prefs.c:330
+#: ../mail/em-account-prefs.c:375
 #: ../mail/em-account-prefs.c:408
 msgid "Enable"
 msgstr "Enable"
@@ -5286,10 +5102,8 @@ msgstr "<b>Work Week</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar and Tasks Settings"
@@ -5495,9 +5309,8 @@ msgid "Copy calendar contents locally for offline operation"
 msgstr "Copy calendar contents locally for offline operation"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:290
-#, fuzzy
 msgid "Copy task list contents locally for offline operation"
-msgstr "Copy book content locally for offline operation"
+msgstr "Copy task list contents locally for offline operation"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
@@ -5549,7 +5362,8 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../filter/filter.glade.h:21
+#: ../plugins/calendar-http/calendar-http.c:266
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "weeks"
@@ -5603,34 +5417,41 @@ msgstr "%s  You have made no changes, update the editor?"
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187
+#: ../calendar/gui/print.c:2261
 msgid " to "
 msgstr " to "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191
+#: ../calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr " (Completed "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193
+#: ../calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Completed "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198
+#: ../calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Due "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200
+#: ../calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:190
+#: ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "Attached message - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../calendar/gui/dialogs/comp-editor.c:365
+#: ../composer/e-msg-composer.c:2669
 #: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
@@ -5640,22 +5461,32 @@ msgstr[1] "%d attached messages"
 
 #: ../calendar/gui/dialogs/comp-editor.c:428
 #: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1708 ../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:103 ../ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-view.c:1535
+#: ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:974
+#: ../mail/em-folder-view.c:1035
+#: ../mail/message-list.c:1708
+#: ../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:103
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
+#: ../calendar/gui/dialogs/comp-editor.c:429
+#: ../composer/e-msg-composer.c:2912
+#: ../mail/em-folder-tree.c:975
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931
+#: ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Move"
 
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:431
+#: ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:977
+#: ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
@@ -5663,17 +5494,17 @@ msgstr "Cancel _Drag"
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:977
+#: ../composer/e-msg-composer.c:2318
+#, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> File Attached"
-msgstr[1] "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Attachment"
+msgstr[1] "<b>%d</b> Attachments"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1249
-#, fuzzy
 msgid "_Attachment Bar (drop attachments here)"
-msgstr "Hide _Attachment Bar (drop attachments here)"
+msgstr "_Attachment Bar (drop attachments here)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1850
 #: ../calendar/gui/dialogs/comp-editor.c:1893
@@ -5798,7 +5629,8 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+#: ../calendar/gui/dialogs/event-editor.c:141
+#: ../calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Appointment"
 
@@ -5813,14 +5645,12 @@ msgid "Scheduling"
 msgstr "Scheduling"
 
 #: ../calendar/gui/dialogs/event-editor.c:174
-#, fuzzy
 msgid "Delegatees"
-msgstr "Delegated"
+msgstr "Delegatees"
 
 #: ../calendar/gui/dialogs/event-editor.c:178
-#, fuzzy
 msgid "Attendees"
-msgstr "Attendee"
+msgstr "Attendees"
 
 #: ../calendar/gui/dialogs/event-editor.c:251
 #: ../calendar/gui/dialogs/event-editor.c:425
@@ -5934,7 +5764,8 @@ msgstr "Classi_fication:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-cal-list-view.c:254
+#: ../calendar/gui/e-cal-model.c:325
 #: ../calendar/gui/e-calendar-table.c:360
 msgid "Confidential"
 msgstr "Confidential"
@@ -5949,15 +5780,18 @@ msgstr "Locat_ion:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-cal-list-view.c:253
+#: ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:359
 msgid "Private"
 msgstr "Private"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-cal-list-view.c:252
+#: ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321
+#: ../calendar/gui/e-calendar-table.c:358
 msgid "Public"
 msgstr "Public"
 
@@ -5993,14 +5827,12 @@ msgid "_Start time:"
 msgstr "_Start time:"
 
 #: ../calendar/gui/dialogs/meeting-page.c:303
-#, fuzzy
 msgid "<b>Dele_gatees</b>"
-msgstr "<b>S_ignatures</b>"
+msgstr "<b>Dele_gatees</b>"
 
 #: ../calendar/gui/dialogs/meeting-page.c:307
-#, fuzzy
 msgid "<b>From:</b>"
-msgstr "<b>Home</b>"
+msgstr "<b>From:</b>"
 
 #. an empty string is the same as 'None'
 #. Put the "None" and "UTC" entries at the top of the combo's list.
@@ -6010,17 +5842,23 @@ msgstr "<b>Home</b>"
 #: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-itip-control.c:1106
+#: ../composer/e-msg-composer.c:2122
+#: ../filter/filter-rule.c:881
+#: ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1348
+#: ../mail/em-account-prefs.c:464
+#: ../mail/em-folder-view.c:1064
+#: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
+#: ../widgets/misc/e-cell-date-edit.c:248
+#: ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504
+#: ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "None"
 
@@ -6086,7 +5924,8 @@ msgstr "RSVP"
 #: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:394
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -6158,19 +5997,16 @@ msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "You are modifying a recurring event, what would you like to modify?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
-#, fuzzy
 msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "You are modifying a recurring event, what would you like to modify?"
+msgstr "You are delegating a recurring event, what would like to delegate?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "You are modifying a recurring task, what would you like to modify?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgstr "You are modifying a recurring journal entry, what would you like to modify?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6308,15 +6144,19 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-calendar-table.c:455
+#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/print.c:2361
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Completed"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-calendar-table.c:380
+#: ../mail/message-list.c:1008
 msgid "High"
 msgstr "High"
 
@@ -6325,19 +6165,22 @@ msgstr "High"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-calendar-table.c:454
+#: ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "In Progress"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-calendar-table.c:382
+#: ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Low"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
+#: ../calendar/gui/e-cal-model.c:919
+#: ../calendar/gui/e-calendar-table.c:381
 #: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
@@ -6346,7 +6189,8 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-calendar-table.c:453
+#: ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -6376,7 +6220,8 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:138
+#: ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Task"
 
@@ -6540,12 +6385,14 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-cal-component-preview.c:70
+#: ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-preview.c:155
+#: ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Untitled"
 
@@ -6591,7 +6438,8 @@ msgstr "Start Date"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Summary"
 
@@ -6616,15 +6464,18 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018
+#: ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1018
+#: ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6632,12 +6483,16 @@ msgid "No"
 msgstr "No"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
+#: ../calendar/gui/e-cal-model.c:327
+#: ../calendar/gui/e-cal-model.c:330
+#: ../calendar/gui/e-itip-control.c:1151
+#: ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
+#: ../calendar/gui/e-meeting-store.c:124
+#: ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:224
+#: ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
@@ -6713,7 +6568,8 @@ msgid "Updating objects"
 msgstr "Updating objects"
 
 #: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-view.c:1105
+#: ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Save as..."
 
@@ -6722,39 +6578,50 @@ msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
 #: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
+#: ../calendar/gui/e-calendar-view.c:1529
+#: ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541
+#: ../mail/em-popup.c:552
 msgid "_Save As..."
 msgstr "_Save As..."
 
 #: ../calendar/gui/e-calendar-table.c:1157
 #: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-view.c:1530
+#: ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:40
+#: ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Print..."
 
 #: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1534
+#: ../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:1163
 #: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1536
+#: ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:9
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Paste"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1167
+#: ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1168
+#: ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Forward as iCalendar"
 
@@ -6768,9 +6635,12 @@ msgstr "_Mark Selected Tasks as Complete"
 
 #. FIXME: need to disable for undeletable folders
 #: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/e-calendar-view.c:1548
+#: ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-view.c:1049
+#: ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Delete"
 msgstr "_Delete"
@@ -6789,7 +6659,8 @@ msgstr "Click to add a task"
 msgid "% Complete"
 msgstr "% Complete"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+#: ../mail/mail-send-recv.c:617
 msgid "Complete"
 msgstr "Complete"
 
@@ -6839,7 +6710,8 @@ msgstr "New Task"
 msgid "Current View"
 msgstr "Current View"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1518
+#: ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
@@ -6848,7 +6720,8 @@ msgid "_Select Date..."
 msgstr "_Select Date..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1524
+#: ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
@@ -6861,9 +6734,8 @@ msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
 #: ../calendar/gui/e-calendar-view.c:1542
-#, fuzzy
 msgid "_Delegate Meeting..."
-msgstr "_Schedule Meeting..."
+msgstr "_Delegate Meeting..."
 
 #: ../calendar/gui/e-calendar-view.c:1543
 msgid "_Schedule Meeting..."
@@ -6890,7 +6762,8 @@ msgstr "Delete _All Occurrences"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
+#: ../calendar/gui/e-cell-date-edit-text.c:115
+#: ../e-util/e-time-utils.c:180
 #: ../e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -6900,7 +6773,8 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
+#: ../calendar/gui/e-cell-date-edit-text.c:118
+#: ../e-util/e-time-utils.c:175
 #: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -6927,19 +6801,23 @@ msgstr "%02i minute divisions"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-day-view.c:1493
+#: ../calendar/gui/e-week-view-main-item.c:312
+#: ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:748
+#: ../calendar/gui/e-week-view.c:512
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:751
+#: ../calendar/gui/e-week-view.c:515
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -7021,7 +6899,8 @@ msgstr "Ends"
 msgid "Due"
 msgstr "Due"
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:951
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
@@ -7030,8 +6909,10 @@ msgstr "iCalendar Information"
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1040
+#: ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067
+#: ../calendar/gui/e-itip-control.c:1084
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7041,47 +6922,41 @@ msgstr "An unknown person"
 
 #. Describe what the user can do
 #: ../calendar/gui/e-itip-control.c:1091
-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."
+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:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:548
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/e-itip-control.c:1143
+#: ../calendar/gui/itip-utils.c:551
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
 #: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
+#: ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/itip-utils.c:554
+#: ../calendar/gui/itip-utils.c:583
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Declined"
 
 #: ../calendar/gui/e-itip-control.c:1231
-msgid ""
-"The meeting has been cancelled, however it could not be found in your "
-"calendars"
-msgstr ""
-"The meeting has been cancelled, however it could not be found in your "
-"calendars"
+msgid "The meeting has been cancelled, however it could not be found in your calendars"
+msgstr "The meeting has been cancelled, however it could not be found in your calendars"
 
 #: ../calendar/gui/e-itip-control.c:1233
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
-msgstr ""
-"The task has been cancelled, however it could not be found in your task lists"
+msgid "The task has been cancelled, however it could not be found in your task lists"
+msgstr "The task has been cancelled, however it could not be found in your task lists"
 
 #: ../calendar/gui/e-itip-control.c:1312
 #, c-format
@@ -7143,7 +7018,8 @@ msgstr "<b>%s</b> has cancelled a meeting."
 msgid "Meeting Cancellation"
 msgstr "Meeting Cancellation"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1437
 #: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
@@ -7293,11 +7169,13 @@ msgstr "Attendee status can not be updated because the item no longer exists"
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2034
+#: ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -7335,8 +7213,10 @@ msgstr "Update respondent status"
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/itip-utils.c:571
+#: ../mail/mail-send-recv.c:414
+#: ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel"
@@ -7396,69 +7276,81 @@ msgid "Resources"
 msgstr "Resources"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:99
+#: ../calendar/gui/e-meeting-store.c:116
 #: ../calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:118
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Group"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Resource"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Room"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Chair"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/e-meeting-store.c:153
 #: ../calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Required Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:209
 #: ../calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Needs Action"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:215
 #: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Tentative"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/itip-utils.c:557
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "In Process"
 
@@ -7476,8 +7368,10 @@ msgstr "%A, %d %B, %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel.c:2135
+#: ../e-util/e-time-utils.c:203
+#: ../e-util/e-time-utils.c:296
+#: ../e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7487,12 +7381,15 @@ msgstr "%a %d/%m/%Y"
 #. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:452
+#: ../e-util/e-time-utils.c:238
+#: ../e-util/e-time-utils.c:299
+#: ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Out of Office"
 
@@ -7549,7 +7446,8 @@ msgstr "Required people and _one resource"
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-tasks.c:798
+#: ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7586,7 +7484,8 @@ msgstr "Timezone Button"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:329
+#: ../calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -7595,16 +7494,19 @@ msgid "Updating query"
 msgstr "Updating query"
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../calendar/gui/gnome-cal.c:2209
+#: ../widgets/menus/gal-view-instance.c:585
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
+#: ../calendar/gui/gnome-cal.c:2210
+#: ../widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "Save Custom View"
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../calendar/gui/gnome-cal.c:2215
+#: ../widgets/menus/gal-view-instance.c:590
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Define Views..."
@@ -7684,7 +7586,8 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Select Today"
 
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:353
+#: ../calendar/gui/itip-utils.c:402
 #: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
@@ -7693,19 +7596,23 @@ msgstr "An organiser must be set."
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:510
+#: ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:512
+#: ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:514
+#: ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "Journal information"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:516
+#: ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
@@ -7740,30 +7647,27 @@ msgstr "You must be an attendee of the event."
 
 #: ../calendar/gui/migration.c:151
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
 #: ../calendar/gui/migration.c:155
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:748
+#: ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Unable to migrate old settings from evolution/config.xmldb"
 
@@ -7936,7 +7840,8 @@ msgstr "Sa"
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Selected day (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1942
+#: ../calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
@@ -7944,7 +7849,8 @@ msgstr "%a %d %b"
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
+#: ../calendar/gui/print.c:1947
+#: ../calendar/gui/print.c:1949
 #: ../calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
@@ -8003,8 +7909,10 @@ msgstr "Categories: %s"
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791
+#: ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Print Preview"
 
@@ -8023,7 +7931,8 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
+#: ../calendar/gui/tasks-component.c:517
+#: ../mail/mail-component.c:548
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8085,13 +7994,11 @@ msgstr "Create a new task list"
 
 #: ../calendar/gui/tasks-control.c:419
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 
@@ -8114,9 +8021,8 @@ msgstr "Appointments and Meetings"
 
 #: ../calendar/importers/icalendar-importer.c:336
 #: ../calendar/importers/icalendar-importer.c:586
-#, fuzzy
 msgid "Opening calendar"
-msgstr "New calendar"
+msgstr "Opening calendar"
 
 #: ../calendar/importers/icalendar-importer.c:429
 msgid "iCalendar files (.ics)"
@@ -9734,12 +9640,8 @@ msgid "_Bcc:"
 msgstr "_Bcc:"
 
 #: ../composer/e-msg-composer-hdrs.c:655
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+msgstr "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
 
 #.
 #. * Post-To
@@ -9757,25 +9659,19 @@ msgid "Post To:"
 msgstr "Post To:"
 
 #: ../composer/e-msg-composer-select-file.c:82
-#, fuzzy
 msgid "A_ttach"
-msgstr "Attach"
+msgstr "A_ttach"
 
 #: ../composer/e-msg-composer.c:738
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Cannot sign outgoing message: No signing certificate set for this account"
 
 #: ../composer/e-msg-composer.c:745
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgstr "Cannot encrypt outgoing message: No encryption certificate set for this account"
 
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
+#: ../composer/e-msg-composer.c:1224
+#: ../composer/e-msg-composer.c:1257
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Unknown reason"
@@ -9797,8 +9693,10 @@ msgstr "Untitled Message"
 msgid "Open File"
 msgstr "Open File"
 
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2006
+#: ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633
+#: ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
@@ -9806,62 +9704,45 @@ msgstr "Autogenerated"
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:2347
+#: ../composer/e-msg-composer.c:3527
 #: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "Compose a message"
 
 #: ../composer/e-msg-composer.c:3643
-#, fuzzy
 msgid "_Attachment Bar"
-msgstr "Attachment Bar"
+msgstr "_Attachment Bar"
 
 #: ../composer/e-msg-composer.c:4718
-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>"
+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>"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgstr " There are a few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "All accounts have been removed."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgstr "Are you sure you want to discard the message, titled '{0}', you are composing?"
 
 #: ../composer/mail-composer.error.xml.h:4
-#, fuzzy
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "Because \"{0}\", you may need to select different mail options."
+msgstr "Because &quot;{0}&quot;, you may need to select different mail options."
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
+#: ../composer/mail-composer.error.xml.h:5
+#: ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:17
-#, fuzzy
 msgid "Because &quot;{1}&quot;."
-msgstr "Because \"{1}\"."
+msgstr "Because &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
-msgstr ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgstr "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -9872,18 +9753,16 @@ msgid "Could not create message."
 msgstr "Could not create message."
 
 #: ../composer/mail-composer.error.xml.h:9
-#, fuzzy
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Could not read signature file \"{0}\"."
+msgstr "Could not read signature file &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Could not retrieve messages to attach from {0}."
 
 #: ../composer/mail-composer.error.xml.h:11
-#, fuzzy
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Could not save to autosave file \"{0}\"."
+msgstr "Could not save to autosave file &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
@@ -9899,20 +9778,15 @@ msgstr "Don't Recover"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
-msgstr ""
+msgstr "Download in progress. Do you want to send the mail?"
 
 #: ../composer/mail-composer.error.xml.h:16
-#, fuzzy
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "Error saving to autosave because \"{1}\"."
+msgstr "Error saving to autosave because &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgstr "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Recover"
@@ -9923,24 +9797,18 @@ msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "The file `{0}' is not a regular file and cannot be sent in a message."
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgstr "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
 
 #: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 msgstr ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
 
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
@@ -10008,12 +9876,10 @@ msgstr "<b>Status:</b>"
 
 #: ../designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
+"<small>The message specified below will be automatically sent to each person who sends\n"
 "mail to you while you are out of the office.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
@@ -10050,20 +9916,15 @@ msgstr "<b>Sending Email:</b>"
 
 #: ../designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
 msgstr ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
-#, fuzzy
 msgid "Always send back a read receipt"
-msgstr "Always send back a read reciept"
+msgstr "Always send back a read receipt"
 
 #: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
@@ -10086,12 +9947,8 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "Unless the message is sent to a mailing list, and not to me personally"
 
 #: ../designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
+msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgstr "When you receive an email with a read receipt request, what should Evolution do?"
 
 #: ../e-util/e-dialog-utils.c:267
 msgid ""
@@ -10101,15 +9958,20 @@ msgstr ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:269
+#: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
-#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:84
+#: ../e-util/e-error.c:85
+#: ../e-util/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution Error"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+#: ../e-util/e-error.c:86
+#: ../e-util/e-error.c:87
+#: ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution Warning"
 
@@ -10124,31 +9986,27 @@ msgstr "Evolution Query"
 #. setup a dummy error
 #: ../e-util/e-error.c:438
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 
 #: ../e-util/e-system.error.xml.h:2
-#, fuzzy
 msgid "Cannot open file &quot;{0}&quot;."
-msgstr "Cannot open file \"{0}\"."
+msgstr "Cannot open file &quot;{0}&quot;."
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
 msgid "Cannot save file &quot;{0}&quot;."
-msgstr "Cannot save file \"{0}\"."
+msgstr "Cannot save file &quot;{0}&quot;."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "Do you wish to overwrite it?"
 
 #: ../e-util/e-system.error.xml.h:5
-#, fuzzy
 msgid "File exists &quot;{0}&quot;."
-msgstr "File exists \"{0}\"."
+msgstr "File exists &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
+#: ../e-util/e-system.error.xml.h:7
+#: ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
@@ -10156,7 +10014,8 @@ msgstr "_Overwrite"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
+#: ../e-util/e-time-utils.c:185
+#: ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -10164,7 +10023,8 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
+#: ../e-util/e-time-utils.c:190
+#: ../e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
@@ -10216,13 +10076,15 @@ msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
+#: ../e-util/e-time-utils.c:339
+#: ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
+#: ../e-util/e-time-utils.c:343
+#: ../e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -10231,8 +10093,10 @@ msgstr "%H:%M:%S"
 #. strftime format of a time in 12-hour format,
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
+#: ../e-util/e-time-utils.c:348
+#: ../e-util/e-time-utils.c:435
+#: ../widgets/misc/e-dateedit.c:1438
+#: ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -10240,8 +10104,10 @@ msgstr "%I:%M %p"
 #. strftime format of a time in 24-hour format,
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
+#: ../e-util/e-time-utils.c:352
+#: ../e-util/e-time-utils.c:427
+#: ../widgets/misc/e-dateedit.c:1435
+#: ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10307,7 +10173,8 @@ msgstr[1] "%d years ago"
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:299
 msgid "now"
 msgstr "now"
 
@@ -10324,25 +10191,32 @@ msgstr "Select a time to compare against"
 msgid "Choose a file"
 msgstr "Choose a file"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../filter/filter-label.c:121
+#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1041
+#: ../mail/mail-config.c:76
 #: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124
+#: ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79
+#: ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "To Do"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125
+#: ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80
+#: ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "Later"
 
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -10351,9 +10225,8 @@ msgid "_Rule name:"
 msgstr "_Rule name:"
 
 #: ../filter/filter-rule.c:819
-#, fuzzy
 msgid "If"
-msgstr "I"
+msgstr "If"
 
 #: ../filter/filter-rule.c:858
 msgid "if all criteria are met"
@@ -10383,29 +10256,28 @@ msgstr "Replies and parents"
 msgid "Include threads"
 msgstr "Include threads"
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:978
+#: ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:978
+#: ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Outgoing"
 
 #: ../filter/filter.error.xml.h:1
-#, fuzzy
 msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "Bad regular expression \"{0}\"."
+msgstr "Bad regular expression &quot;{0}&quot;."
 
 #: ../filter/filter.error.xml.h:2
-#, fuzzy
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "Could not compile regular expression \"{1}\"."
+msgstr "Could not compile regular expression &quot;{1}&quot;."
 
 #: ../filter/filter.error.xml.h:3
-#, fuzzy
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "File \"{0}\" does not exist or is not a regular file."
+msgstr "File &quot;{0}&quot; does not exist or is not a regular file."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -10415,14 +10287,14 @@ msgstr "Missing date."
 msgid "Missing file name."
 msgstr "Missing file name."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "Missing name."
 
 #: ../filter/filter.error.xml.h:7
-#, fuzzy
 msgid "Name &quot;{0}&quot; already used."
-msgstr "Name \"{0}\" already used."
+msgstr "Name &quot;{0}&quot; already used."
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
@@ -10488,7 +10360,8 @@ msgstr "ago"
 msgid "months"
 msgstr "months"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../filter/filter.glade.h:18
+#: ../mail/mail-config.glade.h:177
 msgid "seconds"
 msgstr "seconds"
 
@@ -10521,10 +10394,8 @@ msgid "Composer Preferences"
 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"
+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"
@@ -10558,10 +10429,12 @@ msgstr "Evolution Mail composer configuration control"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Mail preferences control"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: ../mail/em-folder-view.c:494
 #: ../mail/importers/elm-importer.c:342
 #: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
+#: ../mail/importers/pine-importer.c:388
+#: ../mail/mail-component.c:561
 #: ../mail/mail-component.c:648
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
@@ -10598,21 +10471,23 @@ msgstr ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:464
+#: ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Select Folder"
 
 #: ../mail/em-account-editor.c:760
-#, fuzzy
 msgid "Ask for each message"
-msgstr "Attached message"
+msgstr "Ask for each message"
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1724
+#: ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identity"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1760
+#: ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "Receiving Email"
 
@@ -10620,34 +10495,41 @@ msgstr "Receiving Email"
 msgid "Automatically check for _new mail every"
 msgstr "Automatically check for _new mail every"
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2111
+#: ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Sending Email"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162
+#: ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Defaults"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2223
+#: ../mail/mail-config.glade.h:122
 #: ../plugins/exchange-operations/exchange-account-setup.c:311
 msgid "Security"
 msgstr "Security"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2260
+#: ../mail/em-account-editor.c:2334
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
+#: ../mail/em-account-editor.c:2261
+#: ../mail/em-account-editor.c:2335
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2659
+#: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2659
+#: ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
@@ -10668,7 +10550,8 @@ msgstr "Protocol"
 msgid "Mail Accounts Table"
 msgstr "Mail Accounts Table"
 
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
+#: ../mail/em-composer-prefs.c:307
+#: ../mail/em-composer-prefs.c:430
 #: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Unnamed"
@@ -10685,7 +10568,8 @@ msgstr "Add signature script"
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:853
+#: ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
@@ -10697,12 +10581,8 @@ msgstr "an unknown sender"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: ../mail/em-composer-utils.c:1695
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 
 #: ../mail/em-filter-editor.c:147
 msgid "_Filter Rules"
@@ -10833,7 +10713,8 @@ msgstr "is not"
 msgid "is not Flagged"
 msgstr "is not Flagged"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35
+#: ../mail/mail-config.glade.h:93
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
@@ -10842,7 +10723,8 @@ msgstr "Junk"
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
+#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-folder-view.c:1063
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -10883,7 +10765,8 @@ msgstr "Pipe to Program"
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47
+#: ../mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Read"
 
@@ -10915,7 +10798,8 @@ msgstr "returns less than"
 msgid "Run Program"
 msgstr "Run Program"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
@@ -10951,9 +10835,12 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-format-html.c:1572
+#: ../mail/em-format-quote.c:313
+#: ../mail/em-format.c:849
+#: ../mail/em-mailer-prefs.c:88
+#: ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1131
@@ -10970,9 +10857,8 @@ msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
 #: ../mail/em-folder-browser.c:134
-#, fuzzy
 msgid "C_reate Search Folder From Search..."
-msgstr "Create _vFolder From Search..."
+msgstr "C_reate Search Folder From Search..."
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
@@ -11004,35 +10890,42 @@ msgstr "Create"
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
-#, fuzzy
+#: ../mail/em-folder-tree-model.c:201
+#: ../mail/em-folder-tree-model.c:203
+#: ../mail/mail-vfolder.c:937
+#: ../mail/mail-vfolder.c:1007
 msgid "Search Folders"
-msgstr "Select Folder"
+msgstr "Search Folders"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:207
+#: ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:469
+#: ../mail/mail-component.c:144
 msgid "Drafts"
 msgstr "Drafts"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:472
+#: ../mail/mail-component.c:143
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:475
+#: ../mail/mail-component.c:145
 msgid "Outbox"
 msgstr "Outbox"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:477
+#: ../mail/mail-component.c:146
 msgid "Sent"
 msgstr "Sent"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:498
+#: ../mail/em-folder-tree-model.c:802
 msgid "Loading..."
 msgstr "Loading..."
 
@@ -11050,12 +10943,14 @@ msgstr "Moving folder %s"
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:858
+#: ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:860
+#: ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
@@ -11064,23 +10959,28 @@ msgstr "Copying messages into folder %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:972
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:973
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1678
+#: ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2031
+#: ../ui/evolution-addressbook.xml.h:44
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:54
+#: ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_View"
 
@@ -11101,7 +11001,8 @@ msgstr "_Move..."
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2044
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "_Rename..."
 
@@ -11110,13 +11011,16 @@ msgstr "_Rename..."
 msgid "Copying `%s' to `%s'"
 msgstr "Copying `%s' to `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931
+#: ../mail/em-folder-view.c:946
+#: ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Select folder"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:946
 msgid "C_opy"
 msgstr "C_opy"
 
@@ -11151,20 +11055,26 @@ msgstr "Create folder"
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
+#: ../mail/em-folder-view.c:1039
+#: ../mail/em-popup.c:546
+#: ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1040
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
+#: ../mail/em-folder-view.c:1041
+#: ../mail/em-popup.c:548
+#: ../mail/em-popup.c:559
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1044
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
@@ -11172,11 +11082,13 @@ msgstr "_Edit as New Message..."
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1051
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Move to Folder..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1052
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
@@ -11185,9 +11097,8 @@ msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
 #: ../mail/em-folder-view.c:1056
-#, fuzzy
 msgid "Mark as _Unread"
-msgstr "Mark as U_nread"
+msgstr "Mark as _Unread"
 
 #: ../mail/em-folder-view.c:1057
 msgid "Mark as _Important"
@@ -11222,24 +11133,20 @@ msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
 #: ../mail/em-folder-view.c:1074
-#, fuzzy
 msgid "Search Folder from _Subject"
-msgstr "vFolder on _Subject"
+msgstr "Search Folder from _Subject"
 
 #: ../mail/em-folder-view.c:1075
-#, fuzzy
 msgid "Search Folder from Se_nder"
-msgstr "vFolder on Se_nder"
+msgstr "Search Folder from Se_nder"
 
 #: ../mail/em-folder-view.c:1076
-#, fuzzy
 msgid "Search Folder from _Recipients"
-msgstr "vFolder on _Recipients"
+msgstr "Search Folder from _Recipients"
 
 #: ../mail/em-folder-view.c:1077
-#, fuzzy
 msgid "Search Folder from Mailing _List"
-msgstr "vFolder on Mailing _List"
+msgstr "Search Folder from Mailing _List"
 
 #: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
@@ -11258,7 +11165,8 @@ msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#: ../mail/em-folder-view.c:1921
+#: ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Default"
 
@@ -11269,18 +11177,16 @@ msgid "Print Message"
 msgstr "Print Message"
 
 #: ../mail/em-folder-view.c:2220
-#, fuzzy
 msgid "Unable to retrieve message"
-msgstr "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message"
 
 #: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
 #: ../mail/em-folder-view.c:2415
-#, fuzzy
 msgid "Create _Search Folder"
-msgstr "Create New Folder"
+msgstr "Create _Search Folder"
 
 #: ../mail/em-folder-view.c:2416
 msgid "_From this Address"
@@ -11301,107 +11207,79 @@ msgstr "Click to mail %s"
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Unsigned"
 
 #: ../mail/em-format-html-display.c:696
-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."
+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:697 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Valid signature"
 
 #: ../mail/em-format-html-display.c:697
-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."
+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:698 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
 #: ../mail/em-format-html-display.c:698
-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."
+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:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
 #: ../mail/em-format-html-display.c:699
-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."
+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:705 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:705
+#: ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
 #: ../mail/em-format-html-display.c:705
-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."
+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:706 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
 #: ../mail/em-format-html-display.c:706
-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."
+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:707 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Encrypted"
 
 #: ../mail/em-format-html-display.c:707
-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."
+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:708 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
 #: ../mail/em-format-html-display.c:708
-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."
+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:809 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809
+#: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
@@ -11430,57 +11308,52 @@ msgid "_Hide"
 msgstr "_Hide"
 
 #: ../mail/em-format-html-display.c:1179
-#, fuzzy
 msgid "_Fit to Width"
-msgstr "Clip Width"
+msgstr "_Fit to Width"
 
 #: ../mail/em-format-html-display.c:1180
-#, fuzzy
 msgid "Show _Original Size"
-msgstr "Original Si_ze"
+msgstr "Show _Original Size"
 
 #: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Attachment Button"
 
 #: ../mail/em-format-html-display.c:1757
-#, fuzzy
 msgid "Select folder to save all attachments..."
-msgstr "Save all attachments"
+msgstr "Select folder to save all attachments..."
 
 #: ../mail/em-format-html-display.c:1796
 msgid "Select folder to save selected attachments..."
-msgstr ""
+msgstr "Select folder to save selected attachments..."
 
 #: ../mail/em-format-html-display.c:1804
-#, fuzzy
 msgid "Save Selected..."
-msgstr "None Selected"
+msgstr "Save Selected..."
 
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:1871
-#, fuzzy, c-format
+#, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
-msgstr[0] "%s attachment"
-msgstr[1] "%s attachment"
+msgstr[0] "%d attachment"
+msgstr[1] "%d attachments"
 
 #: ../mail/em-format-html-display.c:1935
-#, fuzzy
 msgid "No Attachment"
-msgstr "Attachment"
+msgstr "No Attachment"
 
 #: ../mail/em-format-html-display.c:1938
-#, fuzzy
 msgid "Save All"
-msgstr "Save As"
+msgstr "Save All"
 
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:473
+#: ../mail/em-format-html.c:475
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Retrieving `%s'"
@@ -11522,35 +11395,47 @@ msgstr "Pointer to unknown external data (\"%s\" type)"
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844
+#: ../mail/em-mailer-prefs.c:83
+#: ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "From"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845
+#: ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846
+#: ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "To"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847
+#: ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1464
+#: ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848
+#: ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
+#: ../mail/em-format-html.c:1576
+#: ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr "Mailer"
@@ -11565,13 +11450,16 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1616
+#: ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850
+#: ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1639
+#: ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Newsgroups"
@@ -11581,11 +11469,14 @@ msgstr "Newsgroups"
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141
+#: ../mail/em-format.c:1288
+#: ../mail/em-format.c:1575
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1270
+#: ../mail/em-format.c:1426
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
@@ -11597,11 +11488,13 @@ msgstr "Unsupported encryption type for multipart/encrypted"
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1453
+#: ../mail/em-format.c:1517
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1453
+#: ../mail/em-format.c:1517
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
@@ -11623,13 +11516,11 @@ msgstr "Once per month"
 
 #: ../mail/em-migrate.c:1198
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
@@ -11663,7 +11554,8 @@ msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2561
+#: ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Failed to create local mail storage `%s': %s"
@@ -11674,12 +11566,8 @@ msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Unable to create local mail folders at `%s': %s"
 
 #: ../mail/em-migrate.c:2711
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgstr "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 
 #: ../mail/em-popup.c:399
 msgid "Save As..."
@@ -11690,15 +11578,18 @@ msgstr "Save As..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
+#: ../mail/em-popup.c:542
+#: ../mail/em-popup.c:553
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:544
+#: ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
+#: ../mail/em-popup.c:545
+#: ../mail/em-popup.c:556
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Reply to _List"
@@ -11749,7 +11640,8 @@ msgstr "Don't show this message again."
 msgid "Filters"
 msgstr "Filters"
 
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:442
+#: ../mail/em-utils.c:479
 msgid "message"
 msgstr "message"
 
@@ -11768,14 +11660,12 @@ msgid "Messages from %s"
 msgstr "Messages from %s"
 
 #: ../mail/em-vfolder-editor.c:104
-#, fuzzy
 msgid "Search _Folders"
-msgstr "Select Folder"
+msgstr "Search _Folders"
 
 #: ../mail/em-vfolder-rule.c:574
-#, fuzzy
 msgid "Search Folder source"
-msgstr "Select Folder"
+msgstr "Search Folder source"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -11882,22 +11772,12 @@ msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
 #: ../mail/evolution-mail.schemas.in.in.h:27
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgstr "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
-msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
-msgstr ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
+msgstr "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
 
 #: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
@@ -11916,24 +11796,16 @@ msgid "List of accounts"
 msgstr "List of accounts"
 
 #: ../mail/evolution-mail.schemas.in.in.h:33
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgstr "List of labels known to the mail component of Evolution. The list contains strings containing name:colour where colour uses the HTML hex encoding."
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
@@ -11948,15 +11820,8 @@ msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
 #: ../mail/evolution-mail.schemas.in.in.h:39
-#, fuzzy
-msgid ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
-"load images off the net"
-msgstr ""
-"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images if sender is in the addressbook 2 - "
-"Always load images off the net"
+msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
+msgstr "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
@@ -12027,10 +11892,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Prompt the user when he or she tries to send a message without a Subject."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
@@ -12045,12 +11908,8 @@ msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
 #: ../mail/evolution-mail.schemas.in.in.h:61
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgstr "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
@@ -12141,16 +12000,8 @@ msgid "The variable width font for mail display"
 msgstr "The variable width font for mail display"
 
 #: ../mail/evolution-mail.schemas.in.in.h:84
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
@@ -12245,12 +12096,8 @@ msgid "View/ReplyTo menu item is checked."
 msgstr "View/ReplyTo menu item is checked."
 
 #: ../mail/evolution-mail.schemas.in.in.h:108
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgstr "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 
 #: ../mail/importers/elm-importer.c:193
 msgid "Importing Elm data"
@@ -12261,9 +12108,8 @@ msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
 #: ../mail/importers/elm-importer.c:383
-#, fuzzy
 msgid "Import mail from Elm."
-msgstr "Importing mailbox"
+msgstr "Import mail from Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:82
 #: ../mail/importers/evolution-outlook-importer.c:131
@@ -12277,14 +12123,15 @@ msgstr "Select folder to import into"
 
 #: ../mail/importers/evolution-mbox-importer.c:216
 msgid "Berkeley Mailbox (mbox)"
-msgstr ""
+msgstr "Berkeley Mailbox (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:217
 msgid "Importer Berkeley Mailbox format folders"
-msgstr ""
+msgstr "Importer Berkeley Mailbox format folders"
 
 #: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/mail-importer.c:230
+#: ../shell/e-shell-importer.c:516
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
@@ -12401,16 +12248,16 @@ msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
 #: ../mail/importers/pine-importer.c:435
-#, fuzzy
 msgid "Import mail from Pine."
-msgstr "Import a _single file"
+msgstr "Import mail from Pine."
 
 #: ../mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:242
+#: ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
@@ -12506,7 +12353,8 @@ msgstr "Create a new mail folder"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "    "
@@ -12594,9 +12442,8 @@ msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Message Fonts</span>"
 
 #: ../mail/mail-config.glade.h:23
-#, fuzzy
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Message Fonts</span>"
+msgstr "<span weight=\"bold\">Message Receipts</span>"
 
 #: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
@@ -12678,7 +12525,8 @@ msgstr "Always encrypt to _myself when sending encrypted mail"
 msgid "Attach original message"
 msgstr "Attach original message"
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Attachment"
 
@@ -12855,12 +12703,8 @@ msgid "Message Composer"
 msgstr "Message Composer"
 
 #: ../mail/mail-config.glade.h:101
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgstr "Note: you will not be prompted for a password until you connect for the first time"
 
 #: ../mail/mail-config.glade.h:102
 msgid "Or_ganization:"
@@ -12883,22 +12727,12 @@ msgstr ""
 "This name will be used for display purposes only."
 
 #: ../mail/mail-config.glade.h:109
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 
 #: ../mail/mail-config.glade.h:110
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgstr "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
 
 #: ../mail/mail-config.glade.h:111
 msgid "Please select among the following options"
@@ -12957,9 +12791,8 @@ msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
 #: ../mail/mail-config.glade.h:127
-#, fuzzy
 msgid "Send message receipts:"
-msgstr "_Send message"
+msgstr "Send message receipts:"
 
 #: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
@@ -13010,12 +12843,8 @@ msgid "T_ype: "
 msgstr "T_ype: "
 
 #: ../mail/mail-config.glade.h:141
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgstr "The list of languages here reflects only the languages for which you have a dictionary installed."
 
 #: ../mail/mail-config.glade.h:142
 msgid ""
@@ -13079,7 +12908,7 @@ msgstr "_Full Name:"
 
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
-msgstr ""
+msgstr "_Load images in mail from contacts"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
@@ -13134,9 +12963,8 @@ msgid "description"
 msgstr "description"
 
 #: ../mail/mail-dialogs.glade.h:2
-#, fuzzy
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b>vFolder Sources</b>"
+msgstr "<b>Search Folder Sources</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
@@ -13150,7 +12978,8 @@ msgstr "<span weight=\"bold\">Encryption</span>"
 msgid "Case _Sensitive"
 msgstr "Case _Sensitive"
 
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
@@ -13162,7 +12991,8 @@ msgstr "F_ind:"
 msgid "Find in Message"
 msgstr "Find in Message"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/message-tag-followup.c:295
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
@@ -13187,7 +13017,8 @@ msgstr "S_erver:"
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17
+#: ../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."
@@ -13199,11 +13030,13 @@ msgstr ""
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flag:"
 
@@ -13255,7 +13088,8 @@ msgstr "Fetching Mail"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:575
+#: ../mail/mail-ops.c:604
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13279,7 +13113,8 @@ msgstr "Sending message %d of %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:760
+#: ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Cancelled."
 
@@ -13339,7 +13174,8 @@ msgstr "Storing account '%s'"
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1611
+#: ../mail/mail-ops.c:1662
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
@@ -13452,14 +13288,14 @@ msgstr "Cancel _All"
 msgid "Updating..."
 msgstr "Updating..."
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:468
 msgid "Waiting..."
 msgstr "Waiting..."
 
 #: ../mail/mail-send-recv.c:699
-#, fuzzy
 msgid "Checking for new mail"
-msgstr "Checking for New Mail"
+msgstr "Checking for new mail"
 
 #: ../mail/mail-session.c:207
 #, c-format
@@ -13512,67 +13348,53 @@ msgid "Invalid folder: `%s'"
 msgstr "Invalid folder: `%s'"
 
 #: ../mail/mail-vfolder.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "Setting up vFolder: %s"
+msgstr "Setting up Search Folder: %s"
 
 #: ../mail/mail-vfolder.c:240
-#, fuzzy, c-format
+#, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "Updating vFolders for '%s:%s'"
+msgstr "Updating Search Folders for '%s:%s'"
 
 #: ../mail/mail-vfolder.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "Updating vFolders for '%s'"
+msgstr "Updating Search Folders for '%s'"
 
 #: ../mail/mail-vfolder.c:1046
-#, fuzzy
 msgid "Edit Search Folder"
-msgstr "Select Folder"
+msgstr "Edit Search Folder"
 
 #: ../mail/mail-vfolder.c:1130
-#, fuzzy
 msgid "New Search Folder"
-msgstr "Select Folder"
+msgstr "New Search Folder"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "A folder named \"{1}\" already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr "A folder named &quot;{1}&quot; already exists. Please use a different name."
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
 msgstr ""
-"A non-empty folder at \"{1}\" already exists.\n"
+"A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
 
 #: ../mail/mail.error.xml.h:6
-msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
-msgstr ""
+msgid "A read receipt notification has been requested for &quot;{1}&quot;.  Send the reciept notification to {0}?"
+msgstr "A read receipt notification has been requested for &quot;{1}&quot;.  Send the receipt notification to {0}?"
 
 #: ../mail/mail.error.xml.h:7
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgstr "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
 
 #: ../mail/mail.error.xml.h:8
-#, fuzzy
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "Are you sure you want to delete this account?"
+msgstr "Are you sure you want to delete this account and all its proxies?"
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
@@ -13583,21 +13405,12 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Are you sure you want to open {0} messages at once?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgstr "Are you sure you want to permanently remove all the deleted messages in all folders?"
 
 #: ../mail/mail.error.xml.h:12
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
+msgstr "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
 
 #: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
@@ -13612,131 +13425,100 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Are you sure you want to send a message without a subject?"
 
 #: ../mail/mail.error.xml.h:16
-#, fuzzy
 msgid "Because &quot;{0}&quot;."
-msgstr "Because \"{0}\"."
+msgstr "Because &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:18
-#, fuzzy
 msgid "Because &quot;{2}&quot;."
-msgstr "Because \"{2}\"."
+msgstr "Because &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:19
-#, fuzzy
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Cannot add vFolder \"{0}\"."
+msgstr "Cannot add Search Folder &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:20
-#, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:21
-#, fuzzy
 msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Cannot create folder \"{0}\"."
+msgstr "Cannot create folder &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "Cannot create the save directory, because \"{1}\""
+msgstr "Cannot create the save directory, because &quot;{1}&quot;"
 
 #: ../mail/mail.error.xml.h:24
-#, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "Cannot delete folder \"{0}\"."
+msgstr "Cannot delete folder &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:25
-#, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Cannot delete system folder \"{0}\"."
+msgstr "Cannot delete system folder &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 
 #: ../mail/mail.error.xml.h:27
-#, fuzzy
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:28
-#, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
-msgstr "Cannot open source \"{1}\""
+msgstr "Cannot open source &quot;{1}&quot;"
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
-msgstr "Cannot open source \"{2}\"."
+msgstr "Cannot open source &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
-msgstr "Cannot open target \"{2}\"."
+msgstr "Cannot open target &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:31
-#, fuzzy
-msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
-"license."
-msgstr ""
-"Cannot read the licence file \"{0}\", due to an\n"
-"      installation problem.  You will not be able to use this provider "
-"until\n"
-"      you can accept its licence."
+msgid "Cannot read the license file &quot;{0}&quot;, due to an installation problem.  You will not be able to use this provider until you can accept its license."
+msgstr "Cannot read the licence file &quot;{0}&quot;, due to an installation problem. You will not be able to use this provider until you can accept its licence."
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 
 #: ../mail/mail.error.xml.h:33
-#, fuzzy
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "Cannot rename or move system folder \"{0}\"."
+msgstr "Cannot rename or move system folder &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
 #: ../mail/mail.error.xml.h:35
-#, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "Cannot save to directory \"{0}\"."
+msgstr "Cannot save to directory &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:36
-#, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "Cannot save to file \"{0}\"."
+msgstr "Cannot save to file &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:37
-#, fuzzy
 msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "Cannot set signature script \"{0}\"."
+msgstr "Cannot set signature script &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:38
-msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
 
 #: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr "Could not save signature file."
 
 #: ../mail/mail.error.xml.h:40
-#, fuzzy
 msgid "Delete &quot;{0}&quot;?"
-msgstr "Delete \"{0}\"?"
+msgstr "Delete &quot;{0}&quot;?"
 
 #: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
@@ -13748,7 +13530,7 @@ msgstr "Discard changed?"
 
 #: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
-msgstr ""
+msgstr "Do you want the operation to be performed in the subfolders?"
 
 #: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
@@ -13787,31 +13569,24 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
 
 #: ../mail/mail.error.xml.h:53
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgstr "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
 
 #: ../mail/mail.error.xml.h:54
-#, fuzzy
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
-msgstr "If you proceed, the account information will be deleted permanently."
+msgstr ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
 
 #: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "If you proceed, the account information will be deleted permanently."
 
 #: ../mail/mail.error.xml.h:57
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgstr "If you quit, these messages will not be sent until Evolution is started again."
 
 #: ../mail/mail.error.xml.h:58
 msgid "Ignore"
@@ -13826,26 +13601,16 @@ msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
 #: ../mail/mail.error.xml.h:61
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
 
 #: ../mail/mail.error.xml.h:62
-#, fuzzy
 msgid "Mark all messages as read"
-msgstr "Mark all visible messages as read"
+msgstr "Mark all messages as read"
 
 #: ../mail/mail.error.xml.h:63
-#, fuzzy
 msgid "Mark all messages as read in the selected folder"
-msgstr "_Mark messages as read after"
+msgstr "Mark all messages as read in the selected folder"
 
 #: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
@@ -13861,29 +13626,20 @@ msgstr "Opening too many messages at once may take a long time."
 
 #  mail:gw-accountsetup-error secondary
 #: ../mail/mail.error.xml.h:68
-#, fuzzy
 msgid "Please check your account settings and try again."
-msgstr ""
-"\n"
-"Please check your account settings and try again.\n"
+msgstr "Please check your account settings and try again."
 
 #: ../mail/mail.error.xml.h:69
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
+msgstr "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
 
 #: ../mail/mail.error.xml.h:70
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}\n"
 "Send anyway?"
 
@@ -13892,9 +13648,8 @@ msgid "Please wait."
 msgstr "Please wait."
 
 #: ../mail/mail.error.xml.h:74
-#, fuzzy
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "Problem migrating old mail folder \"{0}\"."
+msgstr "Problem migrating old mail folder &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:75
 msgid "Querying server"
@@ -13905,51 +13660,36 @@ msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Querying server for a list of supported authentication mechanisms."
 
 #: ../mail/mail.error.xml.h:77
-#, fuzzy
 msgid "Read receipt requested."
-msgstr "Read Receipts"
+msgstr "Read receipt requested."
 
 #: ../mail/mail.error.xml.h:78
-#, fuzzy
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 
 #: ../mail/mail.error.xml.h:79
-#, fuzzy
 msgid "Search Folders automatically updated."
-msgstr "vFolders automatically updated."
+msgstr "Search Folders automatically updated."
 
 #: ../mail/mail.error.xml.h:80
-#, fuzzy
 msgid "Send Receipt"
-msgstr "Read Receipts"
+msgstr "Send Receipt"
 
 #: ../mail/mail.error.xml.h:81
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
 
 #: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
 
 #: ../mail/mail.error.xml.h:85
-#, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13957,14 +13697,13 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"The following vFolder(s):\n"
+"The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "And have been updated."
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13975,48 +13714,36 @@ msgstr ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "And have been updated."
 
 #: ../mail/mail.error.xml.h:95
-#, fuzzy
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message was sent via the &quot;sendmail&quot; external application.  Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors and resend."
 msgstr ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message was sent via the &quot;sendmail&quot; external application.  Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors and resend."
 
 #: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "The script file must exist and be executable."
 
 #: ../mail/mail.error.xml.h:98
-#, fuzzy
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 
 #: ../mail/mail.error.xml.h:100
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
-"This message cannot be sent because you have not specified any Recipients"
+msgid "This message cannot be sent because you have not specified any Recipients"
+msgstr "This message cannot be sent because you have not specified any Recipients"
 
 #: ../mail/mail.error.xml.h:101
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+msgid "This server does not support this type of authentication and may not support authentication at all."
+msgstr "This server does not support this type of authentication and may not support authentication at all."
 
 #: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
@@ -14024,19 +13751,12 @@ msgstr "This signature has been changed, but has not been saved."
 
 #  mail:gw-accountsetup-error primary
 #: ../mail/mail.error.xml.h:103
-#, fuzzy
 msgid "Unable to connect to the GroupWise server."
-msgstr ""
-"Unable to connect to the GroupWise\n"
-"server."
+msgstr "Unable to connect to the GroupWise server."
 
 #: ../mail/mail.error.xml.h:104
-msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
-msgstr ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
+msgid "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
+msgstr "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
 
 #: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
@@ -14063,34 +13783,28 @@ msgid "You may not create two accounts with the same name."
 msgstr "You may not create two accounts with the same name."
 
 #: ../mail/mail.error.xml.h:111
-#, fuzzy
 msgid "You must name this Search Folder."
-msgstr "You must name this vFolder."
+msgstr "You must name this Search Folder."
 
 #: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
 #: ../mail/mail.error.xml.h:113
-#, fuzzy
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 
 #: ../mail/mail.error.xml.h:115
-#, fuzzy
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 
 #: ../mail/mail.error.xml.h:116
-#, fuzzy
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Your message with the subject \"{0}\" was not delivered."
+msgstr "Your message with the subject &quot;{0}&quot; was not delivered."
 
 #: ../mail/mail.error.xml.h:117
 msgid "_Append"
@@ -14148,30 +13862,36 @@ msgstr "Higher"
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1338
+#: ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1345
+#: ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1354
+#: ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1366
+#: ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1374
+#: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1376
+#: ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
@@ -14227,7 +13947,8 @@ msgstr "Follow-Up"
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Forward"
 
@@ -14235,11 +13956,13 @@ msgstr "Forward"
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:81
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply"
 msgstr "Reply"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:82
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to All"
 msgstr "Reply to All"
 
@@ -14272,14 +13995,12 @@ msgid "Subject or Sender contains"
 msgstr "Subject or Sender contains"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
-msgstr ""
+msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
+msgstr "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
-msgstr ""
+msgstr "Audio inline plugin"
 
 #: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
@@ -14314,15 +14035,13 @@ msgid "Restart Evolution"
 msgstr "Restart Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Backup and restore Evolution data and settings"
+msgstr "A plugin for backing up and restore Evolution data and settings."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#, fuzzy
 msgid "Backup and restore plugin"
-msgstr "Backup and restore Evolution data and settings"
+msgstr "Backup and restore plugin"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
@@ -14346,10 +14065,8 @@ msgstr "<span weight=\"bold\">Automatic Contacts</span>"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:426
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
-"_Automatically create entries in the addressbook when responding to mail"
+msgid "_Automatically create entries in the addressbook when responding to mail"
+msgstr "_Automatically create entries in the addressbook when responding to mail"
 
 #: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
@@ -14357,12 +14074,8 @@ msgstr "<span weight=\"bold\">Instant Messaging Contacts</span>"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:457
-msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
-msgstr ""
-"Periodically synchronise contact information and images from my _instant "
-"messenger"
+msgid "Periodically synchronize contact information and images from my _instant messenger"
+msgstr "Periodically synchronise contact information and images from my _instant messenger"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:464
@@ -14370,37 +14083,32 @@ msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
 msgid "Automatic contacts"
-msgstr "Automatic Contacts"
+msgstr "Automatic contacts"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
-msgstr ""
+msgid "Automatically fills your addressbook with names and email addresses as you reply to mails. Also fills in IM contact information from your buddy lists."
+msgstr "Automatically fills your address book with names and email addresses as you reply to mails. Also fills in IM contact information from your buddy lists."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
-msgstr ""
+msgstr "BBDB"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-#, fuzzy
 msgid "Local Calendars"
-msgstr "Loading Calendar"
+msgstr "Local Calendars"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
-msgstr ""
+msgstr "Provides core functionality for local calendars."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-#, fuzzy
 msgid "HTTP Calendars"
-msgstr "Calendars"
+msgstr "HTTP Calendars"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
-msgstr ""
+msgstr "Provides core functionality for webcal and http calendars."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
@@ -14449,50 +14157,43 @@ msgstr "Imperial (Fahrenheit, inches, etc)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Provides core functionality for weather calendars."
-msgstr ""
+msgstr "Provides core functionality for weather calendars."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-#, fuzzy
 msgid "Weather Calendars"
-msgstr "Month Calendar"
+msgstr "Weather Calendars"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
+msgid "A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard."
+msgstr "A test plugin which demonstrates a pop-up menu plugin which lets you copy things to the clipboard."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-#, fuzzy
 msgid "Copy _Email Address"
-msgstr "Email _Address:"
+msgstr "Copy _Email Address"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-#, fuzzy
 msgid "Copy tool"
-msgstr "Copy to Folder"
+msgstr "Copy tool"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr ""
+msgstr "Check whether Evolution is the default mailer"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Every time Evolution starts, check whether or not it is the default mailer."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
+msgstr "Checks whether Evolution is the default mail client on startup."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-#, fuzzy
 msgid "Default Mail Client "
-msgstr "Default reply style"
+msgstr "Default Mail Client "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
+msgstr "Do you want to make Evolution your default e-mail client?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
@@ -14500,24 +14201,20 @@ msgid "Mark as default folder"
 msgstr "Mark as default folder"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-#, fuzzy
 msgid "Open Other User's Folder"
-msgstr "Sent _Messages Folder:"
+msgstr "Open Other User's Folder"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-#, fuzzy
 msgid "_Account:"
-msgstr "_Account name:"
+msgstr "_Account:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-#, fuzzy
 msgid "_Folder Name:"
-msgstr "Folder _name:"
+msgstr "_Folder Name:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-#, fuzzy
 msgid "_User:"
-msgstr "_Username:"
+msgstr "_User:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
 #: ../plugins/exchange-operations/exchange-account-setup.c:63
@@ -14526,29 +14223,20 @@ msgstr "Secure Password"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
+msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgstr "This option will connect to the Exchange server using secure password (NTLM) authentication."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Plaintext Password"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
+msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgstr "This option will connect to the Exchange server using standard plaintext password authentication."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:251
-#, fuzzy
 msgid "Out Of Office"
-msgstr "Out of Office"
+msgstr "Out Of Office"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:258
 msgid ""
@@ -14570,42 +14258,36 @@ msgstr "I am in the office"
 
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:321
-#, fuzzy
 msgid "Change the password for Exchange account"
-msgstr "Enter the password for %s"
+msgstr "Change the password for Exchange account"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:323
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-#, fuzzy
 msgid "Change Password"
-msgstr "Enter Password"
+msgstr "Change Password"
 
 #. Delegation Assistant
 #: ../plugins/exchange-operations/exchange-account-setup.c:327
 msgid "Manage the delegate settings for Exchange account"
-msgstr ""
+msgstr "Manage the delegate settings for Exchange account"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:329
-#, fuzzy
 msgid "Delegation Assitant"
-msgstr "Evolution Setup Assistant"
+msgstr "Delegation Assitant"
 
 #. Miscelleneous settings
 #: ../plugins/exchange-operations/exchange-account-setup.c:339
-#, fuzzy
 msgid "Miscelleneous"
-msgstr "<b>Miscellaneous</b>"
+msgstr "Miscelleneous"
 
 #. Folder Size
 #: ../plugins/exchange-operations/exchange-account-setup.c:349
-#, fuzzy
 msgid "View the size of all Exchange folders"
-msgstr "with all local folders"
+msgstr "View the size of all Exchange folders"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:351
-#, fuzzy
 msgid "Folders Size"
-msgstr "vFolders"
+msgstr "Folders Size"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:358
 msgid "Exchange Settings"
@@ -14631,313 +14313,270 @@ msgstr "Ch_eck for Supported Types"
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:115
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
+msgid "The current password does not match the existing password for your account. Please enter the correct password"
+msgstr "The current password does not match the existing password for your account. Please enter the correct password"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr ""
+msgstr "The two passwords do not match. Please re-enter the passwords."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-#, fuzzy
 msgid "Confirm Password:"
-msgstr "Enter Password"
+msgstr "Confirm Password:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-#, fuzzy
 msgid "Current Password:"
-msgstr "Secure Password"
+msgstr "Current Password:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-#, fuzzy
 msgid "New Password:"
-msgstr "_Password:"
+msgstr "New Password:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
 msgid "Your current password has expired. Please change your password now."
-msgstr ""
+msgstr "Your current password has expired. Please change your password now."
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
-#, fuzzy
 msgid "Custom"
-msgstr "Custom View"
+msgstr "Custom"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Permissions for %s"
-msgstr "Permission denied"
+msgstr "Permissions for %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
-#, fuzzy
 msgid "Delegate To"
-msgstr "Delegate To:"
+msgstr "Delegate To"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:562
 #, c-format
 msgid "Remove the delegate %s?"
-msgstr ""
+msgstr "Remove the delegate %s?"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:679
-#, fuzzy
 msgid "Could not access Active Directory"
-msgstr "Could not create spool directory `%s': %s"
+msgstr "Could not access Active Directory"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:694
 msgid "Could not find self in Active Directory"
-msgstr ""
+msgstr "Could not find self in Active Directory"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:707
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr ""
+msgstr "Could not find delegate %s in Active Directory"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:719
-#, fuzzy, c-format
+#, c-format
 msgid "Could not remove delegate %s"
-msgstr "Could not write data: %s"
+msgstr "Could not remove delegate %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:779
-#, fuzzy
 msgid "Could not update list of delegates."
-msgstr "Could not update object"
+msgstr "Could not update list of delegates."
 
 #: ../plugins/exchange-operations/exchange-delegates.c:797
-#, fuzzy, c-format
+#, c-format
 msgid "Could not add delegate %s"
-msgstr "Could not write data: %s"
+msgstr "Could not add delegate %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:965
-#, fuzzy
 msgid "Error reading delegates list."
-msgstr "Error loading task list"
+msgstr "Error reading delegates list."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
-msgstr ""
+msgstr "Author (read, create)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-#, fuzzy
 msgid "C_alendar:"
-msgstr "_Calendar:"
+msgstr "C_alendar:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
-#, fuzzy
 msgid "Co_ntacts:"
-msgstr "Contacts: "
+msgstr "Co_ntacts:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-#, fuzzy
 msgid "Delegate Permissions"
-msgstr "Delegated"
+msgstr "Delegate Permissions"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-#, fuzzy
 msgid "Delegates"
-msgstr "Delegated"
+msgstr "Delegates"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Editor (read, create, edit)"
-msgstr ""
+msgstr "Editor (read, create, edit)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-#, fuzzy
 msgid "Permissions for"
-msgstr "Permission denied"
+msgstr "Permissions for"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 msgid "Reviewer (read-only)"
-msgstr ""
+msgstr "Reviewer (read-only)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-#, fuzzy
 msgid "_Delegate can see private items"
-msgstr "Create a new test item"
+msgstr "_Delegate can see private items"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-#, fuzzy
 msgid "_Inbox:"
-msgstr "Inbox"
+msgstr "_Inbox:"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#, fuzzy
 msgid "_Tasks:"
-msgstr "_Tasks"
+msgstr "_Tasks:"
 
 #: ../plugins/exchange-operations/exchange-folder-permission.c:58
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-#, fuzzy
 msgid "Permissions..."
-msgstr "Permission denied"
+msgstr "Permissions..."
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:136
-#, fuzzy
 msgid "Folder Name"
-msgstr "Folder _name:"
+msgstr "Folder Name"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:140
-#, fuzzy
 msgid "Folder Size"
-msgstr "Folder"
+msgstr "Folder Size"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-#, fuzzy
 msgid "Exchange Folder Tree"
-msgstr "Mail Folder Tree"
+msgstr "Exchange Folder Tree"
 
 #: ../plugins/exchange-operations/exchange-folder.c:62
 #: ../plugins/exchange-operations/exchange-folder.c:223
 #: ../plugins/exchange-operations/exchange-folder.c:233
-#, fuzzy
 msgid "Unsubscribe Folder..."
-msgstr "S_ubscribe to Folders..."
+msgstr "Unsubscribe Folder..."
 
 #: ../plugins/exchange-operations/exchange-folder.c:460
 #: ../plugins/exchange-operations/exchange-folder.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Unsubscribing from folder \"%s\""
+msgstr "Really unsubscribe from folder \"%s\"?"
 
 #: ../plugins/exchange-operations/exchange-folder.c:472
 #: ../plugins/exchange-operations/exchange-folder.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "Unsubscribe from \"%s\""
-msgstr "Unsubscribing from folder \"%s\""
+msgstr "Unsubscribe from \"%s\""
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
-#, fuzzy
 msgid "(Permission denied.)"
-msgstr "Permission denied"
+msgstr "(Permission denied.)"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
 msgid "Add User:"
-msgstr ""
+msgstr "Add User:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
-#, fuzzy
 msgid "Add User"
-msgstr "_Add URL"
+msgstr "Add User"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Permissions</b>"
-msgstr "<b>Options</b>"
+msgstr "<b>Permissions</b>"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-#, fuzzy
 msgid "Cannot Delete"
-msgstr "Enter Delegate"
+msgstr "Cannot Delete"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-#, fuzzy
 msgid "Cannot Edit"
-msgstr "Contact Editor"
+msgstr "Cannot Edit"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-#, fuzzy
 msgid "Create items"
-msgstr "Create _vFolder"
+msgstr "Create items"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-#, fuzzy
 msgid "Create subfolders"
-msgstr "Create folder"
+msgstr "Create subfolders"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-#, fuzzy
 msgid "Delete Any Items"
-msgstr "Delegated"
+msgstr "Delete Any Items"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-#, fuzzy
 msgid "Delete Own Items"
-msgstr "Delegated"
+msgstr "Delete Own Items"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-#, fuzzy
 msgid "Edit Any Items"
-msgstr "Edit Appointment"
+msgstr "Edit Any Items"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Edit Own Items"
-msgstr ""
+msgstr "Edit Own Items"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-#, fuzzy
 msgid "Folder contact"
-msgstr "%d contact"
+msgstr "Folder contact"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-#, fuzzy
 msgid "Folder owner"
-msgstr "vFolder on Se_nder"
+msgstr "Folder owner"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-#, fuzzy
 msgid "Folder visible"
-msgstr "Toolbar is visible"
+msgstr "Folder visible"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-#, fuzzy
 msgid "Read items"
-msgstr "Read Receipts"
+msgstr "Read items"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
-#, fuzzy
 msgid "Role: "
-msgstr "Role"
+msgstr "Role: "
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
-#, fuzzy
 msgid "Select User"
-msgstr "Select Folder"
+msgstr "Select User"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
-#, fuzzy
 msgid "Addressbook..."
-msgstr "Addressbook"
+msgstr "Address book..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
-msgstr ""
+msgstr "Subscribe to Other User's Contacts"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
 msgid "Subscribe to Other User's Calendar"
-msgstr ""
+msgstr "Subscribe to Other User's Calendar"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
-msgstr ""
+msgstr "Cannot change password due to configuration problems."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-#, fuzzy
 msgid "Cannot display folders."
-msgstr "Create a new window displaying this folder"
+msgstr "Cannot display folders."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid ""
-"Changes to Exchange account configuration will take place after you quit and "
-"restart Evolution."
-msgstr ""
+msgid "Changes to Exchange account configuration will take place after you quit and restart Evolution."
+msgstr "Changes to Exchange account configuration will take place after you quit and restart Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-#, fuzzy
 msgid "Could not authenticate to server."
-msgstr "Failed to authenticate with LDAP server."
+msgstr "Could not authenticate to server."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-#, fuzzy
 msgid "Could not change password."
-msgstr "Could not create message."
+msgstr "Could not change password."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid ""
@@ -14945,62 +14584,57 @@ msgid ""
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
+"Could not configure Exchange account because \n"
+"an unknown error occurred. Check the URL, \n"
+"username, and password, and try again."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
-#, fuzzy
 msgid "Could not connect to server {0}."
-msgstr "Could not create composer window."
+msgstr "Could not connect to server {0}."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
-#, fuzzy
 msgid "Could not determine folder permissions for delegates."
-msgstr "Could not get schema information for LDAP server."
+msgstr "Could not determine folder permissions for delegates."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not find Exchange Web Storage System."
-msgstr ""
+msgstr "Could not find Exchange Web Storage System."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-#, fuzzy
 msgid "Could not locate server {0}."
-msgstr "Could not create message."
+msgstr "Could not locate server {0}."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not make {0} a delegate"
-msgstr ""
+msgstr "Could not make {0} a delegate"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-#, fuzzy
 msgid "Could not read folder permissions"
-msgstr "Could not remove addressbook."
+msgstr "Could not read folder permissions"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-#, fuzzy
 msgid "Could not read folder permissions."
-msgstr "Could not remove addressbook."
+msgstr "Could not read folder permissions."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-#, fuzzy
 msgid "Could not read out-of-office state"
-msgstr "Could not create message."
+msgstr "Could not read out-of-office state"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-#, fuzzy
 msgid "Could not update folder permissions."
-msgstr "Could not update object"
+msgstr "Could not update folder permissions."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-#, fuzzy
 msgid "Could not update out-of-office state"
-msgstr "Could not update object"
+msgstr "Could not update out-of-office state"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Exchange Account is offline."
-msgstr ""
+msgstr "Exchange Account is offline."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Connector access error."
-msgstr ""
+msgstr "Exchange Connector access error."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
@@ -15014,30 +14648,37 @@ msgid ""
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html\n"
 "  "
 msgstr ""
+"Exchange Connector requires access to certain\n"
+"functionality on the Exchange Server that appears\n"
+"to be disabled or blocked.  (This is usually \n"
+"unintentional).  Your Exchange Administrator will \n"
+"need to enable this functionality in order for \n"
+"you to be able to use Ximian Connector.\n"
+"\n"
+"For information to provide to your Exchange \n"
+"administrator, please follow the link below:\n"
+"\n"
+"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html\n"
+"  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
-#, fuzzy
 msgid "Failed to update delegates:"
-msgstr "Unable to update attendee. %s"
+msgstr "Failed to update delegates:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
-#, fuzzy
 msgid "Folder already exists"
-msgstr "Certificate already exists"
+msgstr "Folder already exists"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
-#, fuzzy
 msgid "Folder does not exist"
-msgstr "File %s does not exist"
+msgstr "Folder does not exist"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-#, fuzzy
 msgid "Folder offline"
-msgstr "Work Offline"
+msgstr "Folder offline"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1265
@@ -15045,75 +14686,72 @@ msgid "Generic error"
 msgstr "Generic error"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
+msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
+msgstr "If OWA is running on a different path, you must specify that in the account configuration dialogue."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
-msgstr ""
+msgstr "Mailbox for {0} is not on this server."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Make sure the URL is correct and try again."
-msgstr ""
+msgstr "Make sure the URL is correct and try again."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
+msgstr "Make sure the server name is spellt correctly and try again."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
+msgstr "Make sure the username and password are correct and try again."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
-msgstr ""
+msgstr "No Global Catalog server configured for this account."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "No mailbox for user {0} on {1}."
-msgstr ""
+msgstr "No mailbox for user {0} on {1}."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-#, fuzzy
 msgid "No such user {0}"
-msgstr "No such source"
+msgstr "No such user {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Password successfully changed."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-#, fuzzy
 msgid "Please restart Evolution"
-msgstr "Restart Evolution"
+msgstr "Please restart Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-#, fuzzy
 msgid "Please select a user."
-msgstr "Please select a server."
+msgstr "Please select a user."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Server rejected password because it is too weak."
-msgstr ""
+msgstr "Server rejected password because it is too weak."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr ""
+msgstr "The Exchange account will be disabled when you quit Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "The Exchange account will be removed when you quit Evolution"
-msgstr ""
+msgstr "The Exchange account will be removed when you quit Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr ""
+msgstr "The Exchange server is not compatible with Exchange Connector."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
 "The server is runinng Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
+"The server is runinng Exchange 5.5. Exchange Connector \n"
+"supports Microsoft Exchange 2000 and 2003 only."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
@@ -15123,102 +14761,95 @@ msgid ""
 "\n"
 "Or you might have just typed your password wrong."
 msgstr ""
+"This probably means that your server requires \n"
+"you to specify the Windows domain name \n"
+"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Or you might have just typed your password wrong."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid "Try again with a different password."
-msgstr ""
+msgstr "Try again with a different password."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-#, fuzzy
 msgid "Unable to add user to access control list:"
-msgstr "Unable to activate the address selector control."
+msgstr "Unable to add user to access control list:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
-#, fuzzy
 msgid "Unable to edit delegates."
-msgstr "Unable to read licence file."
+msgstr "Unable to edit delegates."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
-#, fuzzy
 msgid "Unknown error looking up {0}"
-msgstr "Unknown error"
+msgstr "Unknown error looking up {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
-#, fuzzy
 msgid "Unknown error."
-msgstr "Unknown error"
+msgstr "Unknown error."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
-#, fuzzy
 msgid "Unknown type"
-msgstr "Unknown"
+msgstr "Unknown type"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-#, fuzzy
 msgid "Unsupported operation"
-msgstr "User cancelled operation."
+msgstr "Unsupported operation"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mails on this server."
-msgstr ""
+msgstr "You are nearing your quota available for storing mails on this server."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
-msgstr ""
+msgstr "You cannot make yourself your own delegate"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mails on this server."
-msgstr ""
+msgstr "You have exceeded your quota for storing mails on this server."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
-msgstr ""
+msgstr "You may only configure a single Exchange account."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
-msgstr ""
+msgid "Your current usage is : {0}KB. Try to clear up some space by deleting some mails."
+msgstr "Your current usage is : {0}KB. Try to clear up some space by deleting some mails."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
-msgstr ""
+msgid "Your current usage is : {0}KB. You will not be able to either send or recieve mails now."
+msgstr "Your current usage is : {0}KB. You will not be able to either send or recieve mails now."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
-msgstr ""
+msgid "Your current usage is : {0}KB. You will not be able to send mails till you clear up some space by deleting some mails."
+msgstr "Your current usage is : {0}KB. You will not be able to send mails till you clear up some space by deleting some mails."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
-msgstr ""
+msgstr "Your password has expired."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
-msgstr ""
+msgstr "{0} cannot be added to an access control list"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
-msgstr ""
+msgstr "{0} is already a delegate"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "{0} is already in the list"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr ""
+msgstr "Subscribe to Other User's Tasks"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
-msgstr ""
+msgstr "Check folder permissions"
 
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
-msgstr ""
+msgstr "Subscribe to Other User's Folder"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
@@ -15227,67 +14858,56 @@ msgstr "Unsubscribing from folder \"%s\""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
+msgstr "Allows unsubscribing of mail folders in the folder tree context menu."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-#, fuzzy
 msgid "Unsubscribe Folders"
-msgstr "S_ubscribe to Folders..."
+msgstr "Unsubscribe Folders"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr "Checklist"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-#, fuzzy
 msgid "Groupwise Account Setup"
-msgstr "Groupware Suite"
+msgstr "Groupwise Account Setup"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
-#, fuzzy
 msgid "Junk Settings"
-msgstr "Settings"
+msgstr "Junk Settings"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
-#, fuzzy
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Task List Options</b>"
+msgstr "<b>Junk Mail Settings</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
-#, fuzzy
 msgid "Junk Mail Settings..."
-msgstr "Pi_lot Settings..."
+msgstr "Junk Mail Settings..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-#, fuzzy
 msgid "<b>Junk List :</b>"
-msgstr "<b>Task List</b>"
+msgstr "<b>Junk List :</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
-#, fuzzy
 msgid "Email:"
-msgstr "Email"
+msgstr "Email:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
-#, fuzzy
 msgid "Junk Mail Settings"
-msgstr "Settings"
+msgstr "Junk Mail Settings"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
-#, fuzzy
 msgid "_Disable"
-msgstr "Disable"
+msgstr "_Disable"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:6
-#, fuzzy
 msgid "_Enable"
-msgstr "Enable"
+msgstr "_Enable"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
-#, fuzzy
 msgid "_Junk List"
-msgstr "Junk Test"
+msgstr "_Junk List"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
@@ -15300,17 +14920,15 @@ msgstr "Send Options"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
-msgstr ""
+msgstr "A plugin for the features in Groupwise accounts."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-#, fuzzy
 msgid "Groupwise Features"
-msgstr "Groupware Suite"
+msgstr "Groupwise Features"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
-#, fuzzy
 msgid "Accept Tentatively"
-msgstr "Tentative"
+msgstr "Accept Tentatively"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users :</b>"
@@ -15350,62 +14968,53 @@ msgid "_Sharing"
 msgstr "_Sharing"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Name</b>"
-msgstr "<b>Home</b>"
+msgstr "<b>Name</b>"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
 msgid "Access Rights"
-msgstr ""
+msgstr "Access Rights"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
-#, fuzzy
 msgid "Add/Edit"
-msgstr "Edit"
+msgstr "Add/Edit"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
-#, fuzzy
 msgid "Con_tacts"
-msgstr "Contacts"
+msgstr "Con_tacts"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
-msgstr ""
+msgstr "Modify _folders/options/rules/"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr ""
+msgstr "Read items marked _private"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
-#, fuzzy
 msgid "Reminder Notes"
-msgstr "_Remind Me Later"
+msgstr "Reminder Notes"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
-#, fuzzy
 msgid "Subscribe to my _alarms"
-msgstr "_Subscribe"
+msgstr "Subscribe to my _alarms"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
-#, fuzzy
 msgid "Subscribe to my _notifications"
-msgstr "_Subscribe"
+msgstr "Subscribe to my _notifications"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
 #: ../ui/evolution-mail-message.xml.h:121
-#, fuzzy
 msgid "_Read"
-msgstr "Read"
+msgstr "_Read"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
-#, fuzzy
 msgid "_Write"
-msgstr "_Print"
+msgstr "_Write"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
-#, fuzzy
 msgid "Proxy"
-msgstr "Priority"
+msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
 #: ../smime/gui/smime-ui.glade.h:49
@@ -15415,13 +15024,12 @@ msgid "dialog1"
 msgstr "dialogue1"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Account Name</b>"
-msgstr "Account name"
+msgstr "<b>Account Name</b>"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 msgid "Proxy Login"
-msgstr ""
+msgstr "Proxy Login"
 
 #: ../plugins/groupwise-features/proxy-login.c:219
 #: ../plugins/groupwise-features/proxy-login.c:261
@@ -15432,13 +15040,12 @@ msgid "%sEnter password for %s (user %s)"
 msgstr "%sEnter password for %s (user %s)"
 
 #: ../plugins/groupwise-features/proxy-login.c:484
-#, fuzzy
 msgid "_Proxy Login..."
-msgstr "_Print..."
+msgstr "_Proxy Login..."
 
 #: ../plugins/groupwise-features/proxy.c:672
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
+msgstr "The Proxy tab will be available only when the account is enabled."
 
 #: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Users"
@@ -15449,18 +15056,16 @@ msgid "Enter the users and set permissions"
 msgstr "Enter the users and set permissions"
 
 #: ../plugins/groupwise-features/share-folder-common.c:338
-#, fuzzy
 msgid "New _Shared Folder..."
-msgstr "_New Folder..."
+msgstr "New _Shared Folder..."
 
 #: ../plugins/groupwise-features/share-folder-common.c:453
 msgid "Sharing"
 msgstr "Sharing"
 
 #: ../plugins/groupwise-features/status-track.c:235
-#, fuzzy
 msgid "Track Message Status..."
-msgstr "Save Message..."
+msgstr "Track Message Status..."
 
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
@@ -15494,16 +15099,15 @@ msgstr "Sent to calendar '%s' as cancelled"
 #: ../plugins/itip-formatter/itip-formatter.c:898
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "Organizer has removed the delegate %s "
 
 #: ../plugins/itip-formatter/itip-formatter.c:905
 msgid "Sent a cancellation notice to the delegate"
-msgstr ""
+msgstr "Sent a cancellation notice to the delegate"
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
-#, fuzzy
 msgid "Could not send the cancellation notice to the delegate"
-msgstr "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Could not send the cancellation notice to the delegate"
 
 #: ../plugins/itip-formatter/itip-formatter.c:991
 msgid "Attendee status could not be updated because the status is invalid"
@@ -15523,12 +15127,8 @@ msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1149
-msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
-"iCalendar."
-msgstr ""
-"The message claims to contain a calendar, but the calendar is not valid "
-"iCalendar."
+msgid "The message claims to contain a calendar, but the calendar is not valid iCalendar."
+msgstr "The message claims to contain a calendar, but the calendar is not valid iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1183
 #: ../plugins/itip-formatter/itip-formatter.c:1198
@@ -15539,24 +15139,16 @@ msgstr "The item in the calendar is not valid"
 #: ../plugins/itip-formatter/itip-formatter.c:1184
 #: ../plugins/itip-formatter/itip-formatter.c:1199
 #: ../plugins/itip-formatter/itip-formatter.c:1275
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
+msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+msgstr "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1209
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1210
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+msgid "To process all of these items, the file should be saved and the calendar imported"
+msgstr "To process all of these items, the file should be saved and the calendar imported"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1968
 msgid "Meetings and Tasks"
@@ -15582,8 +15174,10 @@ msgid "Conflict Search Table"
 msgstr "Conflict Search Table"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
+#: ../plugins/itip-formatter/itip-view.c:184
+#: ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:240
+#: ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Today"
 
@@ -15735,9 +15329,9 @@ msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> has published the following meeting information:"
 
 #: ../plugins/itip-formatter/itip-view.c:351
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> has cancelled the following meeting."
+msgstr "<b>%s</b> has delegated the following meeting to you:"
 
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
@@ -15761,10 +15355,8 @@ msgstr "<b>%s</b> wishes to add to an existing meeting:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr "<b>%s</b> wishes to receive the latest information for the following meeting:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
@@ -15833,12 +15425,8 @@ msgstr "<b>%s</b> wishes to add to an existing task:"
 
 #: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
+msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgstr "<b>%s</b> wishes to receive the latest information for the following assigned task:"
 
 #: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
@@ -15887,167 +15475,137 @@ msgid "Comment:"
 msgstr "Comment:"
 
 #: ../plugins/itip-formatter/itip-view.c:981
-#, fuzzy
 msgid "Send u_pdates to attendees"
-msgstr "Unable to update attendee. %s"
+msgstr "Send u_pdates to attendees"
 
 #: ../plugins/itip-formatter/itip-view.c:990
-#, fuzzy
 msgid "A_pply to all instances"
-msgstr "All Instances"
+msgstr "A_pply to all instances"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-#, fuzzy
 msgid "Displays text/calendar parts in messages."
-msgstr "Display the next important message"
+msgstr "Displays text/calendar parts in messages."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-#, fuzzy
 msgid "Itip Formatter"
-msgstr "Importers"
+msgstr "Itip Formatter"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot; ?"
-msgstr ""
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
+msgstr "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#, fuzzy
 msgid "This meeting has been delegated"
-msgstr "This event has been deleted."
+msgstr "This meeting has been delegated"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-#, fuzzy
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "This response is not from a current attendee.  Add as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "This response is not from a current attendee. Add the sender as an attendee?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
-msgstr ""
+msgstr "Proxy _Logout"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-#, fuzzy
 msgid "Allows disabling of accounts."
-msgstr "List of accounts"
+msgstr "Allows disabling of accounts."
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-#, fuzzy
 msgid "Disable Account"
-msgstr "Mail Accounts"
+msgstr "Disable Account"
 
 #: ../plugins/mail-remote/client.c:30
-#, fuzzy, c-format
+#, c-format
 msgid "System error: %s"
-msgstr "Validation error: %s"
+msgstr "System error: %s"
 
 #: ../plugins/mail-remote/client.c:32
-#, fuzzy, c-format
+#, c-format
 msgid "Camel error: %s"
-msgstr "Validation error: %s"
+msgstr "Camel error: %s"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:476
 msgid "Account cannot send e-mail"
-msgstr ""
+msgstr "Account cannot send e-mail"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:605
-#, fuzzy
 msgid "No store available"
-msgstr "No summary available."
+msgstr "No store available"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr ""
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr "A plugin which implements a CORBA interface for accessing mail data remotely."
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-#, fuzzy
 msgid "Mail Remote"
-msgstr "Mail Filters"
+msgstr "Mail Remote"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr ""
+msgid "A plugin which allows the creation of meetings from the contents of a mail message."
+msgstr "A plugin which allows the creation of meetings from the contents of a mail message."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-#, fuzzy
 msgid "Con_vert to Meeting"
-msgstr "_Invert Selection"
+msgstr "Con_vert to Meeting"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-#, fuzzy
 msgid "Mail to meeting"
-msgstr "It is a meeting."
+msgstr "Mail to meeting"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr ""
+msgid "A plugin which allows the creation of tasks from the contents of a mail message."
+msgstr "A plugin which allows the creation of tasks from the contents of a mail message."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 msgid "Con_vert to Task"
-msgstr ""
+msgstr "Con_vert to Task"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#, fuzzy
 msgid "Mail to task"
-msgstr "Mail to %s"
+msgstr "Mail to task"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-#, fuzzy
 msgid "Contact list _owner"
-msgstr "Contact List Editor"
+msgstr "Contact list _owner"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
-msgstr ""
+msgstr "Get list _archive"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-#, fuzzy
 msgid "Get list _usage information"
-msgstr "Meeting Information"
+msgstr "Get list _usage information"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-#, fuzzy
 msgid "Mailing List Actions"
-msgstr "Mailing list"
+msgstr "Mailing List Actions"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-#, fuzzy
 msgid "Mailing _List"
-msgstr "Mailing list"
+msgstr "Mailing _List"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, "
-"unsubscribe, ...)."
-msgstr ""
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe, ...)."
+msgstr "Provide actions for common mailing list commands (subscribe, unsubscribe, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-#, fuzzy
 msgid "_Post message to list"
-msgstr "Moving messages to %s"
+msgstr "_Post message to list"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-#, fuzzy
 msgid "_Subscribe to list"
-msgstr "_Subscribe"
+msgstr "_Subscribe to list"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-#, fuzzy
 msgid "_Un-subscribe to list"
-msgstr "_Unsubscribe"
+msgstr "_Un-subscribe to list"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -16055,17 +15613,13 @@ msgstr "Action not available"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
@@ -16080,12 +15634,8 @@ msgid "Posting not allowed"
 msgstr "Posting not allowed"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -16093,13 +15643,11 @@ msgstr "Send e-mail message to mailing list?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
 
@@ -16114,12 +15662,8 @@ msgstr ""
 "Header: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr ""
-"This message does not contain the header information required for this "
-"action."
+msgid "This message does not contain the header information required for this action."
+msgstr "This message does not contain the header information required for this action."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -16131,90 +15675,79 @@ msgstr "_Send message"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
+msgstr "Contact the owner of the mailing list this message belongs to"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get an archive of the list this message belongs to"
-msgstr ""
+msgstr "Get an archive of the list this message belongs to"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
+msgstr "Get information about the usage of the list this message belongs to"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-#, fuzzy
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "Compose a reply to the mailing list of the selected message"
+msgstr "Post a message to the mailing list this message belongs to"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-#, fuzzy
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Compose a reply to the mailing list of the selected message"
+msgstr "Subscribe to the mailing list this message belongs to"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-#, fuzzy
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Compose a reply to the mailing list of the selected message"
+msgstr "Unsubscribe to the mailing list this message belongs to"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
-msgstr ""
+msgstr "Mark calendar offline"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-#, fuzzy
 msgid "Marks the selected calendar for offline viewing."
-msgstr "Mark the selected messages for deletion"
+msgstr "Marks the selected calendar for offline viewing."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make this available offline"
-msgstr ""
+msgstr "_Do not make this available offline"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-#, fuzzy
 msgid "_Mark Calendar for offline use"
-msgstr "The calendar is not marked for offline usage"
+msgstr "_Mark Calendar for offline use"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
-msgstr ""
+msgstr "A plugin which implements mono plugins."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-#, fuzzy
 msgid "Mono Loader"
-msgstr "Move to Folder"
+msgstr "Mono Loader"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-#, fuzzy
 msgid "Generates a D-BUS message when new mail arrives."
-msgstr "_Generates a D-BUS message when new mail arrives"
+msgstr "Generates a D-BUS message when new mail arrives."
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-#, fuzzy
 msgid "New Mail Notification"
-msgstr "New Mail Notify type"
+msgstr "New Mail Notification"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-#, fuzzy
 msgid "New mail notify"
-msgstr "New Mail Notify type"
+msgstr "New mail notify"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr ""
+msgstr "A plugin for managing which plugins are enabled or disabled."
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#, fuzzy
 msgid "Plugin manager"
-msgstr "Plugin Manager"
+msgstr "Plugin manager"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plugins"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-#, fuzzy
 msgid "Plugins"
-msgstr "Plugin"
+msgstr "Plugins"
 
 #: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
@@ -16250,21 +15783,22 @@ msgstr "Plugin"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
+"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML mails.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML mails.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
-#, fuzzy
 msgid "Plain Text Mode"
-msgstr "Text Model"
+msgstr "Plain Text Mode"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "Prefer plain-text"
 
 #: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
@@ -16284,18 +15818,19 @@ msgstr "HTML Mode"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
-msgstr ""
+msgstr "Gives an option to print mail from composer"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:17
+#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
-#, fuzzy
 msgid "Prints the message"
-msgstr "Print this message"
+msgstr "Prints the message"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:98
 msgid "Spamassassin (built-in)"
@@ -16303,21 +15838,20 @@ msgstr "Spamassassin (built-in)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid "Sa junk-plugin"
-msgstr ""
+msgstr "Sa junk-plugin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "learns junk messages using spamd."
-msgstr ""
+msgstr "learns junk messages using spamd."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr ""
+msgstr "A plugin for saving all attachments or parts of a message at once."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#, fuzzy
 msgid "Save attachments"
-msgstr "Save all attachments"
+msgstr "Save attachments"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
@@ -16346,64 +15880,55 @@ msgstr "Save"
 #. *
 #: ../plugins/save-calendar/csv-format.c:171
 msgid "%F %T"
-msgstr ""
+msgstr "%F %T"
 
 #: ../plugins/save-calendar/csv-format.c:385
 msgid "Uid"
-msgstr ""
+msgstr "Uid"
 
 #: ../plugins/save-calendar/csv-format.c:387
-#, fuzzy
 msgid "Description List"
-msgstr "Description"
+msgstr "Description List"
 
 #: ../plugins/save-calendar/csv-format.c:388
-#, fuzzy
 msgid "Categories List"
-msgstr "Categories: %s"
+msgstr "Categories List"
 
 #: ../plugins/save-calendar/csv-format.c:389
-#, fuzzy
 msgid "Comment List"
-msgstr "Contact _List"
+msgstr "Comment List"
 
 #: ../plugins/save-calendar/csv-format.c:391
-#, fuzzy
 msgid "Created"
-msgstr "Create"
+msgstr "Created"
 
 #: ../plugins/save-calendar/csv-format.c:392
-#, fuzzy
 msgid "Contact List"
-msgstr "Contact _List"
+msgstr "Contact List"
 
 #: ../plugins/save-calendar/csv-format.c:393
-#, fuzzy
 msgid "Start"
-msgstr "Starts"
+msgstr "Start"
 
 #: ../plugins/save-calendar/csv-format.c:394
-#, fuzzy
 msgid "End"
-msgstr "Ends"
+msgstr "End"
 
 #: ../plugins/save-calendar/csv-format.c:396
 msgid "percent Done"
-msgstr ""
+msgstr "percent Done"
 
 #: ../plugins/save-calendar/csv-format.c:398
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
 #: ../plugins/save-calendar/csv-format.c:399
-#, fuzzy
 msgid "Attendees List"
-msgstr "Attendee"
+msgstr "Attendees List"
 
 #: ../plugins/save-calendar/csv-format.c:401
-#, fuzzy
 msgid "Modified"
-msgstr "Model"
+msgstr "Modified"
 
 #: ../plugins/save-calendar/csv-format.c:552
 msgid "Advanced options for the CSV format"
@@ -16434,20 +15959,17 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar format (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
-#, fuzzy
 msgid "Save Selected"
-msgstr "None Selected"
+msgstr "Save Selected"
 
 #  calendar:prompt-save-task title
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-#, fuzzy
 msgid "Save to _Disk"
-msgstr "Save Task"
+msgstr "Save to _Disk"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "Saves selected calendar or tasks list to disk."
-msgstr "Save selected contacts as a VCard."
+msgstr "Saves selected calendar or tasks list to disk."
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -16456,7 +15978,7 @@ msgstr "Save selected contacts as a VCard."
 #. *
 #: ../plugins/save-calendar/rdf-format.c:158
 msgid "%FT%T"
-msgstr ""
+msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
@@ -16469,35 +15991,28 @@ msgstr "Select destination file"
 
 #: ../plugins/save-calendar/save-calendar.c:216
 #, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
+msgid "The suggested filename extension of this filetype (%s) is unused in the chosen filename. Do you want to continue?"
+msgstr "The suggested filename extension of this filetype (%s) is unused in the chosen filename. Do you want to continue?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-#, fuzzy
 msgid "Select one source"
-msgstr "Selection Mode"
+msgstr "Select one source"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-#, fuzzy
 msgid "Selects a single calendar or task source for viewing."
-msgstr "Select the calendars to search for meeting conflicts"
+msgstr "Selects a single calendar or task source for viewing."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-#, fuzzy
 msgid "_Show only this Calendar"
-msgstr "Month Calendar"
+msgstr "_Show only this Calendar"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "_Show only this Task List"
-msgstr ""
+msgstr "_Show only this Task List"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Startup wizard"
-msgstr ""
+msgstr "Startup wizard"
 
 #: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
@@ -16509,13 +16024,11 @@ msgstr "Welcome"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 
@@ -16532,23 +16045,20 @@ msgstr "From %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:509
-#, fuzzy
 msgid "Importing data."
-msgstr "Importing Elm data"
+msgstr "Importing data."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
+msgstr "Indicates if threading of messages should fall back to subject."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-#, fuzzy
 msgid "Subject Threading"
-msgstr "Select _Thread"
+msgstr "Subject Threading"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-#, fuzzy
 msgid "Thread messages by subject"
-msgstr "Thread the message-list based on Subject"
+msgstr "Thread messages by subject"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
@@ -16560,9 +16070,8 @@ msgid "Evolution Shell"
 msgstr "Evolution Shell"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Shell Config factory"
-msgstr "Evolution Shell"
+msgstr "Evolution Shell Config factory"
 
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
@@ -16601,10 +16110,8 @@ msgid "Last upgraded configuration version"
 msgstr "Last upgraded configuration version"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-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"
+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:9
 msgid "Printer settings"
@@ -16614,15 +16121,14 @@ msgstr "Printer settings"
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialogue"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/main.c:468
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
-msgstr ""
-"The configuration version of Evolution, with major/minor/configuration level"
+msgid "The configuration version of Evolution, with major/minor/configuration level"
+msgstr "The configuration version of Evolution, with major/minor/configuration level"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "The default height for the main window, in pixels."
@@ -16637,22 +16143,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
-msgstr ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level"
+msgstr "The last upgraded configuration version of Evolution, with major/minor/configuration level"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+msgstr "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
@@ -16660,18 +16156,15 @@ msgstr "Toolbar is visible"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Whether Evolution will start up in offline mode instead of online mode."
+msgstr "Whether Evolution will start up in offline mode instead of online mode."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Whether the warning dialogue in development versions of Evolution is skipped."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "Whether the warning dialogue in development versions of Evolution is skipped."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the window buttons should be visible."
@@ -16708,24 +16201,19 @@ msgstr "Choose the type of importer to run:"
 
 #: ../shell/e-shell-importer.c:136
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 msgstr ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
 
 #: ../shell/e-shell-importer.c:142
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
 #: ../shell/e-shell-importer.c:148
-#, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16733,8 +16221,8 @@ msgid ""
 "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"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 
 #: ../shell/e-shell-importer.c:283
@@ -16819,7 +16307,8 @@ msgstr "Groupware Suite"
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:787
+#: ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
@@ -16848,12 +16337,14 @@ msgstr "Switch to %s"
 msgid "Uknown system error."
 msgstr "Uknown system error."
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:825
+#: ../shell/e-shell.c:826
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1257
+#: ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "OK"
 
@@ -17005,9 +16496,8 @@ msgstr ""
 "  Use %s --help for more information.\n"
 
 #: ../shell/shell.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Are you sure you want to delete these {0} tasks?"
+msgstr "Are you sure you want to forget all remembered passwords?"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
@@ -17024,11 +16514,8 @@ msgid "Evolution can not start."
 msgstr "Evolution can not start."
 
 #: ../shell/shell.error.xml.h:5
-#, fuzzy
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
-msgstr "Forget remembered passwords so you will be prompted for them again"
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed. "
+msgstr "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed. "
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -17042,66 +16529,43 @@ msgstr "Really delete old data?"
 
 #  shell:upgrade-remove-1-4-confirm secondary
 #: ../shell/shell.error.xml.h:9
-#, fuzzy
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
-"permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory is about to be be permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
-"The entire contents of the \"evolution\" directory is about to be be "
-"permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be be permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 
 #  shell:upgrade-remove-1-4 secondary
 #: ../shell/shell.error.xml.h:15
-#, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
 msgstr ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the \"evolution\" "
-"directory will be removed permanently.  If you choose to keep this data, "
-"then you may manually remove the contents of \"evolution\" at your "
-"convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
 
 #: ../shell/shell.error.xml.h:19
-#, fuzzy
 msgid "Upgrade from previous version failed: {0}"
-msgstr ""
-"Upgrade from previous version failed:\n"
-"{0}"
+msgstr "Upgrade from previous version failed: {0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 msgstr ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
+"You will need to make more space available in your home directory before you can continue."
 
 #: ../shell/shell.error.xml.h:23
 msgid ""
@@ -17128,9 +16592,8 @@ msgstr ""
 "Click help for details."
 
 #: ../shell/shell.error.xml.h:31
-#, fuzzy
 msgid "_Forget"
-msgstr "_Port:"
+msgstr "_Forget"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
@@ -17144,13 +16607,11 @@ msgstr "_Remind Me Later"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 
 #: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
@@ -17164,24 +16625,12 @@ msgstr ""
 "Edit trust settings:"
 
 #: ../smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
 
 #: ../smime/gui/cert-trust-dialog.c:149
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
 
 #: ../smime/gui/certificate-manager.c:134
 #: ../smime/gui/certificate-manager.c:142
@@ -17189,9 +16638,8 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:385
 #: ../smime/gui/certificate-manager.c:597
 #: ../smime/gui/certificate-manager.c:605
-#, fuzzy
 msgid "Select a certificate to import..."
-msgstr "Select a cert to import..."
+msgstr "Select a certificate to import..."
 
 #: ../smime/gui/certificate-manager.c:265
 #: ../smime/gui/certificate-manager.c:474
@@ -17204,7 +16652,8 @@ msgstr "Certificate Name"
 msgid "Purposes"
 msgstr "Purposes"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serial Number"
@@ -17308,14 +16757,11 @@ msgid "Backup All"
 msgstr "Backup All"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14
+#: ../smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificate"
 
@@ -17391,11 +16837,13 @@ msgstr "Organisational Unit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL Client Certificate"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36
+#: ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL Server Certificate"
 
@@ -17424,10 +16872,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organisations that identify you:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "You have certificates on file that identify these certificate authorities:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
@@ -17446,7 +16892,8 @@ msgstr "_Edit CA Trust"
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -17568,11 +17015,13 @@ msgstr "Subject Public Key Algorithm"
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:809
+#: ../smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:830
+#: ../smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Object Signer"
 
@@ -17616,7 +17065,8 @@ msgstr "CRL Signer"
 msgid "Critical"
 msgstr "Critical"
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Not Critical"
 
@@ -17629,7 +17079,8 @@ msgstr "Extensions"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1091
+#: ../smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
@@ -17699,11 +17150,11 @@ msgid "Shutting down %s (%s)\n"
 msgstr "Shutting down %s (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:3
-#, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Copy Contact(s) to Another Folder..."
+msgstr "Copy Selected Contacts to Another Folder..."
 
-#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
@@ -17711,7 +17162,8 @@ msgstr "Copy the selection"
 msgid "Copy to Folder..."
 msgstr "Copy to Folder..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:7
+#: ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
@@ -17720,15 +17172,15 @@ msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
 #: ../ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Move Contact(s) to Another Folder..."
+msgstr "Move Selected Contacts to Another Folder..."
 
 #: ../ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Move to Folder..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:14
+#: ../ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
@@ -17744,7 +17196,8 @@ msgstr "Print selected contacts"
 msgid "Save selected contacts as a VCard."
 msgstr "Save selected contacts as a VCard."
 
-#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:21
+#: ../widgets/text/e-text.c:2684
 msgid "Select All"
 msgstr "Select All"
 
@@ -17780,7 +17233,8 @@ msgstr "Stop Loading"
 msgid "View the current contact"
 msgstr "View the current contact"
 
-#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Actions"
@@ -17845,7 +17299,8 @@ msgstr "List"
 msgid "Month"
 msgstr "Month"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next"
 msgstr "Next"
 
@@ -17853,7 +17308,8 @@ msgstr "Next"
 msgid "Previews the calendar to be printed"
 msgstr "Previews the calendar to be printed"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Previous"
 msgstr "Previous"
 
@@ -17865,7 +17321,8 @@ msgstr "Print this calendar"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publish Free/Busy information for this calendar"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Purg_e"
 
@@ -17937,7 +17394,8 @@ msgstr "Cut selected text to the clipboard"
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5
+#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Select _All"
 
@@ -17954,19 +17412,16 @@ msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
 #: ../ui/evolution-mail-global.xml.h:3
-#, fuzzy
 msgid "Copy the selected folder into another folder"
-msgstr "Copy selected messages to another folder"
+msgstr "Copy the selected folder into another folder"
 
 #: ../ui/evolution-mail-global.xml.h:4
-#, fuzzy
 msgid "Create a new folder for storing mail"
-msgstr "Create a vFolder for this mailing list"
+msgstr "Create a new folder for storing mail"
 
 #: ../ui/evolution-mail-global.xml.h:5
-#, fuzzy
 msgid "Create or edit Search Folder definitions"
-msgstr "Create or edit vFolder definitions"
+msgstr "Create or edit Search Folder definitions"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
@@ -17976,25 +17431,23 @@ msgstr "Create or edit rules for filtering new mail"
 msgid "Empty _Trash"
 msgstr "Empty _Trash"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:7
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "F_older"
 
 #: ../ui/evolution-mail-global.xml.h:9
-#, fuzzy
 msgid "Message F_ilters"
-msgstr "Mail Filters"
+msgstr "Message F_ilters"
 
 #: ../ui/evolution-mail-global.xml.h:10
-#, fuzzy
 msgid "Message _Preview"
-msgstr "Message Header"
+msgstr "Message _Preview"
 
 #: ../ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "Move the selected folder into another folder"
-msgstr "Move selected message(s) to another folder"
+msgstr "Move the selected folder into another folder"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
@@ -18002,9 +17455,8 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Permanently remove all deleted messages from all folders"
 
 #: ../ui/evolution-mail-global.xml.h:14
-#, fuzzy
 msgid "Search F_olders"
-msgstr "Select Folder"
+msgstr "Search F_olders"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
@@ -18015,43 +17467,40 @@ msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscribe or unsubscribe to folders on remote servers"
 
 #: ../ui/evolution-mail-global.xml.h:17
-#, fuzzy
 msgid "_Copy Folder To..."
-msgstr "_Copy to Folder..."
+msgstr "_Copy Folder To..."
 
 #: ../ui/evolution-mail-global.xml.h:18
-#, fuzzy
 msgid "_Move Folder To..."
-msgstr "_Move to Folder..."
+msgstr "_Move Folder To..."
 
 #: ../ui/evolution-mail-global.xml.h:19
-#, fuzzy
 msgid "_New..."
-msgstr "_New"
+msgstr "_New..."
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
 #: ../ui/evolution-mail-global.xml.h:23
-#, fuzzy
 msgid "_Subscriptions"
-msgstr "Folder Subscriptions"
+msgstr "_Subscriptions"
 
 #: ../ui/evolution-mail-list.xml.h:1
-#, fuzzy
 msgid "Change the name of this folder"
-msgstr "Change the properties of this folder"
+msgstr "Change the name of this folder"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copy selected message(s) to the clipboard"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Cut selected message(s) to the clipboard"
 
@@ -18060,14 +17509,12 @@ msgid "E_xpunge"
 msgstr "E_xpunge"
 
 #: ../ui/evolution-mail-list.xml.h:8
-#, fuzzy
 msgid "Group By _Threads"
-msgstr "Group By This Field"
+msgstr "Group By _Threads"
 
 #: ../ui/evolution-mail-list.xml.h:9
-#, fuzzy
 msgid "Hide S_elected Messages"
-msgstr "Hide _Deleted Messages"
+msgstr "Hide S_elected Messages"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Deleted Messages"
@@ -18078,17 +17525,15 @@ msgid "Hide _Read Messages"
 msgstr "Hide _Read Messages"
 
 #: ../ui/evolution-mail-list.xml.h:12
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
+msgstr "Hide deleted messages rather than displaying them with a line through them"
 
 #: ../ui/evolution-mail-list.xml.h:13
-#, fuzzy
 msgid "Mark Me_ssages as Read"
-msgstr "_Mark messages as read after"
+msgstr "Mark Me_ssages as Read"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
 msgstr "Paste message(s) from the clipboard"
 
@@ -18097,19 +17542,16 @@ msgid "Permanently remove all deleted messages from this folder"
 msgstr "Permanently remove all deleted messages from this folder"
 
 #: ../ui/evolution-mail-list.xml.h:16
-#, fuzzy
 msgid "Permanently remove this folder"
-msgstr "Permanently remove all deleted messages from this folder"
+msgstr "Permanently remove this folder"
 
 #: ../ui/evolution-mail-list.xml.h:17
-#, fuzzy
 msgid "Select Message _Thread"
-msgstr "Hide S_elected Messages"
+msgstr "Select Message _Thread"
 
 #: ../ui/evolution-mail-list.xml.h:18
-#, fuzzy
 msgid "Select _All Messages"
-msgstr "Select all visible messages"
+msgstr "Select _All Messages"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all and only the messages that are not currently selected"
@@ -18143,11 +17585,11 @@ msgstr "Temporarily hide the selected messages"
 msgid "Threaded Message list"
 msgstr "Threaded Message list"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:113
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
-#, fuzzy
 msgid "_Message"
-msgstr "_Messages"
+msgstr "_Message"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -18163,9 +17605,8 @@ msgid "Add Sender to Address Book"
 msgstr "Add Sender to Address Book"
 
 #: ../ui/evolution-mail-message.xml.h:5
-#, fuzzy
 msgid "All Message _Headers"
-msgstr "Message Header"
+msgstr "All Message _Headers"
 
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
@@ -18173,7 +17614,7 @@ msgstr "Apply filter rules to the selected messages"
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr ""
+msgstr "Check for _Junk"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -18196,29 +17637,24 @@ msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
 #: ../ui/evolution-mail-message.xml.h:15
-#, fuzzy
 msgid "Create R_ule"
-msgstr "Create _vFolder"
+msgstr "Create R_ule"
 
 #: ../ui/evolution-mail-message.xml.h:16
-#, fuzzy
 msgid "Create a Search Folder for these recipients"
-msgstr "Create a vFolder for these recipients"
+msgstr "Create a Search Folder for these recipients"
 
 #: ../ui/evolution-mail-message.xml.h:17
-#, fuzzy
 msgid "Create a Search Folder for this mailing list"
-msgstr "Create a vFolder for this mailing list"
+msgstr "Create a Search Folder for this mailing list"
 
 #: ../ui/evolution-mail-message.xml.h:18
-#, fuzzy
 msgid "Create a Search Folder for this sender"
-msgstr "Create a vFolder for this sender"
+msgstr "Create a Search Folder for this sender"
 
 #: ../ui/evolution-mail-message.xml.h:19
-#, fuzzy
 msgid "Create a Search Folder for this subject"
-msgstr "Create a vFolder for this subject"
+msgstr "Create a Search Folder for this subject"
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages from this sender"
@@ -18321,9 +17757,8 @@ msgid "Increase the text size"
 msgstr "Increase the text size"
 
 #: ../ui/evolution-mail-message.xml.h:49
-#, fuzzy
 msgid "Mar_k as"
-msgstr "Mar_k as Read"
+msgstr "Mar_k as"
 
 #: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
@@ -18354,9 +17789,8 @@ msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
 #: ../ui/evolution-mail-message.xml.h:57
-#, fuzzy
 msgid "Message Source"
-msgstr "Message Body"
+msgstr "Message Source"
 
 #: ../ui/evolution-mail-message.xml.h:58
 msgid "Move"
@@ -18399,9 +17833,8 @@ msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
 #: ../ui/evolution-mail-message.xml.h:70
-#, fuzzy
 msgid "Pos_t New Message to Folder"
-msgstr "Post Ne_w Message"
+msgstr "Pos_t New Message to Folder"
 
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
@@ -18444,38 +17877,32 @@ msgid "Save the message as a text file"
 msgstr "Save the message as a text file"
 
 #: ../ui/evolution-mail-message.xml.h:87
-#, fuzzy
 msgid "Search Folder from Mailing _List..."
-msgstr "vFolder on Mailing _List..."
+msgstr "Search Folder from Mailing _List..."
 
 #: ../ui/evolution-mail-message.xml.h:88
-#, fuzzy
 msgid "Search Folder from Recipients..."
-msgstr "vFolder on _Recipients..."
+msgstr "Search Folder from Recipients..."
 
 #: ../ui/evolution-mail-message.xml.h:89
-#, fuzzy
 msgid "Search Folder from S_ubject..."
-msgstr "vFolder on _Subject..."
+msgstr "Search Folder from S_ubject..."
 
 #: ../ui/evolution-mail-message.xml.h:90
-#, fuzzy
 msgid "Search Folder from Sen_der..."
-msgstr "vFolder on Se_nder..."
+msgstr "Search Folder from Sen_der..."
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Search for text in the body of the displayed message"
 
 #: ../ui/evolution-mail-message.xml.h:92
-#, fuzzy
 msgid "Select _All Text"
-msgstr "Select all text"
+msgstr "Select _All Text"
 
 #: ../ui/evolution-mail-message.xml.h:93
-#, fuzzy
 msgid "Select all the text in a message"
-msgstr "Select all visible messages"
+msgstr "Select all the text in a message"
 
 #: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
@@ -18502,89 +17929,76 @@ msgid "Un-delete the selected messages"
 msgstr "Un-delete the selected messages"
 
 #: ../ui/evolution-mail-message.xml.h:100
-#, fuzzy
 msgid "Uni_mportant"
-msgstr "Important"
+msgstr "Uni_mportant"
 
 #: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
-msgstr ""
+msgstr "Zoom _Out"
 
 #: ../ui/evolution-mail-message.xml.h:102
-#, fuzzy
 msgid "_Caret Mode"
-msgstr "Caret _Mode"
+msgstr "_Caret Mode"
 
 #: ../ui/evolution-mail-message.xml.h:105
-#, fuzzy
 msgid "_Delete Message"
-msgstr "Hide _Deleted Messages"
+msgstr "_Delete Message"
 
 #: ../ui/evolution-mail-message.xml.h:107
-#, fuzzy
 msgid "_Find in Message..."
-msgstr "Find in Message"
+msgstr "_Find in Message..."
 
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Go To"
 msgstr "_Go To"
 
 #: ../ui/evolution-mail-message.xml.h:110
-#, fuzzy
 msgid "_Important"
-msgstr "Important"
+msgstr "_Important"
 
 #: ../ui/evolution-mail-message.xml.h:111
-#, fuzzy
 msgid "_Junk"
-msgstr "Junk"
+msgstr "_Junk"
 
 #: ../ui/evolution-mail-message.xml.h:112
-#, fuzzy
 msgid "_Load Images"
-msgstr "Load _Images"
+msgstr "_Load Images"
 
 #: ../ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
 msgstr "_Next Message"
 
 #: ../ui/evolution-mail-message.xml.h:116
-#, fuzzy
 msgid "_Normal Size"
-msgstr "Normal"
+msgstr "_Normal Size"
 
 #: ../ui/evolution-mail-message.xml.h:117
-#, fuzzy
 msgid "_Not Junk"
-msgstr "Not Junk"
+msgstr "_Not Junk"
 
 #: ../ui/evolution-mail-message.xml.h:118
-#, fuzzy
 msgid "_Open in New Window"
-msgstr "Open in _New Window"
+msgstr "_Open in New Window"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
 #: ../ui/evolution-mail-message.xml.h:123
-#, fuzzy
 msgid "_Save Message..."
-msgstr "Save Message..."
+msgstr "_Save Message..."
 
 #: ../ui/evolution-mail-message.xml.h:124
-#, fuzzy
 msgid "_Undelete Message"
-msgstr "_Next Message"
+msgstr "_Undelete Message"
 
 #: ../ui/evolution-mail-message.xml.h:125
-#, fuzzy
 msgid "_Unread"
-msgstr "Mark as _Unread"
+msgstr "_Unread"
 
 #: ../ui/evolution-mail-message.xml.h:126
 msgid "_Zoom In"
-msgstr ""
+msgstr "_Zoom In"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18597,23 +18011,27 @@ msgstr ""
 msgid "Close"
 msgstr "Close"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3
+#: ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Main toolbar"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Close"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
+#: ../ui/evolution-subscribe.xml.h:11
+#: ../ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_File"
 
@@ -18627,7 +18045,7 @@ msgstr "Attach a file"
 
 #: ../ui/evolution-message-composer.xml.h:3
 msgid "Check to get delivery notification when your message is read"
-msgstr ""
+msgstr "Check to get delivery notification when your message is read"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18648,9 +18066,8 @@ msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
 #: ../ui/evolution-message-composer.xml.h:8
-#, fuzzy
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr "Encrypt this message with your S/MIME Encryption Certificate"
 
 #: ../ui/evolution-message-composer.xml.h:9
 #: ../ui/evolution-signature-editor.xml.h:14
@@ -18674,9 +18091,8 @@ msgid "PGP Sign"
 msgstr "PGP Sign"
 
 #: ../ui/evolution-message-composer.xml.h:15
-#, fuzzy
 msgid "Request read receipt"
-msgstr "Read Receipts"
+msgstr "Request read receipt"
 
 #: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
@@ -18691,9 +18107,8 @@ msgid "Save As"
 msgstr "Save As"
 
 #: ../ui/evolution-message-composer.xml.h:20
-#, fuzzy
 msgid "Save Draft"
-msgstr "Save _Draft"
+msgstr "Save Draft"
 
 #: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
@@ -18704,9 +18119,8 @@ msgid "Save _Draft"
 msgstr "Save _Draft"
 
 #: ../ui/evolution-message-composer.xml.h:23
-#, fuzzy
 msgid "Save as draft"
-msgstr "Save _Draft"
+msgstr "Save as draft"
 
 #: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
@@ -19018,9 +18432,8 @@ msgid "_About Evolution..."
 msgstr "_About Evolution..."
 
 #: ../ui/evolution.xml.h:34
-#, fuzzy
 msgid "_Close Window"
-msgstr "Close this window"
+msgstr "_Close Window"
 
 #: ../ui/evolution.xml.h:37
 msgid "_Help"
@@ -19047,9 +18460,8 @@ msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
 #: ../ui/evolution.xml.h:43
-#, fuzzy
 msgid "_Quit"
-msgstr "C_ut"
+msgstr "_Quit"
 
 #: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
@@ -19057,11 +18469,11 @@ msgstr "_Send / Receive"
 
 #: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
-msgstr ""
+msgstr "_Switcher Appearance"
 
 #: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
-msgstr ""
+msgstr "_Synchronization Options..."
 
 #: ../ui/evolution.xml.h:47
 msgid "_Text only"
@@ -19158,41 +18570,36 @@ msgstr "TimeZone Combobox"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:188
-#, fuzzy
 msgid "Collection"
-msgstr "location"
+msgstr "Collection"
 
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for %s"
-msgstr "Define Views..."
+msgstr "Define Views for %s"
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
-#, fuzzy
 msgid "Define Views"
-msgstr "Define Views..."
+msgstr "Define Views"
 
 #: ../widgets/menus/gal-define-views.glade.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "Define Views..."
+msgstr "Define Views for \"%s\""
 
 #: ../widgets/menus/gal-define-views.glade.h:5
-#, fuzzy
 msgid "_Edit..."
-msgstr "_Edit"
+msgstr "_Edit..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
 #: ../widgets/table/e-table-header-item.c:1845
@@ -19202,23 +18609,20 @@ msgid "Table"
 msgstr "Table"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
-#, fuzzy
 msgid "Instance"
-msgstr "All Instances"
+msgstr "Instance"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
-#, fuzzy
 msgid "Save Current View"
-msgstr "Current View"
+msgstr "Save Current View"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
-#, fuzzy
 msgid "_Create new view"
-msgstr "Create a new test item"
+msgstr "_Create new view"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
 msgid "_Replace existing view"
-msgstr ""
+msgstr "_Replace existing view"
 
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
@@ -19238,16 +18642,15 @@ msgstr "Define New View"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
-msgstr ""
+msgstr "Name of new view:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
-#, fuzzy
 msgid "Type of View"
-msgstr "Day View"
+msgstr "Type of View"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
-msgstr ""
+msgstr "Type of view:"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
@@ -19260,7 +18663,8 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
 msgstr "Previous Button"
 
@@ -19269,8 +18673,10 @@ msgid "Month Calendar"
 msgstr "Month Calendar"
 
 #: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285
+#: ../widgets/text/e-text.c:3540
 #: ../widgets/text/e-text.c:3541
 msgid "Fill color"
 msgstr "Fill colour"
@@ -19278,63 +18684,71 @@ msgstr "Fill colour"
 #: ../widgets/misc/e-canvas-background.c:463
 #: ../widgets/misc/e-canvas-background.c:464
 #: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/text/e-entry.c:1291
+#: ../widgets/text/e-entry.c:1292
+#: ../widgets/text/e-entry.c:1298
+#: ../widgets/text/e-entry.c:1299
+#: ../widgets/text/e-text.c:3547
+#: ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3555
 #: ../widgets/text/e-text.c:3556
 msgid "GDK fill color"
 msgstr "GDK fill colour"
 
 #: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306
+#: ../widgets/text/e-text.c:3562
 #: ../widgets/text/e-text.c:3563
 msgid "Fill stipple"
 msgstr "Fill stipple"
 
 #: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
-#, fuzzy
 msgid "X1"
-msgstr "1"
+msgstr "X1"
 
 #: ../widgets/misc/e-canvas-background.c:491
 #: ../widgets/misc/e-canvas-background.c:492
 msgid "X2"
-msgstr ""
+msgstr "X2"
 
 #: ../widgets/misc/e-canvas-background.c:498
 #: ../widgets/misc/e-canvas-background.c:499
-#, fuzzy
 msgid "Y1"
-msgstr "1"
+msgstr "Y1"
 
 #: ../widgets/misc/e-canvas-background.c:505
 #: ../widgets/misc/e-canvas-background.c:506
 msgid "Y2"
-msgstr ""
+msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/misc/e-canvas-vbox.c:102
+#: ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3005
 msgid "Minimum width"
 msgstr "Minimum width"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
+#: ../widgets/misc/e-canvas-vbox.c:103
+#: ../widgets/misc/e-reflow.c:1431
 #: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-item.c:3006
 msgid "Minimum Width"
 msgstr "Minimum Width"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:114
+#: ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Spacing"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:232
+#: ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "Now"
 
@@ -19395,13 +18809,16 @@ msgstr "Western European"
 msgid "Western European, New"
 msgstr "Western European, New"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:91
+#: ../widgets/misc/e-charset-picker.c:92
 #: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Traditional"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Simplified"
 
@@ -19480,12 +18897,8 @@ msgid "Use underline"
 msgstr "Use underline"
 
 #: ../widgets/misc/e-expander.c:198
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgstr "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 
 #: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
@@ -19499,11 +18912,13 @@ msgstr "Label widget"
 msgid "A widget to display in place of the usual expander label"
 msgstr "A widget to display in place of the usual expander label"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:222
+#: ../widgets/table/e-tree.c:3318
 msgid "Expander Size"
 msgstr "Expander Size"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:223
+#: ../widgets/table/e-tree.c:3319
 msgid "Size of the expander arrow"
 msgstr "Size of the expander arrow"
 
@@ -19528,18 +18943,20 @@ msgstr "Search Editor"
 msgid "Save Search"
 msgstr "Save Search"
 
-#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92
+#: ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Save Search..."
 
-#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93
+#: ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searches..."
 
-#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.h:94
+#: ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
-msgstr "Advanced Search"
+msgstr "_Advanced Search..."
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
@@ -19550,12 +18967,8 @@ msgid "World Map"
 msgstr "World Map"
 
 #: ../widgets/misc/e-map.c:649
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
-msgstr ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
+msgstr "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -19569,20 +18982,20 @@ msgstr "Sync Private Records:"
 msgid "Sync Categories:"
 msgstr "Sync Categories:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1453
 msgid "Empty message"
-msgstr "_Edit message"
+msgstr "Empty message"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1460
 msgid "Reflow model"
-msgstr "Selection model"
+msgstr "Reflow model"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1467
 msgid "Column width"
-msgstr "Column Width"
+msgstr "Column width"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
@@ -19598,7 +19011,8 @@ msgstr "_Search"
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Clear"
 
@@ -19614,8 +19028,10 @@ msgstr "Item ID"
 msgid "Subitem ID"
 msgstr "Subitem ID"
 
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
+#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250
+#: ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "Text"
@@ -19709,9 +19125,8 @@ msgid "R_eply requested"
 msgstr "R_eply requested"
 
 #: ../widgets/misc/e-send-options.glade.h:18
-#, fuzzy
 msgid "Sta_tus Tracking"
-msgstr "Sta_tus  Tracking"
+msgstr "Sta_tus Tracking"
 
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
@@ -19730,18 +19145,16 @@ msgid "W_ithin"
 msgstr "W_ithin"
 
 #: ../widgets/misc/e-send-options.glade.h:24
-#, fuzzy
 msgid "When acce_pted:"
-msgstr "When acce_pted: "
+msgstr "When acce_pted:"
 
 #: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "When co_mpleted:"
 
 #: ../widgets/misc/e-send-options.glade.h:26
-#, fuzzy
 msgid "When decli_ned:"
-msgstr "When decli_ned:    "
+msgstr "When decli_ned:"
 
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
@@ -19760,9 +19173,8 @@ msgid "_Delivered"
 msgstr "_Delivered"
 
 #: ../widgets/misc/e-send-options.glade.h:32
-#, fuzzy
 msgid "_Set expiration date"
-msgstr "_Set expiration  date"
+msgstr "_Set expiration date"
 
 #: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
@@ -19773,9 +19185,8 @@ msgid "_When convenient"
 msgstr "_When convenient"
 
 #: ../widgets/misc/e-send-options.glade.h:35
-#, fuzzy
 msgid "_When opened:"
-msgstr "_When opened:     "
+msgstr "_When opened:"
 
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
@@ -19793,21 +19204,19 @@ msgstr "click here to go to url"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
-msgstr ""
+msgstr "Edit Master Category List..."
 
 #: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
-msgstr ""
+msgstr "Item(s) belong to these _categories:"
 
 #: ../widgets/misc/gal-categories.glade.h:4
-#, fuzzy
 msgid "_Available Categories:"
-msgstr "_Categories"
+msgstr "_Available Categories:"
 
 #: ../widgets/misc/gal-categories.glade.h:5
-#, fuzzy
 msgid "categories"
-msgstr "Categories"
+msgstr "categories"
 
 #: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
@@ -19850,15 +19259,13 @@ msgid "BG Color Column"
 msgstr "BG Colour Column"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:1
-#, fuzzy
 msgid "<- _Remove"
-msgstr "_Remove"
+msgstr "<- _Remove"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
-#, fuzzy
 msgid "A_vailable Fields:"
-msgstr "Writable Fields"
+msgstr "A_vailable Fields:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
@@ -19867,9 +19274,8 @@ msgstr "Ascending"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
-#, fuzzy
 msgid "Clear All"
-msgstr "Cl_ear Flag"
+msgstr "Clear All"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
@@ -19878,48 +19284,43 @@ msgstr "Descending"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:8
 #: ../widgets/table/e-table-config.glade.h:7
-#, fuzzy
 msgid "Group Items By"
-msgstr "_Group By..."
+msgstr "Group Items By"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Move _Down"
-msgstr ""
+msgstr "Move _Down"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
-#, fuzzy
 msgid "Move _Up"
-msgstr "Move"
+msgstr "Move _Up"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:11
 msgid "Sh_ow these fields in order:"
-msgstr ""
+msgstr "Sh_ow these fields in order:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
 #: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
-#, fuzzy
 msgid "Show Fields"
-msgstr "_To Field"
+msgstr "Show Fields"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show field in View"
-msgstr ""
+msgstr "Show field in View"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:12
-#, fuzzy
 msgid "Sort"
-msgstr "Sorter"
+msgstr "Sort"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:15
 #: ../widgets/table/e-table-config.glade.h:13
-#, fuzzy
 msgid "Sort Items By"
-msgstr "Sort"
+msgstr "Sort Items By"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:16
 #: ../widgets/table/e-table-config.glade.h:14
@@ -19927,30 +19328,30 @@ msgid "Then By"
 msgstr "Then By"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:17
-#, fuzzy
 msgid "_Add ->"
-msgstr "_Add"
+msgstr "_Add ->"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "_Fields Shown..."
-msgstr ""
+msgstr "_Fields Shown..."
 
 #: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-#, fuzzy
 msgid "_Sort..."
-msgstr "_Import..."
+msgstr "_Sort..."
 
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "State"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:307
+#: ../widgets/table/e-table-config.c:349
 msgid "(Ascending)"
 msgstr "(Ascending)"
 
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:307
+#: ../widgets/table/e-table-config.c:349
 msgid "(Descending)"
 msgstr "(Descending)"
 
@@ -19963,18 +19364,16 @@ msgid "No grouping"
 msgstr "No grouping"
 
 #: ../widgets/table/e-table-config.c:584
-#, fuzzy
 msgid "Available Fields"
-msgstr "Writable Fields"
+msgstr "Available Fields"
 
 #: ../widgets/table/e-table-config.glade.h:17
-#, fuzzy
 msgid "_Group By..."
 msgstr "_Group By..."
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
-msgstr ""
+msgstr "_Show these fields in order:"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:646
@@ -19995,41 +19394,43 @@ msgid "Add a column..."
 msgstr "Add a column..."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
-#, fuzzy
 msgid "Field Chooser"
-msgstr "Field Name"
+msgstr "Field Chooser"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:2
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
 
 #: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s : %s (%d item)"
-msgstr ""
+msgstr "%s : %s (%d item)"
 
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
 msgid "%s : %s (%d items)"
-msgstr ""
+msgstr "%s : %s (%d items)"
 
 #: ../widgets/table/e-table-group-container.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d item)"
-msgstr "%s (%d%% complete)"
+msgstr "%s (%d item)"
 
 #: ../widgets/table/e-table-group-container.c:357
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d items)"
-msgstr "%s (%d%% complete)"
+msgstr "%s (%d items)"
 
 #: ../widgets/table/e-table-group-container.c:901
 #: ../widgets/table/e-table-group-container.c:902
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2963
+#: ../widgets/table/e-table-item.c:2964
 msgid "Alternating Row Colors"
 msgstr "Alternating Row Colours"
 
@@ -20037,8 +19438,10 @@ msgstr "Alternating Row Colours"
 #: ../widgets/table/e-table-group-container.c:909
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2970
+#: ../widgets/table/e-table-item.c:2971
+#: ../widgets/table/e-tree.c:3271
+#: ../widgets/table/e-tree.c:3272
 msgid "Horizontal Draw Grid"
 msgstr "Horizontal Draw Grid"
 
@@ -20046,8 +19449,10 @@ msgstr "Horizontal Draw Grid"
 #: ../widgets/table/e-table-group-container.c:916
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2977
+#: ../widgets/table/e-table-item.c:2978
+#: ../widgets/table/e-tree.c:3277
+#: ../widgets/table/e-tree.c:3278
 msgid "Vertical Draw Grid"
 msgstr "Vertical Draw Grid"
 
@@ -20055,8 +19460,10 @@ msgstr "Vertical Draw Grid"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2984
+#: ../widgets/table/e-table-item.c:2985
+#: ../widgets/table/e-tree.c:3283
+#: ../widgets/table/e-tree.c:3284
 msgid "Draw focus"
 msgstr "Draw focus"
 
@@ -20064,7 +19471,8 @@ msgstr "Draw focus"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:2991
+#: ../widgets/table/e-table-item.c:2992
 msgid "Cursor mode"
 msgstr "Cursor mode"
 
@@ -20072,7 +19480,8 @@ msgstr "Cursor mode"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2956
+#: ../widgets/table/e-table-item.c:2957
 msgid "Selection model"
 msgstr "Selection model"
 
@@ -20080,8 +19489,10 @@ msgstr "Selection model"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
+#: ../widgets/table/e-table-item.c:2998
+#: ../widgets/table/e-table-item.c:2999
+#: ../widgets/table/e-table.c:3316
+#: ../widgets/table/e-tree.c:3265
 #: ../widgets/table/e-tree.c:3266
 msgid "Length Threshold"
 msgstr "Length Threshold"
@@ -20090,8 +19501,10 @@ msgstr "Length Threshold"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-table-item.c:3032
+#: ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table.c:3323
+#: ../widgets/table/e-tree.c:3297
 #: ../widgets/table/e-tree.c:3298
 msgid "Uniform row height"
 msgstr "Uniform row height"
@@ -20151,7 +19564,8 @@ msgstr "Format Columns..."
 msgid "Customize Current View..."
 msgstr "Customise Current View..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1817
+#: ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Fontset"
@@ -20167,20 +19581,20 @@ msgstr "Sort Info"
 msgid "Tree"
 msgstr "Tree"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
-#, fuzzy
+#: ../widgets/table/e-table-item.c:2942
+#: ../widgets/table/e-table-item.c:2943
 msgid "Table header"
-msgstr "Malformed header"
+msgstr "Table header"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
-#, fuzzy
+#: ../widgets/table/e-table-item.c:2949
+#: ../widgets/table/e-table-item.c:2950
 msgid "Table model"
-msgstr "Table Cell"
+msgstr "Table model"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
-#, fuzzy
+#: ../widgets/table/e-table-item.c:3025
+#: ../widgets/table/e-table-item.c:3026
 msgid "Cursor row"
-msgstr "Cursor Row"
+msgstr "Cursor row"
 
 #: ../widgets/table/e-table.c:3330
 msgid "Always Search"
@@ -20190,11 +19604,13 @@ msgstr "Always Search"
 msgid "Use click to add"
 msgstr "Use click to add"
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3290
+#: ../widgets/table/e-tree.c:3291
 msgid "ETree table adapter"
 msgstr "ETree table adapter"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-tree.c:3305
 msgid "Always search"
 msgstr "Always search"
 
@@ -20208,144 +19624,181 @@ msgstr "Draw lines and +/- expanders."
 
 #: ../widgets/text/e-entry-test.c:49
 msgid "Minicard Test"
-msgstr ""
+msgstr "Minicard Test"
 
 #: ../widgets/text/e-entry-test.c:50
-#, fuzzy
 msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright (C) 2000, Helix Code, Inc."
 
 #: ../widgets/text/e-entry-test.c:52
-#, fuzzy
 msgid "This should test the minicard canvas item"
-msgstr "This should test the contact print code"
+msgstr "This should test the minicard canvas item"
 
-#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-entry.c:1242
+#: ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-text.c:3455
+#: ../widgets/text/e-text.c:3456
 msgid "Event Processor"
 msgstr "Event Processor"
 
-#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-#, fuzzy
+#: ../widgets/text/e-entry.c:1256
+#: ../widgets/text/e-entry.c:1257
 msgid "Font"
-msgstr "Fonts"
+msgstr "Font"
 
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#, fuzzy
+#: ../widgets/text/e-entry.c:1270
+#: ../widgets/text/e-entry.c:1271
 msgid "GDKFont"
-msgstr "Fonts"
+msgstr "GDKFont"
 
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-entry.c:1277
+#: ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3491
+#: ../widgets/text/e-text.c:3492
 msgid "Justification"
 msgstr "Justification"
 
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-entry.c:1319
+#: ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3592
 msgid "Use ellipsis"
 msgstr "Use ellipsis"
 
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-entry.c:1326
+#: ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3599
 msgid "Ellipsis"
 msgstr "Ellipsis"
 
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-entry.c:1333
+#: ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3606
 msgid "Line wrap"
 msgstr "Line wrap"
 
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-entry.c:1340
+#: ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3613
 msgid "Break characters"
 msgstr "Break characters"
 
-#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-entry.c:1347
+#: ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3620
 msgid "Max lines"
 msgstr "Max lines"
 
-#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-entry.c:1354
+#: ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-text.c:3649
 msgid "Allow newlines"
 msgstr "Allow newlines"
 
-#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-entry.c:1361
+#: ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-text.c:3642
 msgid "Draw borders"
 msgstr "Draw borders"
 
-#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-entry.c:1368
+#: ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-text.c:3655
+#: ../widgets/text/e-text.c:3656
 msgid "Draw background"
 msgstr "Draw background"
 
-#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-entry.c:1375
+#: ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-text.c:3662
+#: ../widgets/text/e-text.c:3663
 msgid "Draw button"
 msgstr "Draw button"
 
-#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-entry.c:1382
+#: ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-text.c:3669
+#: ../widgets/text/e-text.c:3670
 msgid "Cursor position"
 msgstr "Cursor position"
 
-#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+#: ../widgets/text/e-entry.c:1389
+#: ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
-msgstr ""
+msgstr "Emulate label resize"
 
 #: ../widgets/text/e-text.c:2696
 msgid "Input Methods"
 msgstr "Input Methods"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3469
+#: ../widgets/text/e-text.c:3470
 msgid "Bold"
 msgstr "Bold"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3476
+#: ../widgets/text/e-text.c:3477
 msgid "Strikeout"
 msgstr "Strikeout"
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3483
+#: ../widgets/text/e-text.c:3484
 msgid "Anchor"
 msgstr "Anchor"
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3499
 msgid "Clip Width"
 msgstr "Clip Width"
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3506
 msgid "Clip Height"
 msgstr "Clip Height"
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3513
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3519
+#: ../widgets/text/e-text.c:3520
 msgid "Fill clip rectangle"
 msgstr "Fill clip rectangle"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3526
+#: ../widgets/text/e-text.c:3527
 msgid "X Offset"
 msgstr "X Offset"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3534
 msgid "Y Offset"
 msgstr "Y Offset"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3569
+#: ../widgets/text/e-text.c:3570
 msgid "Text width"
 msgstr "Text width"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3576
+#: ../widgets/text/e-text.c:3577
 msgid "Text height"
 msgstr "Text height"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3676
+#: ../widgets/text/e-text.c:3677
 msgid "IM Context"
 msgstr "IM Context"
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "Handle Popup"
+