Updated British translation.
authorDavid Lodge <dave@cirt.net>
Sun, 30 Jan 2005 21:36:56 +0000 (21:36 +0000)
committerDavid Lodge <dlodge@src.gnome.org>
Sun, 30 Jan 2005 21:36:56 +0000 (21:36 +0000)
2005-01-30  David Lodge <dave@cirt.net>

        * en_GB.po: Updated British translation.

po/ChangeLog
po/en_GB.po

index bb661fc..a21f0c6 100644 (file)
@@ -1,3 +1,7 @@
+2005-01-30  David Lodge <dave@cirt.net>
+                                                                                
+        * en_GB.po: Updated British translation.
+                                                                                
 2005-01-28  Vincent van Adrighem  <adrighem@gnome.org>
 
        * nl.po: Translation updated by Daniel van Eeden.
index 706be8f..0fb5420 100644 (file)
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-14 15:54+0800\n"
-"PO-Revision-Date: 2004-10-13 22:03+0100\n"
+"POT-Creation-Date: 2005-01-30 21:40+0000\n"
+"PO-Revision-Date: 2005-01-30 21:42+0100\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -62,82 +62,117 @@ msgid "Error performing search"
 msgstr "Error performing search"
 
 #. translators: the placeholders will be filled by
-#. * function names, e.g.
 #. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: addressbook/libebook/e-book.c:240 addressbook/libebook/e-book.c:244
-#: addressbook/libebook/e-book.c:446 addressbook/libebook/e-book.c:450
-#: addressbook/libebook/e-book.c:579 addressbook/libebook/e-book.c:583
-#: addressbook/libebook/e-book.c:672 addressbook/libebook/e-book.c:676
-#: addressbook/libebook/e-book.c:952 addressbook/libebook/e-book.c:957
-#: addressbook/libebook/e-book.c:1132 addressbook/libebook/e-book.c:1136
-#: addressbook/libebook/e-book.c:1277 addressbook/libebook/e-book.c:1281
-#: addressbook/libebook/e-book.c:1479 addressbook/libebook/e-book.c:1483
-#: addressbook/libebook/e-book.c:1684 addressbook/libebook/e-book.c:1688
-#: addressbook/libebook/e-book.c:1910 addressbook/libebook/e-book.c:1914
-#: addressbook/libebook/e-book.c:2117 addressbook/libebook/e-book.c:2121
+#: addressbook/libebook/e-book.c:240
+#: addressbook/libebook/e-book.c:244
+#: addressbook/libebook/e-book.c:446
+#: addressbook/libebook/e-book.c:450
+#: addressbook/libebook/e-book.c:579
+#: addressbook/libebook/e-book.c:583
+#: addressbook/libebook/e-book.c:672
+#: addressbook/libebook/e-book.c:676
+#: addressbook/libebook/e-book.c:952
+#: addressbook/libebook/e-book.c:957
+#: addressbook/libebook/e-book.c:1132
+#: addressbook/libebook/e-book.c:1136
+#: addressbook/libebook/e-book.c:1277
+#: addressbook/libebook/e-book.c:1281
+#: addressbook/libebook/e-book.c:1479
+#: addressbook/libebook/e-book.c:1483
+#: addressbook/libebook/e-book.c:1684
+#: addressbook/libebook/e-book.c:1688
+#: addressbook/libebook/e-book.c:1910
+#: addressbook/libebook/e-book.c:1914
+#: addressbook/libebook/e-book.c:2117
+#: addressbook/libebook/e-book.c:2121
 #: addressbook/libebook/e-book.c:3200
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "\"%s\" on book before \"%s\""
 
-#: addressbook/libebook/e-book.c:253 addressbook/libebook/e-book.c:459
-#: addressbook/libebook/e-book.c:592 addressbook/libebook/e-book.c:685
-#: addressbook/libebook/e-book.c:967 addressbook/libebook/e-book.c:1146
-#: addressbook/libebook/e-book.c:1291 addressbook/libebook/e-book.c:1492
-#: addressbook/libebook/e-book.c:1697 addressbook/libebook/e-book.c:1924
-#: addressbook/libebook/e-book.c:2130 addressbook/libebook/e-book.c:2468
+#: addressbook/libebook/e-book.c:253
+#: addressbook/libebook/e-book.c:459
+#: addressbook/libebook/e-book.c:592
+#: addressbook/libebook/e-book.c:685
+#: addressbook/libebook/e-book.c:967
+#: addressbook/libebook/e-book.c:1146
+#: addressbook/libebook/e-book.c:1291
+#: addressbook/libebook/e-book.c:1492
+#: addressbook/libebook/e-book.c:1697
+#: addressbook/libebook/e-book.c:1924
+#: addressbook/libebook/e-book.c:2130
+#: addressbook/libebook/e-book.c:2468
 #: addressbook/libebook/e-book.c:2664
 msgid "book busy"
 msgstr "book busy"
 
-#: addressbook/libebook/e-book.c:286 addressbook/libebook/e-book.c:290
-#: addressbook/libebook/e-book.c:492 addressbook/libebook/e-book.c:496
-#: addressbook/libebook/e-book.c:621 addressbook/libebook/e-book.c:625
-#: addressbook/libebook/e-book.c:714 addressbook/libebook/e-book.c:718
-#: addressbook/libebook/e-book.c:996 addressbook/libebook/e-book.c:999
-#: addressbook/libebook/e-book.c:1178 addressbook/libebook/e-book.c:1181
-#: addressbook/libebook/e-book.c:1320 addressbook/libebook/e-book.c:1324
-#: addressbook/libebook/e-book.c:1528 addressbook/libebook/e-book.c:1532
-#: addressbook/libebook/e-book.c:1744 addressbook/libebook/e-book.c:1748
-#: addressbook/libebook/e-book.c:1956 addressbook/libebook/e-book.c:1960
-#: addressbook/libebook/e-book.c:2158 addressbook/libebook/e-book.c:2162
-#: addressbook/libebook/e-book.c:2409 addressbook/libebook/e-book.c:2496
-#: addressbook/libebook/e-book.c:2500 addressbook/libebook/e-book.c:2692
-#: addressbook/libebook/e-book.c:2696 addressbook/libebook/e-book.c:3209
+#: addressbook/libebook/e-book.c:286
+#: addressbook/libebook/e-book.c:290
+#: addressbook/libebook/e-book.c:492
+#: addressbook/libebook/e-book.c:496
+#: addressbook/libebook/e-book.c:621
+#: addressbook/libebook/e-book.c:625
+#: addressbook/libebook/e-book.c:714
+#: addressbook/libebook/e-book.c:718
+#: addressbook/libebook/e-book.c:996
+#: addressbook/libebook/e-book.c:999
+#: addressbook/libebook/e-book.c:1178
+#: addressbook/libebook/e-book.c:1181
+#: addressbook/libebook/e-book.c:1320
+#: addressbook/libebook/e-book.c:1324
+#: addressbook/libebook/e-book.c:1528
+#: addressbook/libebook/e-book.c:1532
+#: addressbook/libebook/e-book.c:1744
+#: addressbook/libebook/e-book.c:1748
+#: addressbook/libebook/e-book.c:1956
+#: addressbook/libebook/e-book.c:1960
+#: addressbook/libebook/e-book.c:2158
+#: addressbook/libebook/e-book.c:2162
+#: addressbook/libebook/e-book.c:2409
+#: addressbook/libebook/e-book.c:2496
+#: addressbook/libebook/e-book.c:2500
+#: addressbook/libebook/e-book.c:2692
+#: addressbook/libebook/e-book.c:2696
+#: addressbook/libebook/e-book.c:3209
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA exception making \"%s\" call"
 
 #: addressbook/libebook/e-book.c:2390
-msgid "e_book_cancel: there is no current operation"
-msgstr "e_book_cancel: there is no current operation"
+#, c-format
+msgid "%s: there is no current operation"
+msgstr "%s: there is no current operation"
 
 #: addressbook/libebook/e-book.c:2425
-msgid "e_book_cancel: couldn't cancel"
-msgstr "e_book_cancel: couldn't cancel"
+#, c-format
+msgid "%s: couldn't cancel"
+msgstr "%s: couldn't cancel"
 
-#: addressbook/libebook/e-book.c:2454 addressbook/libebook/e-book.c:2458
+#: addressbook/libebook/e-book.c:2454
+#: addressbook/libebook/e-book.c:2458
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "\"%s\" on book after \"%s\""
 
 #: addressbook/libebook/e-book.c:2524
-msgid "e_book_open: cancelled"
-msgstr "e_book_open: cancelled"
+#, c-format
+msgid "%s: cancelled"
+msgstr "%s: cancelled"
 
 #: addressbook/libebook/e-book.c:3066
-msgid "e_book_load_uri: Invalid source."
-msgstr "e_book_load_uri: Invalid source."
+#, c-format
+msgid "%s: Invalid source."
+msgstr "%s: Invalid source."
 
 #: addressbook/libebook/e-book.c:3074
 #, c-format
-msgid "e_book_load_uri: no factories available for uri `%s'"
-msgstr "e_book_load_uri: no factories available for uri `%s'"
+msgid "%s: no factories available for uri `%s'"
+msgstr "%s: no factories available for uri `%s'"
 
 #: addressbook/libebook/e-book.c:3086
-msgid "e_book_load_uri: Could not create EBookListener"
-msgstr "e_book_load_uri: Could not create EBookListener"
+#, c-format
+msgid "%s: Could not create EBookListener"
+msgstr "%s: Could not create EBookListener"
 
 #: addressbook/libebook/e-book.c:3138
 #, c-format
@@ -145,15 +180,14 @@ msgid "e_book_new: no factories available for uri `%s'"
 msgstr "e_book_new: no factories available for uri `%s'"
 
 #: addressbook/libebook/e-book.c:3332
-msgid "e_book_get_self: there was no self contact uid stored in gconf"
-msgstr "e_book_get_self: there was no self contact uid stored in gconf"
+#, c-format
+msgid "%s: there was no self contact uid stored in gconf"
+msgstr "%s: there was no self contact uid stored in gconf"
 
 #: addressbook/libebook/e-book.c:3443
 #, c-format
-msgid ""
-"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
-msgstr ""
-"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for uid `%s' stored in gconf."
+msgstr "%s: there was no source for uid `%s' stored in gconf."
 
 #: addressbook/libebook/e-contact.c:102
 msgid "Unique ID"
@@ -164,9 +198,7 @@ msgid "File As"
 msgstr "File As"
 
 #. Name fields
-#. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
-#. vcards that don't even have a N attribute.  *sigh*)
 #: addressbook/libebook/e-contact.c:109
 msgid "Full Name"
 msgstr "Full Name"
@@ -556,7 +588,7 @@ msgid "Category List"
 msgstr "Category List"
 
 #: addressbook/libebook/e-contact.c:224
-#: libedataserverui/e-categories-dialog.c:369
+#: libedataserverui/e-categories-dialog.c:370
 msgid "Categories"
 msgstr "Categories"
 
@@ -617,44 +649,44 @@ msgstr "Birthday: %s"
 msgid "Anniversary: %s"
 msgstr "Anniversary: %s"
 
-#: calendar/backends/file/e-cal-backend-file.c:174
+#: calendar/backends/file/e-cal-backend-file.c:192
 msgid "Can't save calendar data: Malformed URI."
 msgstr "Can't save calendar data: Malformed URI."
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:484
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:496
 msgid "Invalid server URI"
 msgstr "Invalid server URI"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:531
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:534
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:543
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:546
 #: camel/providers/groupwise/camel-gw-listener.c:405
 #: camel/providers/groupwise/camel-gw-listener.c:435
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:541
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:784
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:553
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:796
 #: calendar/backends/http/e-cal-backend-http.c:484
 msgid "Could not create cache file"
 msgstr "Could not create cache file"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:551
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:563
 msgid "Could not create thread for populating cache"
 msgstr "Could not create thread for populating cache"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:557
-#: calendar/libecal/e-cal.c:4560
-#: camel/providers/groupwise/camel-groupwise-folder.c:533
-#: camel/providers/groupwise/camel-groupwise-store.c:503
-#: camel/providers/groupwise/camel-groupwise-store.c:641
-#: camel/providers/groupwise/camel-groupwise-store.c:800
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:569
+#: calendar/libecal/e-cal.c:4507
+#: camel/providers/groupwise/camel-groupwise-folder.c:598
+#: camel/providers/groupwise/camel-groupwise-store.c:516
+#: camel/providers/groupwise/camel-groupwise-store.c:597
+#: camel/providers/groupwise/camel-groupwise-store.c:751
+#: camel/providers/groupwise/camel-groupwise-store.c:915
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:776
-#, fuzzy
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:788
 msgid "Repository is Offline"
-msgstr "Repository is offline"
+msgstr "Repository is Offline"
 
 #: calendar/backends/http/e-cal-backend-http.c:240
 msgid "Redirected to Invalid URI"
@@ -796,15 +828,18 @@ msgstr "30th"
 msgid "31st"
 msgstr "31st"
 
-#: calendar/libecal/e-cal-util.c:569 calendar/libecal/e-cal-util.c:591
+#: calendar/libecal/e-cal-util.c:569
+#: calendar/libecal/e-cal-util.c:591
 msgid "High"
 msgstr "High"
 
-#: calendar/libecal/e-cal-util.c:571 calendar/libecal/e-cal-util.c:593
+#: calendar/libecal/e-cal-util.c:571
+#: calendar/libecal/e-cal-util.c:593
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/libecal/e-cal-util.c:573 calendar/libecal/e-cal-util.c:595
+#: calendar/libecal/e-cal-util.c:573
+#: calendar/libecal/e-cal-util.c:595
 msgid "Low"
 msgstr "Low"
 
@@ -814,87 +849,91 @@ msgid "Undefined"
 msgstr "Undefined"
 
 #. actually ask the client for authentication
-#: calendar/libecal/e-cal.c:1590
+#: calendar/libecal/e-cal.c:1535
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Enter password for %s (user %s)"
 
-#: calendar/libecal/e-cal.c:4532
+#: calendar/libecal/e-cal.c:4479
 msgid "Invalid argument"
 msgstr "Invalid argument"
 
-#: calendar/libecal/e-cal.c:4534
+#: calendar/libecal/e-cal.c:4481
 msgid "Backend is busy"
 msgstr "Backend is busy"
 
-#: calendar/libecal/e-cal.c:4536
+#: calendar/libecal/e-cal.c:4483
 msgid "Repository is offline"
 msgstr "Repository is offline"
 
-#: calendar/libecal/e-cal.c:4538
+#: calendar/libecal/e-cal.c:4485
 msgid "No such calendar"
 msgstr "No such calendar"
 
-#: calendar/libecal/e-cal.c:4540 servers/groupwise/e-gw-connection.c:158
+#: calendar/libecal/e-cal.c:4487
+#: servers/groupwise/e-gw-connection.c:160
 msgid "Object not found"
 msgstr "Object not found"
 
-#: calendar/libecal/e-cal.c:4542 servers/groupwise/e-gw-connection.c:154
+#: calendar/libecal/e-cal.c:4489
+#: servers/groupwise/e-gw-connection.c:154
 msgid "Invalid object"
 msgstr "Invalid object"
 
-#: calendar/libecal/e-cal.c:4544
+#: calendar/libecal/e-cal.c:4491
 msgid "URI not loaded"
 msgstr "URI not loaded"
 
-#: calendar/libecal/e-cal.c:4546
+#: calendar/libecal/e-cal.c:4493
 msgid "URI already loaded"
 msgstr "URI already loaded"
 
-#: calendar/libecal/e-cal.c:4548
+#: calendar/libecal/e-cal.c:4495
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: calendar/libecal/e-cal.c:4550 servers/groupwise/e-gw-connection.c:160
+#: calendar/libecal/e-cal.c:4497
+#: servers/groupwise/e-gw-connection.c:162
 msgid "Unknown User"
 msgstr "Unknown User"
 
-#: calendar/libecal/e-cal.c:4552
+#: calendar/libecal/e-cal.c:4499
 msgid "Object ID already exists"
 msgstr "Object ID already exists"
 
-#: calendar/libecal/e-cal.c:4554
+#: calendar/libecal/e-cal.c:4501
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
-#: calendar/libecal/e-cal.c:4556
+#: calendar/libecal/e-cal.c:4503
 msgid "Operation has been cancelled"
 msgstr "Operation has been cancelled"
 
-#: calendar/libecal/e-cal.c:4558
+#: calendar/libecal/e-cal.c:4505
 msgid "Could not cancel operation"
 msgstr "Could not cancel operation"
 
-#: calendar/libecal/e-cal.c:4562
+#: calendar/libecal/e-cal.c:4509
 #: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: calendar/libecal/e-cal.c:4564
+#: calendar/libecal/e-cal.c:4511
 msgid "A CORBA exception has occurred"
 msgstr "A CORBA exception has occurred"
 
-#: calendar/libecal/e-cal.c:4566 camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-command.c:401
-#: camel/providers/imap4/camel-imap4-store.c:294
+#: calendar/libecal/e-cal.c:4513
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-command.c:404
+#: camel/providers/imap4/camel-imap4-store.c:297
 #: camel/providers/pop3/camel-pop3-store.c:535
 #: camel/providers/pop3/camel-pop3-store.c:542
 #: camel/providers/pop3/camel-pop3-store.c:548
-#: servers/groupwise/e-gw-connection.c:166
+#: servers/groupwise/e-gw-connection.c:168
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: calendar/libecal/e-cal.c:4568
+#: calendar/libecal/e-cal.c:4515
 msgid "No error"
 msgstr "No error"
 
@@ -964,12 +1003,8 @@ msgstr "\"%s\" expects the second argument to be a string"
 
 #: calendar/libedata-cal/e-cal-backend-sexp.c:501
 #, c-format
-msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\""
-msgstr ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\""
+msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\""
+msgstr "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\""
 
 #: calendar/libedata-cal/e-cal-backend-sexp.c:624
 #, c-format
@@ -978,12 +1013,8 @@ msgstr "\"%s\" expects at least one argument"
 
 #: calendar/libedata-cal/e-cal-backend-sexp.c:638
 #, c-format
-msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
-msgstr ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
+msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+msgstr "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
 
 #: camel/camel-cipher-context.c:103
 msgid "Signing is not supported by this cipher"
@@ -1060,11 +1091,13 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resynchronising with server"
 
-#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:50
+#: camel/camel-disco-folder.c:42
+#: camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
 msgstr "Copy folder content locally for offline operation"
 
-#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:107
+#: camel/camel-disco-folder.c:104
+#: camel/camel-offline-folder.c:110
 msgid "Downloading new messages for offline mode"
 msgstr "Downloading new messages for offline mode"
 
@@ -1077,13 +1110,15 @@ msgstr "Preparing folder '%s' for offline"
 msgid "You must be working online to complete this operation"
 msgstr "You must be working online to complete this operation"
 
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:512
+#: camel/camel-filter-driver.c:669
+#: camel/camel-filter-search.c:512
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Failed to create pipe to '%s': %s"
 
-#: camel/camel-filter-driver.c:713 camel/camel-process.c:90
+#: camel/camel-filter-driver.c:713
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Failed to create child process '%s': %s"
@@ -1093,16 +1128,19 @@ msgstr "Failed to create child process '%s': %s"
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
+#: camel/camel-filter-driver.c:945
+#: camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Syncing folders"
 
-#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
+#: camel/camel-filter-driver.c:1043
+#: camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1429
+#: camel/camel-filter-driver.c:1052
+#: camel/camel-filter-driver.c:1429
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
@@ -1124,16 +1162,19 @@ msgstr "Getting message %d (%d%%)"
 msgid "Cannot open message"
 msgstr "Cannot open message"
 
-#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
+#: camel/camel-filter-driver.c:1148
+#: camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Failed on message %d"
 
-#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
+#: camel/camel-filter-driver.c:1174
+#: camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Syncing folder"
 
-#: camel/camel-filter-driver.c:1178 camel/camel-filter-driver.c:1270
+#: camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270
 msgid "Complete"
 msgstr "Complete"
 
@@ -1165,12 +1206,14 @@ msgid "Failed to create create child process '%s': %s"
 msgstr "Failed to create create child process '%s': %s"
 
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
+#: camel/camel-filter-search.c:670
+#: camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: camel/camel-folder-search.c:357 camel/camel-folder-search.c:478
+#: camel/camel-folder-search.c:357
+#: camel/camel-folder-search.c:478
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1179,7 +1222,8 @@ msgstr ""
 "Cannot parse search expression: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:367 camel/camel-folder-search.c:488
+#: camel/camel-folder-search.c:367
+#: camel/camel-folder-search.c:488
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1188,7 +1232,8 @@ msgstr ""
 "Error executing search expression: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:674 camel/camel-folder-search.c:707
+#: camel/camel-folder-search.c:674
+#: camel/camel-folder-search.c:707
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) requires a single bool result"
 
@@ -1196,7 +1241,8 @@ msgstr "(match-all) requires a single bool result"
 msgid "(match-threads) not allowed inside match-all"
 msgstr "(match-threads) not allowed inside match-all"
 
-#: camel/camel-folder-search.c:760 camel/camel-folder-search.c:764
+#: camel/camel-folder-search.c:760
+#: camel/camel-folder-search.c:764
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) requires a match type string"
 
@@ -1248,7 +1294,7 @@ msgstr "Learning non-junk"
 msgid "Filtering new message(s)"
 msgstr "Filtering new message(s)"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1259,15 +1305,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:749
+#: camel/camel-gpg-context.c:747
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: camel/camel-gpg-context.c:773
+#: camel/camel-gpg-context.c:771
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:785
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1276,26 +1322,29 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1274
+#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:1312
+#: camel/camel-gpg-context.c:1496
+#: camel/camel-gpg-context.c:1587
+#: camel/camel-gpg-context.c:1699
+#: camel/providers/nntp/camel-nntp-store.c:1274
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: camel/camel-gpg-context.c:822
+#: camel/camel-gpg-context.c:820
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Failed to unlock secret key: 3 bad passphrases given."
 
-#: camel/camel-gpg-context.c:828
+#: camel/camel-gpg-context.c:826
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: camel/camel-gpg-context.c:880
+#: camel/camel-gpg-context.c:878
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
-#: camel/camel-gpg-context.c:1157
+#: camel/camel-gpg-context.c:1155
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -1306,72 +1355,83 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1162
+#: camel/camel-gpg-context.c:1160
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Failed to GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:389
+#: camel/camel-gpg-context.c:1273
+#: camel/camel-smime-context.c:389
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1766
-#: camel/camel-gpg-context.c:1817
+#: camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1764
+#: camel/camel-gpg-context.c:1815
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1718
-#: camel/camel-gpg-context.c:1788 camel/camel-gpg-context.c:1839
+#: camel/camel-gpg-context.c:1329
+#: camel/camel-gpg-context.c:1489
+#: camel/camel-gpg-context.c:1580
+#: camel/camel-gpg-context.c:1603
+#: camel/camel-gpg-context.c:1692
+#: camel/camel-gpg-context.c:1716
+#: camel/camel-gpg-context.c:1786
+#: camel/camel-gpg-context.c:1837
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: camel/camel-gpg-context.c:1350
+#: camel/camel-gpg-context.c:1348
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:692
-#: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710
+#: camel/camel-gpg-context.c:1429
+#: camel/camel-gpg-context.c:1435
+#: camel/camel-gpg-context.c:1441
+#: camel/camel-smime-context.c:692
+#: camel/camel-smime-context.c:703
+#: camel/camel-smime-context.c:710
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: camel/camel-gpg-context.c:1477
+#: camel/camel-gpg-context.c:1475
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Cannot verify message signature: could not create temp file: %s"
 
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1563
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: camel/camel-gpg-context.c:1623
+#: camel/camel-gpg-context.c:1621
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1674
+#: camel/camel-gpg-context.c:1672
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Failed to decrypt MIME part: protocol error"
 
-#: camel/camel-gpg-context.c:1725 camel/camel-smime-context.c:966
+#: camel/camel-gpg-context.c:1723
+#: camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: camel/camel-gpg-context.c:1744
+#: camel/camel-gpg-context.c:1742
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
-#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
+#: camel/camel-gpg-context.c:1765
+#: camel/camel-gpg-context.c:1816
 #: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1465
-#: camel/providers/imap4/camel-imap4-engine.c:1504
-#: camel/providers/imap4/camel-imap4-engine.c:1549
-#: camel/providers/imap4/camel-imap4-engine.c:1605
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: camel/providers/imap4/camel-imap4-engine.c:1470
+#: camel/providers/imap4/camel-imap4-engine.c:1509
+#: camel/providers/imap4/camel-imap4-engine.c:1554
+#: camel/providers/imap4/camel-imap4-engine.c:1610
+#: camel/providers/imap4/camel-imap4-store.c:1307
 #: camel/providers/imap4/camel-imap4-utils.c:575
 #: camel/providers/smtp/camel-smtp-transport.c:163
 #: camel/providers/smtp/camel-smtp-transport.c:218
@@ -1388,7 +1448,8 @@ msgstr "Cannot build locking helper pipe: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "Cannot fork locking helper: %s"
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock-client.c:191
+#: camel/camel-lock-client.c:214
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Could not lock '%s': protocol error with lock-helper"
@@ -1398,7 +1459,8 @@ msgstr "Could not lock '%s': protocol error with lock-helper"
 msgid "Could not lock '%s'"
 msgstr "Could not lock '%s'"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock.c:92
+#: camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Could not create lock file for %s: %s"
@@ -1467,25 +1529,27 @@ msgstr "Error reading mail file: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "Error writing mail temp file: %s"
 
-#: camel/camel-movemail.c:462 camel/camel-movemail.c:529
+#: camel/camel-movemail.c:462
+#: camel/camel-movemail.c:529
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copying mail temp file: %s"
 
-#: camel/camel-multipart-signed.c:586
+#: camel/camel-multipart-signed.c:587
 msgid "parse error"
 msgstr "parse error"
 
-#: camel/camel-net-utils.c:446 camel/camel-net-utils.c:608
-#: camel/camel-net-utils.c:739 camel/providers/pop3/camel-pop3-store.c:448
+#: camel/camel-net-utils.c:446
+#: camel/camel-net-utils.c:608
+#: camel/camel-net-utils.c:739
+#: camel/providers/pop3/camel-pop3-store.c:448
 #: camel/providers/pop3/camel-pop3-store.c:529
 msgid "Cancelled"
 msgstr "Cancelled"
 
 #: camel/camel-net-utils.c:465
-#, fuzzy
 msgid "cannot create thread"
-msgstr "Cannot create CMS message"
+msgstr "cannot create thread"
 
 #: camel/camel-net-utils.c:612
 #, c-format
@@ -1493,14 +1557,13 @@ msgid "Resolving: %s"
 msgstr "Resolving: %s"
 
 #: camel/camel-net-utils.c:634
-#, fuzzy
 msgid "Host lookup failed"
-msgstr "Host lookup failed: host not found"
+msgstr "Host lookup failed"
 
 #: camel/camel-net-utils.c:636
-#, fuzzy, c-format
+#, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "Host lookup failed: %s: host not found"
+msgstr "Host lookup failed: %s: %s"
 
 #: camel/camel-net-utils.c:743
 msgid "Resolving address"
@@ -1508,22 +1571,23 @@ msgstr "Resolving address"
 
 #: camel/camel-net-utils.c:763
 msgid "Name lookup failed"
-msgstr ""
+msgstr "Name lookup failed"
 
 #: camel/camel-net-utils.c:766
-#, fuzzy, c-format
+#, c-format
 msgid "Name lookup failed: %s"
-msgstr "NNTP Command failed: %s"
+msgstr "Name lookup failed: %s"
 
-#: camel/camel-offline-folder.c:250
-#, fuzzy, c-format
+#: camel/camel-offline-folder.c:253
+#, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "Copying messages into folder %s"
+msgstr "Syncing messages in folder '%s' to disk"
 
-#: camel/camel-offline-journal.c:140 camel/camel-offline-journal.c:163
-#, fuzzy, c-format
+#: camel/camel-offline-journal.c:141
+#: camel/camel-offline-journal.c:164
+#, c-format
 msgid "Cannot write offline journal for folder `%s': %s"
-msgstr "Cannot create folder `%s': %s"
+msgstr "Cannot write offline journal for folder `%s': %s"
 
 #: camel/camel-provider.c:59
 msgid "Virtual folder email provider"
@@ -1548,7 +1612,8 @@ msgstr "Could not load %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Could not load %s: No initialisation code in module."
 
-#: camel/camel-provider.c:374 camel/camel-session.c:161
+#: camel/camel-provider.c:374
+#: camel/camel-session.c:161
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No provider available for protocol `%s'"
@@ -1561,7 +1626,8 @@ msgstr "Anonymous"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "This option will connect to the server using an anonymous login."
 
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88
+#: camel/camel-sasl-anonymous.c:112
+#: camel/camel-sasl-plain.c:88
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
@@ -1597,24 +1663,16 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:38
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
 
 #: camel/camel-sasl-digest-md5.c:49
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:51
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
+msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgstr "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
 
 #: camel/camel-sasl-digest-md5.c:814
 msgid "Server challenge too long (>2048 octets)\n"
@@ -1646,52 +1704,31 @@ msgstr "GSSAPI"
 
 #: camel/camel-sasl-gssapi.c:59
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr ""
-"This option will connect to the server using Kerberos 5 authentication."
+msgstr "This option will connect to the server using Kerberos 5 authentication."
 
 #: camel/camel-sasl-gssapi.c:157
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognised by the implementation."
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgstr "The specified mechanism is not supported by the provided credential, or is unrecognised by the implementation."
 
 #: camel/camel-sasl-gssapi.c:162
 msgid "The provided target_name parameter was ill-formed."
 msgstr "The provided target_name parameter was ill-formed."
 
 #: camel/camel-sasl-gssapi.c:165
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-msgstr ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgstr "The provided target_name parameter contained an invalid or unsupported type of name."
 
 #: camel/camel-sasl-gssapi.c:169
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-msgstr ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgstr "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
 
 #: camel/camel-sasl-gssapi.c:174
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgstr "The input_token contains an invalid signature, or a signature that could not be verified."
 
 #: camel/camel-sasl-gssapi.c:178
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
-msgstr ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
+msgstr "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
 
 #: camel/camel-sasl-gssapi.c:183
 msgid "The supplied context handle did not refer to a valid context."
@@ -1709,8 +1746,10 @@ msgstr "The consistency checks performed on the credential failed."
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: camel/camel-sasl-gssapi.c:198 camel/camel-sasl-gssapi.c:246
-#: camel/camel-sasl-gssapi.c:282 camel/camel-sasl-gssapi.c:297
+#: camel/camel-sasl-gssapi.c:198
+#: camel/camel-sasl-gssapi.c:246
+#: camel/camel-sasl-gssapi.c:282
+#: camel/camel-sasl-gssapi.c:297
 #: camel/camel-sasl-kerberos4.c:226
 #: camel/providers/imap/camel-imap-store.c:1222
 msgid "Bad authentication response from server."
@@ -1726,8 +1765,7 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:44
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr ""
-"This option will connect to the server using Kerberos 4 authentication."
+msgstr "This option will connect to the server using Kerberos 4 authentication."
 
 #: camel/camel-sasl-kerberos4.c:169
 #, c-format
@@ -1742,7 +1780,8 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35
+#: camel/camel-sasl-login.c:35
+#: camel/camel-sasl-plain.c:35
 msgid "This option will connect to the server using a simple password."
 msgstr "This option will connect to the server using a simple password."
 
@@ -1755,12 +1794,8 @@ msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 #: camel/camel-sasl-ntlm.c:34
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgstr "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
 
 #: camel/camel-sasl-plain.c:33
 msgid "PLAIN"
@@ -1825,38 +1860,34 @@ msgid "Cannot create CMS message"
 msgstr "Cannot create CMS message"
 
 #: camel/camel-smime-context.c:242
-#, fuzzy
 msgid "Cannot create CMS signed data"
-msgstr "Cannot create CMS signedData"
+msgstr "Cannot create CMS signed data"
 
 #: camel/camel-smime-context.c:248
-#, fuzzy
 msgid "Cannot attach CMS signed data"
-msgstr "Cannot attach CMS signedData"
+msgstr "Cannot attach CMS signed data"
 
 #: camel/camel-smime-context.c:255
 msgid "Cannot attach CMS data"
 msgstr "Cannot attach CMS data"
 
 #: camel/camel-smime-context.c:261
-#, fuzzy
 msgid "Cannot create CMS Signer information"
-msgstr "Cannot create CMS SignerInfo"
+msgstr "Cannot create CMS Signer information"
 
 #: camel/camel-smime-context.c:267
-#, fuzzy
 msgid "Cannot find certificate chain"
-msgstr "Cannot find cert chain"
+msgstr "Cannot find certificate chain"
 
 #: camel/camel-smime-context.c:273
-#, fuzzy
 msgid "Cannot add CMS Signing time"
-msgstr "Cannot add CMS SigningTime"
+msgstr "Cannot add CMS Signing time"
 
-#: camel/camel-smime-context.c:295 camel/camel-smime-context.c:307
-#, fuzzy, c-format
+#: camel/camel-smime-context.c:295
+#: camel/camel-smime-context.c:307
+#, c-format
 msgid "Encryption certificate for '%s' does not exist"
-msgstr "Encryption cert for '%s' does not exist"
+msgstr "Encryption certificate for '%s' does not exist"
 
 #: camel/camel-smime-context.c:314
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
@@ -1871,11 +1902,11 @@ msgid "Cannot add encryption certificate"
 msgstr "Cannot add encryption certificate"
 
 #: camel/camel-smime-context.c:330
-#, fuzzy
 msgid "Cannot add CMS Signer information"
-msgstr "Cannot add CMS SignerInfo"
+msgstr "Cannot add CMS Signer information"
 
-#: camel/camel-smime-context.c:400 camel/camel-smime-context.c:848
+#: camel/camel-smime-context.c:400
+#: camel/camel-smime-context.c:848
 msgid "Cannot create encoder context"
 msgstr "Cannot create encoder context"
 
@@ -1883,7 +1914,8 @@ msgstr "Cannot create encoder context"
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: camel/camel-smime-context.c:411 camel/camel-smime-context.c:865
+#: camel/camel-smime-context.c:411
+#: camel/camel-smime-context.c:865
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
@@ -1928,15 +1960,15 @@ msgid "Processing error"
 msgstr "Processing error"
 
 #: camel/camel-smime-context.c:539
-#, fuzzy
 msgid "No signed data in signature"
-msgstr "No signedData in signature"
+msgstr "No signed data in signature"
 
 #: camel/camel-smime-context.c:546
 msgid "Digests missing from enveloped data"
 msgstr "Digests missing from enveloped data"
 
-#: camel/camel-smime-context.c:559 camel/camel-smime-context.c:569
+#: camel/camel-smime-context.c:559
+#: camel/camel-smime-context.c:569
 msgid "Cannot calculate digests"
 msgstr "Cannot calculate digests"
 
@@ -1944,19 +1976,18 @@ msgstr "Cannot calculate digests"
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: camel/camel-smime-context.c:584 camel/camel-smime-context.c:589
+#: camel/camel-smime-context.c:584
+#: camel/camel-smime-context.c:589
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
 #: camel/camel-smime-context.c:599
-#, fuzzy
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Certificate only message, cannot verify certificates"
+msgstr "Certificate is the only message, cannot verify certificates"
 
 #: camel/camel-smime-context.c:602
-#, fuzzy
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Certificate only message, certificates imported and verified"
+msgstr "Certificate is the only message, certificates imported and verified"
 
 #: camel/camel-smime-context.c:606
 msgid "Cannot find signature digests"
@@ -1990,28 +2021,24 @@ msgid "Cannot create CMS Message"
 msgstr "Cannot create CMS Message"
 
 #: camel/camel-smime-context.c:808
-#, fuzzy
 msgid "Cannot create CMS Enveloped data"
-msgstr "Cannot create CMS EnvelopedData"
+msgstr "Cannot create CMS Enveloped data"
 
 #: camel/camel-smime-context.c:814
-#, fuzzy
 msgid "Cannot attach CMS Enveloped data"
-msgstr "Cannot attach CMS EnvelopedData"
+msgstr "Cannot attach CMS Enveloped data"
 
 #: camel/camel-smime-context.c:820
 msgid "Cannot attach CMS data object"
 msgstr "Cannot attach CMS data object"
 
 #: camel/camel-smime-context.c:829
-#, fuzzy
 msgid "Cannot create CMS Recipient information"
-msgstr "Cannot create CMS RecipientInfo"
+msgstr "Cannot create CMS Recipient information"
 
 #: camel/camel-smime-context.c:834
-#, fuzzy
 msgid "Cannot add CMS Recipient information"
-msgstr "Cannot add CMS RecipientInfo"
+msgstr "Cannot add CMS Recipient information"
 
 #: camel/camel-smime-context.c:859
 msgid "Failed to add data to encoder"
@@ -2052,14 +2079,16 @@ msgstr "Cannot create folder: Invalid operation on this store"
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: camel/camel-store.c:390 camel/camel-vee-store.c:367
-#: camel/providers/local/camel-maildir-store.c:221
+#: camel/camel-store.c:390
+#: camel/camel-vee-store.c:367
+#: camel/providers/local/camel-maildir-store.c:217
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:440 camel/camel-vee-store.c:404
-#: camel/providers/local/camel-maildir-store.c:293
+#: camel/camel-store.c:440
+#: camel/camel-vee-store.c:404
+#: camel/providers/local/camel-maildir-store.c:289
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
@@ -2188,7 +2217,8 @@ msgstr "Key usage does not support certificate signing"
 msgid "Error in application verification"
 msgstr "Error in application verification"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827
+#: camel/camel-tcp-stream-openssl.c:696
+#: camel/camel-tcp-stream-ssl.c:827
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2201,11 +2231,13 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Signature:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-ssl.c:833
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-ssl.c:833
 msgid "BAD"
 msgstr "BAD"
 
@@ -2295,7 +2327,8 @@ msgstr "Error storing `%s': %s"
 msgid "No such message %s in %s"
 msgstr "No such message %s in %s"
 
-#: camel/camel-vee-folder.c:643 camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:643
+#: camel/camel-vee-folder.c:649
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
@@ -2321,8 +2354,8 @@ msgstr "Cannot copy messages to the Trash folder"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Cannot copy messages to the Junk folder"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/groupwise/camel-groupwise-folder.c:108
+#: camel/providers/imap/camel-imap-folder.c:1980
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2331,16 +2364,16 @@ msgstr ""
 "Cannot get message: %s\n"
 "  %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/groupwise/camel-groupwise-folder.c:108
+#: camel/providers/imap/camel-imap-folder.c:1980
 #: camel/providers/local/camel-maildir-folder.c:245
 #: camel/providers/local/camel-mbox-folder.c:403
 #: camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
 msgstr "No such message"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:120
-#: camel/providers/imap4/camel-imap4-folder.c:696
+#: camel/providers/groupwise/camel-groupwise-folder.c:123
+#: camel/providers/imap4/camel-imap4-folder.c:788
 #: camel/providers/nntp/camel-nntp-folder.c:157
 #: camel/providers/nntp/camel-nntp-folder.c:233
 #: camel/providers/nntp/camel-nntp-folder.c:372
@@ -2351,8 +2384,8 @@ msgstr "No such message"
 msgid "User cancelled"
 msgstr "User cancelled"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:125
-#: camel/providers/imap4/camel-imap4-folder.c:701
+#: camel/providers/groupwise/camel-groupwise-folder.c:128
+#: camel/providers/imap4/camel-imap4-folder.c:793
 #: camel/providers/nntp/camel-nntp-folder.c:148
 #: camel/providers/nntp/camel-nntp-folder.c:150
 #: camel/providers/nntp/camel-nntp-folder.c:159
@@ -2365,50 +2398,46 @@ msgstr "User cancelled"
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:145
-#: camel/providers/imap4/camel-imap4-folder.c:719
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-folder.c:148
+#: camel/providers/imap4/camel-imap4-folder.c:811
 msgid "This message is not available in offline mode."
-msgstr "This message is not currently available"
+msgstr "This message is not available in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:171
-#: camel/providers/groupwise/camel-groupwise-folder.c:272
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-folder.c:176
 msgid "Could not get message"
-msgstr "Could not create message."
+msgstr "Could not get message"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:471
+#: camel/providers/groupwise/camel-groupwise-folder.c:516
 #: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Could not load summary for %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:685
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-folder.c:765
+#, c-format
 msgid "Cannot create message: %s"
-msgstr "Cannot create CMS message"
+msgstr "Cannot create message: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:697
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-folder.c:777
+#, c-format
 msgid "Cannot append message to folder `%s': %s"
-msgstr "Cannot append message to mh folder: %s: %s"
+msgstr "Cannot append message to folder `%s': %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:240
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-journal.c:283
+#, c-format
 msgid "Cannot get folder container %s"
-msgstr "Cannot get folder: %s: %s"
+msgstr "Cannot get folder container %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:328
-#: camel/providers/imap4/camel-imap4-journal.c:276
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-journal.c:347
+#: camel/providers/imap4/camel-imap4-journal.c:320
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "Cannot append message to mh folder: %s: %s"
+msgstr "Cannot append message in offline mode: cache unavailable"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:344
-#: camel/providers/imap4/camel-imap4-journal.c:292
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-journal.c:363
+#: camel/providers/imap4/camel-imap4-journal.c:336
+#, c-format
 msgid "Cannot append message in offline mode: %s"
-msgstr "Cannot append message to mbox file: %s: %s"
+msgstr "Cannot append message in offline mode: %s"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:51
 #: camel/providers/imap4/camel-imap4-provider.c:36
@@ -2441,35 +2470,26 @@ msgid "Only check for Junk messages in the INBOX folder"
 msgstr "Only check for Junk messages in the INBOX folder"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:64
-#, fuzzy
 msgid "Automatically synchronize account locally"
-msgstr "Automatically synchronise remote mail locally"
+msgstr "Automatically synchronise account locally"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Address Book and Calendar"
 msgstr "Address Book and Calendar"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Post Office Agent:"
-msgstr "Post Office Agent:"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent SOAP Port:"
 msgstr "Post Office Agent SOAP Port:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
-msgid "Use Secure Connection (SSL)"
-msgstr "Use Secure Connection (SSL)"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:91
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:93
+#: camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "For accessing Novell Groupwise servers"
 msgstr "For accessing Novell Groupwise servers"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:108
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:96
 #: camel/providers/imap4/camel-imap4-provider.c:81
 #: camel/providers/nntp/camel-nntp-provider.c:72
@@ -2477,98 +2497,86 @@ msgstr "For accessing Novell Groupwise servers"
 msgid "Password"
 msgstr "Password"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:110
-#, fuzzy
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAP server using a plaintext password."
+#: camel/providers/groupwise/camel-groupwise-provider.c:104
+msgid "This option will connect to the GroupWise server using a plaintext password."
+msgstr "This option will connect to the GroupWise server using a plaintext password."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:267
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:270
 msgid "Host or user not availbale in url"
-msgstr "Category editor not available."
+msgstr "Host or user not availible in url"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:359
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-store.c:362
+#, c-format
 msgid "%sPlease enter the Groupwise password for %s@%s"
-msgstr "%sPlease enter the IMAP password for %s@%s"
+msgstr "%sPlease enter the Groupwise password for %s@%s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:373
+#: camel/providers/groupwise/camel-groupwise-store.c:376
 #: camel/providers/imap/camel-imap-store.c:1301
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:382
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:390
 msgid "Unable to authenticate to GroupWise server."
-msgstr ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
+msgstr "Unable to authenticate to GroupWise server."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:479
+#: camel/providers/groupwise/camel-groupwise-store.c:491
 #: camel/providers/imap/camel-imap-store.c:1852
 #: camel/providers/imap/camel-imap-store.c:2042
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:499
-#: camel/providers/imap/camel-imap-folder.c:2287
-#: camel/providers/imap/camel-imap-folder.c:2357
+#: camel/providers/groupwise/camel-groupwise-store.c:541
+#: camel/providers/groupwise/camel-groupwise-store.c:587
+#: camel/providers/imap/camel-imap-folder.c:2288
+#: camel/providers/imap/camel-imap-folder.c:2358
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:610
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:721
 msgid "Cannot get folder info in offline mode."
-msgstr "Cannot get folder `%s': not a directory."
+msgstr "Cannot get folder info in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:781
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:896
 msgid "Cannot create GroupWise folders in offline mode."
-msgstr "Cannot create a folder by this name."
+msgstr "Cannot create GroupWise folders in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:830
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:945
 msgid "Cannot delete GroupWise folders in offline mode."
-msgstr "Cannot delete folder `%s': Special folder"
+msgstr "Cannot delete GroupWise folders in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:873
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:988
 msgid "Cannot rename GroupWise folders in offline mode."
-msgstr "You cannot rename a folder in a News store."
+msgstr "Cannot rename GroupWise folders in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:879
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-store.c:994
+#, c-format
 msgid "Cannot rename Groupwise folder `%s' to `%s'"
-msgstr "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Cannot rename Groupwise folder `%s' to `%s'"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:911
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-store.c:1026
+#, c-format
 msgid "GroupWise server %s"
-msgstr "GroupWise"
+msgstr "GroupWise server %s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:913
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-store.c:1028
+#, c-format
 msgid "GroupWise service for %s on %s"
-msgstr "IMAP service for %s on %s"
+msgstr "GroupWise service for %s on %s"
 
 #: camel/providers/groupwise/camel-groupwise-transport.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "Groupwise server %s"
-msgstr "Groupwise Id List"
+msgstr "Groupwise server %s"
 
 #: camel/providers/groupwise/camel-groupwise-transport.c:123
-#, fuzzy, c-format
+#, c-format
 msgid "Groupwise mail delivery via %s"
-msgstr "SMTP mail delivery via %s"
+msgstr "Groupwise mail delivery via %s"
 
 #: camel/providers/groupwise/camel-groupwise-transport.c:159
-#, fuzzy
 msgid "Sending Message"
-msgstr "Sending message"
+msgstr "Sending Message"
 
 #: camel/providers/groupwise/camel-gw-listener.c:406
 msgid "Tasks"
@@ -2589,7 +2597,7 @@ msgstr "Failed to authenticate.\n"
 
 #: camel/providers/imap/camel-imap-command.c:219
 #: camel/providers/imap/camel-imap-command.c:258
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:463
 #: camel/providers/imap/camel-imap-store.c:3209
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
@@ -2601,7 +2609,7 @@ msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:321
+#: camel/providers/imap/camel-imap-command.c:324
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -2610,26 +2618,26 @@ msgstr ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:393
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unexpected response from IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap/camel-imap-command.c:403
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP command failed: %s"
 
-#: camel/providers/imap/camel-imap-command.c:470
+#: camel/providers/imap/camel-imap-command.c:473
 msgid "Server response ended too soon."
 msgstr "Server response ended too soon."
 
-#: camel/providers/imap/camel-imap-command.c:675
+#: camel/providers/imap/camel-imap-command.c:678
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP server response did not contain %s information"
 
-#: camel/providers/imap/camel-imap-command.c:711
+#: camel/providers/imap/camel-imap-command.c:714
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unexpected OK response from IMAP server: %s"
@@ -2645,39 +2653,37 @@ msgstr "Folder was destroyed and recreated on server."
 
 #. Check UIDs and flags of all messages we already know of.
 #: camel/providers/imap/camel-imap-folder.c:573
-#: camel/providers/imap4/camel-imap4-summary.c:1270
+#: camel/providers/imap4/camel-imap4-summary.c:1472
 msgid "Scanning for changed messages"
 msgstr "Scanning for changed messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1939
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Unable to retrieve message: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2021
-#: camel/providers/imap/camel-imap-folder.c:2623
+#: camel/providers/imap/camel-imap-folder.c:2022
+#: camel/providers/imap/camel-imap-folder.c:2624
 #: camel/providers/nntp/camel-nntp-folder.c:221
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: camel/providers/imap/camel-imap-folder.c:2464
+#: camel/providers/imap/camel-imap-folder.c:2465
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Incomplete server response: no information provided for message %d"
 
-#: camel/providers/imap/camel-imap-folder.c:2472
+#: camel/providers/imap/camel-imap-folder.c:2473
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Incomplete server response: no UID provided for message %d"
 
-#: camel/providers/imap/camel-imap-folder.c:2485
+#: camel/providers/imap/camel-imap-folder.c:2486
 #, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr "Unexpected server response: Identical UIDs provided for messages %d and %d"
 
-#: camel/providers/imap/camel-imap-folder.c:2661
+#: camel/providers/imap/camel-imap-folder.c:2662
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
 
@@ -2705,18 +2711,16 @@ msgstr "Checking for New Mail"
 
 #: camel/providers/imap/camel-imap-provider.c:46
 #: camel/providers/imap4/camel-imap4-provider.c:38
-#, fuzzy
 msgid "C_heck for new messages in all folders"
-msgstr "Check for new messages in all folders"
+msgstr "C_heck for new messages in all folders"
 
 #: camel/providers/imap/camel-imap-provider.c:49
 msgid "Connection to Server"
 msgstr "Connection to Server"
 
 #: camel/providers/imap/camel-imap-provider.c:51
-#, fuzzy
 msgid "_Use custom command to connect to server"
-msgstr "Use custom command to connect to server"
+msgstr "_Use custom command to connect to server"
 
 #: camel/providers/imap/camel-imap-provider.c:53
 msgid "Command:"
@@ -2730,15 +2734,13 @@ msgstr "Folders"
 
 #: camel/providers/imap/camel-imap-provider.c:58
 #: camel/providers/imap4/camel-imap4-provider.c:43
-#, fuzzy
 msgid "_Show only subscribed folders"
-msgstr "Show only subscribed folders"
+msgstr "_Show only subscribed folders"
 
 #: camel/providers/imap/camel-imap-provider.c:60
 #: camel/providers/imap4/camel-imap4-provider.c:45
-#, fuzzy
 msgid "O_verride server-supplied folder namespace"
-msgstr "Override server-supplied folder namespace"
+msgstr "O_verride server-supplied folder namespace"
 
 #: camel/providers/imap/camel-imap-provider.c:62
 #: camel/providers/imap4/camel-imap4-provider.c:47
@@ -2747,29 +2749,26 @@ msgstr "Namespace"
 
 #: camel/providers/imap/camel-imap-provider.c:66
 #: camel/providers/imap4/camel-imap4-provider.c:51
-#, fuzzy
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "Apply filters to new messages in INBOX on this server"
+msgstr "_Apply filters to new messages in INBOX on this server"
 
 #: camel/providers/imap/camel-imap-provider.c:68
 #: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
 msgid "Check new messages for _Junk contents"
-msgstr "Check new messages for Junk contents"
+msgstr "Check new messages for _Junk contents"
 
 #: camel/providers/imap/camel-imap-provider.c:70
 #: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
 msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Only check for Junk messages in the INBOX folder"
+msgstr "Only check for Junk messa_ges in the INBOX folder"
 
 #: camel/providers/imap/camel-imap-provider.c:72
 #: camel/providers/imap4/camel-imap4-provider.c:57
-#, fuzzy
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Automatically synchronise remote mail locally"
+msgstr "Automatically synchroni_se remote mail locally"
 
 #: camel/providers/imap/camel-imap-provider.c:79
+#: camel/providers/imap4/camel-imap4-provider.c:64
 msgid "IMAP"
 msgstr "IMAP"
 
@@ -2779,37 +2778,36 @@ msgstr "For reading and storing mail on IMAP servers."
 
 #: camel/providers/imap/camel-imap-provider.c:98
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAP server using a plaintext password."
+msgstr "This option will connect to the IMAP server using a plaintext password."
 
 #: camel/providers/imap/camel-imap-store.c:421
-#: camel/providers/imap4/camel-imap4-store.c:206
+#: camel/providers/imap4/camel-imap4-store.c:209
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
 #: camel/providers/imap/camel-imap-store.c:423
-#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:211
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP service for %s on %s"
 
 #: camel/providers/imap/camel-imap-store.c:535
 #: camel/providers/imap/camel-imap-store.c:550
-#: camel/providers/imap4/camel-imap4-store.c:240
-#: camel/providers/imap4/camel-imap4-store.c:255
+#: camel/providers/imap4/camel-imap4-store.c:243
+#: camel/providers/imap4/camel-imap4-store.c:258
 #: camel/providers/nntp/camel-nntp-store.c:200
 #: camel/providers/nntp/camel-nntp-store.c:215
 #: camel/providers/pop3/camel-pop3-store.c:169
 #: camel/providers/pop3/camel-pop3-store.c:184
 #: camel/providers/smtp/camel-smtp-transport.c:257
 #: camel/providers/smtp/camel-smtp-transport.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to %s: %s"
-msgstr "Could not connect to %s (port %d): %s"
+msgstr "Could not connect to %s: %s"
 
 #: camel/providers/imap/camel-imap-store.c:536
-#: camel/providers/imap4/camel-imap4-store.c:241
+#: camel/providers/imap4/camel-imap4-store.c:244
 #: camel/providers/nntp/camel-nntp-store.c:201
 #: camel/providers/pop3/camel-pop3-store.c:170
 #: camel/providers/smtp/camel-smtp-transport.c:258
@@ -2818,7 +2816,7 @@ msgstr "SSL unavailable"
 
 #: camel/providers/imap/camel-imap-store.c:547
 #: camel/providers/imap/camel-imap-store.c:817
-#: camel/providers/imap4/camel-imap4-store.c:252
+#: camel/providers/imap4/camel-imap4-store.c:255
 #: camel/providers/nntp/camel-nntp-store.c:212
 #: camel/providers/nntp/camel-nntp-store.c:231
 #: camel/providers/pop3/camel-pop3-store.c:181
@@ -2829,31 +2827,30 @@ msgstr "Connection cancelled"
 #: camel/providers/imap/camel-imap-store.c:655
 #: camel/providers/imap/camel-imap-store.c:677
 #: camel/providers/imap/camel-imap-store.c:683
-#: camel/providers/imap4/camel-imap4-store.c:280
-#: camel/providers/imap4/camel-imap4-store.c:293
-#: camel/providers/imap4/camel-imap4-store.c:309
+#: camel/providers/imap4/camel-imap4-store.c:283
+#: camel/providers/imap4/camel-imap4-store.c:296
+#: camel/providers/imap4/camel-imap4-store.c:312
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Failed to connect to IMAP server %s in secure mode: %s"
 
 #: camel/providers/imap/camel-imap-store.c:656
 #: camel/providers/smtp/camel-smtp-transport.c:326
-#, fuzzy
 msgid "STARTTLS not supported"
-msgstr "SSL/TLS extension not supported."
+msgstr "STARTTLS not supported"
 
 #: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/imap4/camel-imap4-store.c:281
+#: camel/providers/imap4/camel-imap4-store.c:284
 #: camel/providers/pop3/camel-pop3-store.c:246
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
 #: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap4/camel-imap4-store.c:310
+#: camel/providers/imap4/camel-imap4-store.c:313
 #: camel/providers/pop3/camel-pop3-store.c:252
 #: camel/providers/smtp/camel-smtp-transport.c:365
 msgid "SSL is not available in this build"
-msgstr ""
+msgstr "SSL is not available in this build"
 
 #: camel/providers/imap/camel-imap-store.c:820
 #, c-format
@@ -2866,7 +2863,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s does not support requested authentication type %s"
 
 #: camel/providers/imap/camel-imap-store.c:1264
-#: camel/providers/smtp/camel-smtp-transport.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:501
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
@@ -2889,12 +2886,10 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:1870
 #: camel/providers/imap/camel-imap-store.c:2248
-#: camel/providers/imap4/camel-imap4-store.c:770
+#: camel/providers/imap4/camel-imap4-store.c:773
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "The folder name \"%s\" is invalid because it contains the character \"%c\""
 
 #: camel/providers/imap/camel-imap-store.c:1928
 #: camel/providers/imap/camel-imap-store.c:2309
@@ -2902,7 +2897,7 @@ msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
 #: camel/providers/imap/camel-imap-store.c:1983
-#: camel/providers/local/camel-maildir-store.c:192
+#: camel/providers/local/camel-maildir-store.c:190
 #: camel/providers/local/camel-mbox-store.c:210
 #: camel/providers/local/camel-mh-store.c:237
 #, c-format
@@ -2914,13 +2909,13 @@ msgstr "Cannot create folder `%s': folder exists."
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:551
-#: camel/providers/imap4/camel-imap4-command.c:558
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "Failed sending command to IMAP server %s: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:661
+#: camel/providers/imap4/camel-imap4-command.c:660
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "Unexpected response from IMAP4 server %s: %s"
@@ -2940,215 +2935,204 @@ msgstr "Cannot select folder `%s': Invalid mailbox name"
 msgid "Cannot select folder `%s': Bad command"
 msgstr "Cannot select folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1503
-#: camel/providers/imap4/camel-imap4-engine.c:1548
-#: camel/providers/imap4/camel-imap4-engine.c:1604
+#: camel/providers/imap4/camel-imap4-engine.c:1469
+#: camel/providers/imap4/camel-imap4-engine.c:1508
+#: camel/providers/imap4/camel-imap4-engine.c:1553
+#: camel/providers/imap4/camel-imap4-engine.c:1609
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 server %s unexpectedly disconnected: %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:306
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:85
+msgid "Enable Mailing-List detection required for some filter and vFolder rules"
+msgstr "Enable Mailing-List detection required for some filter and vFolder rules"
+
+#: camel/providers/imap4/camel-imap4-folder.c:398
+#, c-format
 msgid "Cannot access folder `%s': %s"
-msgstr "Cannot get folder `%s': %s"
+msgstr "Cannot access folder `%s': %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:365
+#: camel/providers/imap4/camel-imap4-folder.c:457
 #, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr "Cannot sync flags to folder `%s': Unknown"
 
-#: camel/providers/imap4/camel-imap4-folder.c:371
+#: camel/providers/imap4/camel-imap4-folder.c:463
 #, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr "Cannot sync flags to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:512
+#: camel/providers/imap4/camel-imap4-folder.c:604
 #, c-format
 msgid "Cannot expunge folder `%s': Unknown"
 msgstr "Cannot expunge folder `%s': Unknown"
 
-#: camel/providers/imap4/camel-imap4-folder.c:517
+#: camel/providers/imap4/camel-imap4-folder.c:609
 #, c-format
 msgid "Cannot expunge folder `%s': Bad command"
 msgstr "Cannot expunge folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:773
+#: camel/providers/imap4/camel-imap4-folder.c:865
 #, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
 msgstr "Cannot get message %s from folder `%s': No such message"
 
-#: camel/providers/imap4/camel-imap4-folder.c:778
+#: camel/providers/imap4/camel-imap4-folder.c:870
 #, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr "Cannot get message %s from folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:911
+#: camel/providers/imap4/camel-imap4-folder.c:1003
 #, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
 msgstr "Cannot append message to folder `%s': Unknown error"
 
-#: camel/providers/imap4/camel-imap4-folder.c:940
+#: camel/providers/imap4/camel-imap4-folder.c:1032
 #, c-format
 msgid "Cannot append message to folder `%s': Bad command"
 msgstr "Cannot append message to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1048
+#: camel/providers/imap4/camel-imap4-folder.c:1140
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1052
+#: camel/providers/imap4/camel-imap4-folder.c:1144
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1060
+#: camel/providers/imap4/camel-imap4-folder.c:1152
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1064
+#: camel/providers/imap4/camel-imap4-folder.c:1156
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-provider.c:64
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
 #: camel/providers/imap4/camel-imap4-provider.c:66
-#, fuzzy
 msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "For reading and storing mail on IMAP servers."
+msgstr "For reading and storing mail on IMAPv4rev1 servers."
 
 #: camel/providers/imap4/camel-imap4-provider.c:83
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "This option will connect to the IMAPv4rev1 server using a plaintext password."
 
-#: camel/providers/imap4/camel-imap4-store.c:391
+#: camel/providers/imap4/camel-imap4-store.c:394
 #, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 
-#: camel/providers/imap4/camel-imap4-store.c:436
+#: camel/providers/imap4/camel-imap4-store.c:439
 #, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr "%sPlease enter the IMAP password for %s on host %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:506
+#: camel/providers/imap4/camel-imap4-store.c:509
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "Cannot authenticate to IMAP server %s using %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:668
-#: camel/providers/imap4/camel-imap4-store.c:780
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:671
+#: camel/providers/imap4/camel-imap4-store.c:783
 msgid "Cannot create IMAP folders in offline mode."
-msgstr "Cannot create a folder by this name."
+msgstr "Cannot create IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:707
+#: camel/providers/imap4/camel-imap4-store.c:710
 #, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
 
-#: camel/providers/imap4/camel-imap4-store.c:828
+#: camel/providers/imap4/camel-imap4-store.c:831
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr "Cannot create folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:834
+#: camel/providers/imap4/camel-imap4-store.c:837
 #, c-format
 msgid "Cannot create folder `%s': Bad command"
 msgstr "Cannot create folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:865
+#: camel/providers/imap4/camel-imap4-store.c:868
 #, c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "Cannot delete folder `%s': Special folder"
 
-#: camel/providers/imap4/camel-imap4-store.c:872
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:875
 msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Cannot delete folder `%s': Special folder"
+msgstr "Cannot delete IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:931
+#: camel/providers/imap4/camel-imap4-store.c:934
 #, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "Cannot delete folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:936
+#: camel/providers/imap4/camel-imap4-store.c:939
 #, c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Cannot delete folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:956
+#: camel/providers/imap4/camel-imap4-store.c:959
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr "Cannot rename folder `%s' to `%s': Special folder"
 
-#: camel/providers/imap4/camel-imap4-store.c:963
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:966
 msgid "Cannot rename IMAP folders in offline mode."
-msgstr "You cannot rename a folder in a News store."
+msgstr "Cannot rename IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:994
+#: camel/providers/imap4/camel-imap4-store.c:997
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:999
+#: camel/providers/imap4/camel-imap4-store.c:1002
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr "Cannot rename folder `%s' to `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1248
+#: camel/providers/imap4/camel-imap4-store.c:1305
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: camel/providers/imap4/camel-imap4-store.c:1307
 msgid "Bad command"
 msgstr "Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1288
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:1345
 msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Cannot subscribe to folder `%s': Bad command"
+msgstr "Cannot subscribe to IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:1333
+#: camel/providers/imap4/camel-imap4-store.c:1390
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1338
+#: camel/providers/imap4/camel-imap4-store.c:1395
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Cannot subscribe to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1360
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:1417
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Cannot unsubscribe from IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:1405
+#: camel/providers/imap4/camel-imap4-store.c:1462
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1410
+#: camel/providers/imap4/camel-imap4-store.c:1467
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Cannot unsubscribe from folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-summary.c:1294
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-summary.c:1497
 msgid "Fetching envelopes for new messages"
-msgstr "Checking for new messages"
+msgstr "Fetching envelopes for new messages"
 
 #: camel/providers/imap4/camel-imap4-utils.c:368
 #, c-format
@@ -3204,12 +3188,8 @@ msgid "Local delivery"
 msgstr "Local delivery"
 
 #: camel/providers/local/camel-local-provider.c:69
-msgid ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
-msgstr ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
+msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
+msgstr "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
 
 #: camel/providers/local/camel-local-provider.c:81
 #: camel/providers/local/camel-local-provider.c:100
@@ -3308,10 +3288,10 @@ msgstr "Unable to add message to summary: unknown reason"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: camel/providers/local/camel-maildir-folder.c:75
-#: camel/providers/local/camel-maildir-store.c:221
-#: camel/providers/local/camel-maildir-store.c:293
-#: camel/providers/local/camel-maildir-store.c:515
-#: camel/providers/local/camel-maildir-store.c:528
+#: camel/providers/local/camel-maildir-store.c:217
+#: camel/providers/local/camel-maildir-store.c:289
+#: camel/providers/local/camel-maildir-store.c:511
+#: camel/providers/local/camel-maildir-store.c:524
 #: camel/providers/local/camel-spool-store.c:452
 msgid "Inbox"
 msgstr "Inbox"
@@ -3347,45 +3327,45 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr "Invalid message contents"
 
-#: camel/providers/local/camel-maildir-store.c:148
-#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:146
+#: camel/providers/local/camel-maildir-store.c:171
 #: camel/providers/local/camel-mbox-store.c:182
 #: camel/providers/local/camel-mbox-store.c:194
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Cannot create folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:161
+#: camel/providers/local/camel-maildir-store.c:159
 #: camel/providers/local/camel-mbox-store.c:152
 #: camel/providers/local/camel-mh-store.c:205
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Cannot get folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:163
 #: camel/providers/local/camel-mbox-store.c:160
 #: camel/providers/local/camel-mh-store.c:212
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Cannot get folder `%s': folder does not exist."
 
-#: camel/providers/local/camel-maildir-store.c:189
+#: camel/providers/local/camel-maildir-store.c:187
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Cannot get folder `%s': not a maildir directory."
 
-#: camel/providers/local/camel-maildir-store.c:236
-#: camel/providers/local/camel-maildir-store.c:274
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:270
 #: camel/providers/local/camel-mh-store.c:261
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Could not delete folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:238
+#: camel/providers/local/camel-maildir-store.c:234
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:440
+#: camel/providers/local/camel-maildir-store.c:436
 #: camel/providers/local/camel-spool-store.c:319
 #: camel/providers/local/camel-spool-store.c:333
 #, c-format
@@ -3743,10 +3723,8 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "Unable to save grouplist file for %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:44
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription dialog, show relative folder names"
@@ -3761,12 +3739,8 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "This is a provider for reading from and posting to USENET newsgroups."
 
 #: camel/providers/nntp/camel-nntp-provider.c:74
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgstr "This option will authenticate with the NNTP server using a plaintext password."
 
 #: camel/providers/nntp/camel-nntp-store.c:234
 #, c-format
@@ -3827,9 +3801,8 @@ msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "You cannot remove a folder in a News store: unsubscribe instead."
 
 #: camel/providers/nntp/camel-nntp-store.c:1148
-#, fuzzy
 msgid "Authentication requested but no username provided"
-msgstr "Authentication requested but not username provided"
+msgstr "Authentication requested but no username provided"
 
 #: camel/providers/nntp/camel-nntp-store.c:1160
 #, c-format
@@ -3894,7 +3867,6 @@ msgid "No message with uid %s"
 msgstr "No message with uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
 #: camel/providers/pop3/camel-pop3-folder.c:412
 #, c-format
 msgid "Retrieving POP message %d"
@@ -3930,27 +3902,17 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "For connecting to and downloading mail from POP servers."
 
 #: camel/providers/pop3/camel-pop3-provider.c:74
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgstr "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
 
 #: camel/providers/pop3/camel-pop3-provider.c:84
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgstr "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
 
 #: camel/providers/pop3/camel-pop3-store.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Failed to read a valid greeting from POP server %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:218
 #: camel/providers/pop3/camel-pop3-store.c:235
@@ -3961,9 +3923,8 @@ msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Failed to connect to POP server %s in secure mode: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:219
-#, fuzzy
 msgid "STLS not supported"
-msgstr "SSL/TLS extension not supported."
+msgstr "STLS not supported"
 
 #: camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
@@ -3973,12 +3934,8 @@ msgstr "Could not connect to POP server %s"
 #: camel/providers/pop3/camel-pop3-store.c:404
 #: camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+msgstr "Unable to connect to POP server %s: No support for requested authentication mechanism."
 
 #: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
@@ -4019,7 +3976,7 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending username: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:644
+#: camel/providers/pop3/camel-pop3-store.c:645
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No such folder `%s'."
@@ -4029,12 +3986,8 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:39
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgstr "For delivering mail by passing it to the \"sendmail\" program on the local system."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:114
 msgid "Could not parse recipient list"
@@ -4202,17 +4155,17 @@ msgstr "STARTTLS command failed: %s"
 msgid "STARTTLS command failed"
 msgstr "STARTTLS command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:488
+#: camel/providers/smtp/camel-smtp-transport.c:491
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s does not support requested authentication type %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:526
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sPlease enter the SMTP password for %s on host %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:548
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4223,200 +4176,203 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:671
+#: camel/providers/smtp/camel-smtp-transport.c:674
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail delivery via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:689
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: service not connected."
 msgstr "Cannot send message: service not connected."
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:698
 msgid "Cannot send message: sender address not valid."
 msgstr "Cannot send message: sender address not valid."
 
-#: camel/providers/smtp/camel-smtp-transport.c:699
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Sending message"
 msgstr "Sending message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:717
 msgid "Cannot send message: no recipients defined."
 msgstr "Cannot send message: no recipients defined."
 
-#: camel/providers/smtp/camel-smtp-transport.c:725
+#: camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Cannot send message: one or more invalid recipients"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:897
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:923
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "HELO command failed"
 msgstr "HELO command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1006
 msgid "SMTP Authentication"
 msgstr "SMTP Authentication"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1009
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "Error creating SASL authentication object."
 msgstr "Error creating SASL authentication object."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
-#: camel/providers/smtp/camel-smtp-transport.c:1037
+#: camel/providers/smtp/camel-smtp-transport.c:1029
+#: camel/providers/smtp/camel-smtp-transport.c:1040
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1046
 msgid "AUTH command failed"
 msgstr "AUTH command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Bad authentication response from server.\n"
 msgstr "Bad authentication response from server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1147
+#: camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1193
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1229
-#: camel/providers/smtp/camel-smtp-transport.c:1287
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1290
+#: camel/providers/smtp/camel-smtp-transport.c:1309
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA command failed: %s: mail not sent"
 
 #. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: camel/providers/smtp/camel-smtp-transport.c:1246
-#: camel/providers/smtp/camel-smtp-transport.c:1322
+#: camel/providers/smtp/camel-smtp-transport.c:1249
+#: camel/providers/smtp/camel-smtp-transport.c:1325
 msgid "DATA command failed"
 msgstr "DATA command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1348
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
+#: camel/providers/smtp/camel-smtp-transport.c:1364
 msgid "RSET command failed"
 msgstr "RSET command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1387
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1401
 msgid "QUIT command failed"
 msgstr "QUIT command failed"
 
-#: libedataserverui/e-categories-dialog.c:90
-#, fuzzy
+#: libedataserverui/e-categories-dialog.c:91
 msgid "Category Icon"
-msgstr "Category is"
+msgstr "Category Icon"
 
-#: libedataserverui/e-categories-dialog.c:236
+#: libedataserverui/e-categories-dialog.c:237
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr ""
+msgid "There is already a category '%s' in the configuration. Please use another name"
+msgstr "There is already a category '%s' in the configuration. Please use another name"
 
-#: libedataserverui/e-categories-dialog.c:391
-#, fuzzy
+#: libedataserverui/e-categories-dialog.c:395
 msgid "Category"
-msgstr "C_ategory:"
+msgstr "Category"
 
 #: libedataserverui/e-categories-dialog.glade.h:1
-#, fuzzy
 msgid "Category Properties"
-msgstr "Category is"
+msgstr "Category Properties"
 
 #: libedataserverui/e-categories-dialog.glade.h:2
-#, fuzzy
 msgid "Category _Color"
-msgstr "Category is"
+msgstr "Category _Colour"
 
 #: libedataserverui/e-categories-dialog.glade.h:3
-#, fuzzy
 msgid "Category _Icon"
-msgstr "Category is"
+msgstr "Category _Icon"
 
 #: libedataserverui/e-categories-dialog.glade.h:4
-#, fuzzy
 msgid "Category _Name"
-msgstr "Category is"
+msgstr "Category _Name"
 
 #: libedataserverui/e-categories-dialog.glade.h:5
-#, fuzzy
 msgid "Item(s) belong to these _categories:"
-msgstr "This contact belongs to these categories:"
+msgstr "Item(s) belong to these _categories:"
 
 #: libedataserverui/e-categories-dialog.glade.h:6
-#, fuzzy
 msgid "_Available Categories:"
-msgstr "_Categories"
+msgstr "_Available Categories:"
 
 #: libedataserverui/e-categories-dialog.glade.h:7
 msgid "_Edit"
 msgstr "_Edit"
 
 #: libedataserverui/e-categories-dialog.glade.h:8
-#, fuzzy
 msgid "categories"
-msgstr "Categories"
+msgstr "categories"
 
-#: libedataserverui/e-name-selector-dialog.c:184
+#: libedataserverui/e-name-selector-dialog.c:197
 msgid "Select Contacts from Address Book"
 msgstr "Select Contacts from Address Book"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "\t\t\t\t\t\t"
+msgstr "\t\t\t\t\t\t"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Contacts</b>"
-msgstr "<b>Contacts</b>"
+msgid "*"
+msgstr "*"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>Show Contacts</b>"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:4
+msgid "<b>_Contacts</b>"
+msgstr "<b>_Contacts</b>"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:5
+msgid "Address Book"
+msgstr "Address Book"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Address _Book:"
 msgstr "Address _Book:"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:5
+#: libedataserverui/e-name-selector-dialog.glade.h:7
+msgid "Contacts"
+msgstr "Contacts"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:8
+msgid "Search"
+msgstr "Search"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "_Search:"
 msgstr "_Search:"
 
@@ -4437,7 +4393,11 @@ msgstr "Invalid connection"
 msgid "Invalid response from server"
 msgstr "Invalid response from server"
 
-#: servers/groupwise/e-gw-connection.c:162
+#: servers/groupwise/e-gw-connection.c:158
+msgid "No response from the server"
+msgstr "No response from the server"
+
+#: servers/groupwise/e-gw-connection.c:164
 msgid "Bad parameter"
 msgstr "Bad parameter"
 
@@ -4455,3 +4415,4 @@ msgstr "Evolution Calendar file and webcal backend"
 #, c-format
 msgid "Multiple segmentation faults occurred; can't display error dialog\n"
 msgstr "Multiple segmentation faults occurred; can't display error dialog\n"
+