summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@gnome.org>2005-12-04 05:32:29 +0000
committerAdam Weinberger <adamw@src.gnome.org>2005-12-04 05:32:29 +0000
commite30f52f80bec253b388b25edf98f84328f5a81cc (patch)
treebcc45bacb364c7aa2f4bac03a2c82d9025e5210b
parent133705b76d2207e831ba787931dde6ff544222e8 (diff)
downloadevolution-data-server-e30f52f80bec253b388b25edf98f84328f5a81cc.tar.gz
Updated Canadian English translation.
2005-12-04 Adam Weinberger <adamw@gnome.org> * en_CA.po: Updated Canadian English translation.
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_CA.po916
2 files changed, 464 insertions, 456 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index acc2ebd02..66403b8f4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-04 Adam Weinberger <adamw@gnome.org>
+
+ * en_CA.po: Updated Canadian English translation.
+
2005-12-02 Ignacio Casal Quinteiro <nacho.resa@gmail.com>
* gl.po: Updated Galician Translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index 3e12664f7..f74de88e1 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution-data-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-26 03:53-0400\n"
+"POT-Creation-Date: 2005-12-04 00:26-0500\n"
"PO-Revision-Date: 2005-07-26 13:04-0400\n"
"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
"Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -17,61 +17,62 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: addressbook/backends/file/e-book-backend-file.c:533
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2013
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2210
#: addressbook/backends/vcf/e-book-backend-vcf.c:478
msgid "Loading..."
msgstr "Loading..."
#: addressbook/backends/file/e-book-backend-file.c:535
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:1999
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2011
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3417
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2169
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2189
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2208
+#: addressbook/backends/ldap/e-book-backend-ldap.c:3587
#: addressbook/backends/vcf/e-book-backend-vcf.c:480
msgid "Searching..."
msgstr "Searching..."
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2251
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3551
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2493
+#: addressbook/backends/ldap/e-book-backend-ldap.c:3735
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "Downloading contacts (%d)... "
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2336
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2454
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2483
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2642
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2809
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "Updating contacts cache (%d)... "
-#: addressbook/backends/ldap/e-book-backend-ldap.c:659
+#: addressbook/backends/ldap/e-book-backend-ldap.c:684
msgid "Using Distinguished Name (DN)"
msgstr "Using Distinguished Name (DN)"
-#: addressbook/backends/ldap/e-book-backend-ldap.c:662
+#: addressbook/backends/ldap/e-book-backend-ldap.c:687
msgid "Using Email Address"
msgstr "Using Email Address"
-#: addressbook/backends/ldap/e-book-backend-ldap.c:832
+#: addressbook/backends/ldap/e-book-backend-ldap.c:873
msgid "Reconnecting to LDAP server..."
msgstr "Reconnecting to LDAP server..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1380
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1441
msgid "Adding contact to LDAP server..."
msgstr "Adding contact to LDAP server..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1505
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1575
msgid "Removing contact from LDAP server..."
msgstr "Removing contact from LDAP server..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1762
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1857
msgid "Modifying contact from LDAP server..."
msgstr "Modifying contact from LDAP server..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3307
+#: addressbook/backends/ldap/e-book-backend-ldap.c:3463
msgid "Receiving LDAP search results..."
msgstr "Receiving LDAP search results..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3437
+#: addressbook/backends/ldap/e-book-backend-ldap.c:3609
msgid "Error performing search"
msgstr "Error performing search"
@@ -599,10 +600,11 @@ msgstr "Note"
msgid "Birth Date"
msgstr "Birth Date"
+#. Add default categories only if gconf doesn't contain any category list
#. Make sure we have all categories
#: addressbook/libebook/e-contact.c:236
#: calendar/backends/contacts/e-cal-backend-contacts.c:453
-#: libedataserver/e-categories.c:236
+#: libedataserver/e-categories.c:237
msgid "Anniversary"
msgstr "Anniversary"
@@ -630,7 +632,7 @@ msgid "Unnamed List"
msgstr "Unnamed List"
#: calendar/backends/contacts/e-cal-backend-contacts.c:455
-#: libedataserver/e-categories.c:237
+#: libedataserver/e-categories.c:238
msgid "Birthday"
msgstr "Birthday"
@@ -648,70 +650,69 @@ msgstr "Anniversary: %s"
msgid "Can't save calendar data: Malformed URI."
msgstr "Can't save calendar data: Malformed URI."
-#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:860
-#: camel/providers/groupwise/camel-groupwise-folder.c:1165
+#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:889
+#: camel/providers/groupwise/camel-groupwise-folder.c:1425
msgid "Reply Requested: by "
msgstr "Reply Requested: by "
-#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:865
-#: camel/providers/groupwise/camel-groupwise-folder.c:1170
+#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:894
+#: camel/providers/groupwise/camel-groupwise-folder.c:1430
msgid "Reply Requested: When convenient"
msgstr "Reply Requested: When convenient"
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:177
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:184
#, c-format
msgid "Loading %s items"
msgstr "Loading %s items"
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:723
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:708
#: servers/exchange/storage/exchange-hierarchy-foreign.c:254
msgid "Calendar"
msgstr "Calendar"
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:779
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:764
msgid "Invalid server URI"
msgstr "Invalid server URI"
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:795
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:804
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:886
-#: calendar/libecal/e-cal.c:5040
-#: camel/providers/groupwise/camel-groupwise-folder.c:808
-#: camel/providers/groupwise/camel-groupwise-folder.c:827
-#: camel/providers/groupwise/camel-groupwise-folder.c:855
-#: camel/providers/groupwise/camel-groupwise-store.c:553
-#: camel/providers/groupwise/camel-groupwise-store.c:564
-#: camel/providers/groupwise/camel-groupwise-store.c:600
-#: camel/providers/groupwise/camel-groupwise-store.c:818
-#: camel/providers/groupwise/camel-groupwise-store.c:1045
-#: camel/providers/groupwise/camel-groupwise-transport.c:177
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:780
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:789
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:871
+#: calendar/libecal/e-cal.c:5095
+#: camel/providers/groupwise/camel-groupwise-folder.c:890
+#: camel/providers/groupwise/camel-groupwise-folder.c:910
+#: camel/providers/groupwise/camel-groupwise-folder.c:938
+#: camel/providers/groupwise/camel-groupwise-store.c:518
+#: camel/providers/groupwise/camel-groupwise-store.c:533
+#: camel/providers/groupwise/camel-groupwise-store.c:575
+#: camel/providers/groupwise/camel-groupwise-store.c:1077
+#: camel/providers/groupwise/camel-groupwise-transport.c:178
msgid "Authentication failed"
msgstr "Authentication failed"
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:845
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:830
msgid "Could not create thread for getting deltas"
msgstr "Could not create thread for getting deltas"
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:870
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1113
-#: calendar/backends/http/e-cal-backend-http.c:495
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:855
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
+#: calendar/backends/http/e-cal-backend-http.c:496
#: calendar/backends/weather/e-cal-backend-weather.c:444
msgid "Could not create cache file"
msgstr "Could not create cache file"
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:880
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:865
msgid "Could not create thread for populating cache"
msgstr "Could not create thread for populating cache"
-#: calendar/backends/http/e-cal-backend-http.c:240
+#: calendar/backends/http/e-cal-backend-http.c:241
msgid "Redirected to Invalid URI"
msgstr "Redirected to Invalid URI"
-#: calendar/backends/http/e-cal-backend-http.c:264
+#: calendar/backends/http/e-cal-backend-http.c:265
msgid "Bad file format."
msgstr "Bad file format."
-#: calendar/backends/http/e-cal-backend-http.c:270
+#: calendar/backends/http/e-cal-backend-http.c:271
msgid "Not a calendar."
msgstr "Not a calendar."
@@ -908,131 +909,131 @@ msgstr "%.1f-%.1fcm snow\n"
msgid "%.1f-%.1fin snow\n"
msgstr "%.1f-%.1fin snow\n"
-#: calendar/libecal/e-cal-component.c:1314
+#: calendar/libecal/e-cal-component.c:1322
msgid "Untitled appointment"
msgstr "Untitled appointment"
-#: calendar/libecal/e-cal-recur.c:4014
+#: calendar/libecal/e-cal-recur.c:4026
msgid "1st"
msgstr "1st"
-#: calendar/libecal/e-cal-recur.c:4015
+#: calendar/libecal/e-cal-recur.c:4027
msgid "2nd"
msgstr "2nd"
-#: calendar/libecal/e-cal-recur.c:4016
+#: calendar/libecal/e-cal-recur.c:4028
msgid "3rd"
msgstr "3rd"
-#: calendar/libecal/e-cal-recur.c:4017
+#: calendar/libecal/e-cal-recur.c:4029
msgid "4th"
msgstr "4th"
-#: calendar/libecal/e-cal-recur.c:4018
+#: calendar/libecal/e-cal-recur.c:4030
msgid "5th"
msgstr "5th"
-#: calendar/libecal/e-cal-recur.c:4019
+#: calendar/libecal/e-cal-recur.c:4031
msgid "6th"
msgstr "6th"
-#: calendar/libecal/e-cal-recur.c:4020
+#: calendar/libecal/e-cal-recur.c:4032
msgid "7th"
msgstr "7th"
-#: calendar/libecal/e-cal-recur.c:4021
+#: calendar/libecal/e-cal-recur.c:4033
msgid "8th"
msgstr "8th"
-#: calendar/libecal/e-cal-recur.c:4022
+#: calendar/libecal/e-cal-recur.c:4034
msgid "9th"
msgstr "9th"
-#: calendar/libecal/e-cal-recur.c:4023
+#: calendar/libecal/e-cal-recur.c:4035
msgid "10th"
msgstr "10th"
-#: calendar/libecal/e-cal-recur.c:4024
+#: calendar/libecal/e-cal-recur.c:4036
msgid "11th"
msgstr "11th"
-#: calendar/libecal/e-cal-recur.c:4025
+#: calendar/libecal/e-cal-recur.c:4037
msgid "12th"
msgstr "12th"
-#: calendar/libecal/e-cal-recur.c:4026
+#: calendar/libecal/e-cal-recur.c:4038
msgid "13th"
msgstr "13th"
-#: calendar/libecal/e-cal-recur.c:4027
+#: calendar/libecal/e-cal-recur.c:4039
msgid "14th"
msgstr "14th"
-#: calendar/libecal/e-cal-recur.c:4028
+#: calendar/libecal/e-cal-recur.c:4040
msgid "15th"
msgstr "15th"
-#: calendar/libecal/e-cal-recur.c:4029
+#: calendar/libecal/e-cal-recur.c:4041
msgid "16th"
msgstr "16th"
-#: calendar/libecal/e-cal-recur.c:4030
+#: calendar/libecal/e-cal-recur.c:4042
msgid "17th"
msgstr "17th"
-#: calendar/libecal/e-cal-recur.c:4031
+#: calendar/libecal/e-cal-recur.c:4043
msgid "18th"
msgstr "18th"
-#: calendar/libecal/e-cal-recur.c:4032
+#: calendar/libecal/e-cal-recur.c:4044
msgid "19th"
msgstr "19th"
-#: calendar/libecal/e-cal-recur.c:4033
+#: calendar/libecal/e-cal-recur.c:4045
msgid "20th"
msgstr "20th"
-#: calendar/libecal/e-cal-recur.c:4034
+#: calendar/libecal/e-cal-recur.c:4046
msgid "21st"
msgstr "21st"
-#: calendar/libecal/e-cal-recur.c:4035
+#: calendar/libecal/e-cal-recur.c:4047
msgid "22nd"
msgstr "22nd"
-#: calendar/libecal/e-cal-recur.c:4036
+#: calendar/libecal/e-cal-recur.c:4048
msgid "23rd"
msgstr "23rd"
-#: calendar/libecal/e-cal-recur.c:4037
+#: calendar/libecal/e-cal-recur.c:4049
msgid "24th"
msgstr "24th"
-#: calendar/libecal/e-cal-recur.c:4038
+#: calendar/libecal/e-cal-recur.c:4050
msgid "25th"
msgstr "25th"
-#: calendar/libecal/e-cal-recur.c:4039
+#: calendar/libecal/e-cal-recur.c:4051
msgid "26th"
msgstr "26th"
-#: calendar/libecal/e-cal-recur.c:4040
+#: calendar/libecal/e-cal-recur.c:4052
msgid "27th"
msgstr "27th"
-#: calendar/libecal/e-cal-recur.c:4041
+#: calendar/libecal/e-cal-recur.c:4053
msgid "28th"
msgstr "28th"
-#: calendar/libecal/e-cal-recur.c:4042
+#: calendar/libecal/e-cal-recur.c:4054
msgid "29th"
msgstr "29th"
-#: calendar/libecal/e-cal-recur.c:4043
+#: calendar/libecal/e-cal-recur.c:4055
msgid "30th"
msgstr "30th"
-#: calendar/libecal/e-cal-recur.c:4044
+#: calendar/libecal/e-cal-recur.c:4056
msgid "31st"
msgstr "31st"
@@ -1054,93 +1055,95 @@ msgid "Undefined"
msgstr "Undefined"
#. FIXME: Try to get the parent uri so that we dont have to ask the password again
-#: calendar/libecal/e-cal.c:1647
+#: calendar/libecal/e-cal.c:1662
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "Enter password for %s to enable proxy for user %s"
-#: calendar/libecal/e-cal.c:1650 libedataserverui/e-book-auth-util.c:192
+#: calendar/libecal/e-cal.c:1665 libedataserverui/e-book-auth-util.c:192
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
-#: calendar/libecal/e-cal.c:5012
+#: calendar/libecal/e-cal.c:5067
msgid "Invalid argument"
msgstr "Invalid argument"
-#: calendar/libecal/e-cal.c:5014
+#: calendar/libecal/e-cal.c:5069
msgid "Backend is busy"
msgstr "Backend is busy"
-#: calendar/libecal/e-cal.c:5016
+#: calendar/libecal/e-cal.c:5071
msgid "Repository is offline"
msgstr "Repository is offline"
-#: calendar/libecal/e-cal.c:5018
+#: calendar/libecal/e-cal.c:5073
msgid "No such calendar"
msgstr "No such calendar"
-#: calendar/libecal/e-cal.c:5020 servers/groupwise/e-gw-connection.c:166
+#: calendar/libecal/e-cal.c:5075 servers/groupwise/e-gw-connection.c:167
msgid "Object not found"
msgstr "Object not found"
-#: calendar/libecal/e-cal.c:5022 servers/groupwise/e-gw-connection.c:160
+#: calendar/libecal/e-cal.c:5077 servers/groupwise/e-gw-connection.c:161
msgid "Invalid object"
msgstr "Invalid object"
-#: calendar/libecal/e-cal.c:5024
+#: calendar/libecal/e-cal.c:5079
msgid "URI not loaded"
msgstr "URI not loaded"
-#: calendar/libecal/e-cal.c:5026
+#: calendar/libecal/e-cal.c:5081
msgid "URI already loaded"
msgstr "URI already loaded"
-#: calendar/libecal/e-cal.c:5028 servers/exchange/storage/e-storage.c:572
+#: calendar/libecal/e-cal.c:5083 servers/exchange/storage/e-storage.c:572
msgid "Permission denied"
msgstr "Permission denied"
-#: calendar/libecal/e-cal.c:5030 servers/groupwise/e-gw-connection.c:168
+#: calendar/libecal/e-cal.c:5085 servers/groupwise/e-gw-connection.c:169
msgid "Unknown User"
msgstr "Unknown User"
-#: calendar/libecal/e-cal.c:5032
+#: calendar/libecal/e-cal.c:5087
msgid "Object ID already exists"
msgstr "Object ID already exists"
-#: calendar/libecal/e-cal.c:5034
+#: calendar/libecal/e-cal.c:5089
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: calendar/libecal/e-cal.c:5036
+#: calendar/libecal/e-cal.c:5091
msgid "Operation has been cancelled"
msgstr "Operation has been canceled"
-#: calendar/libecal/e-cal.c:5038
+#: calendar/libecal/e-cal.c:5093
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
-#: calendar/libecal/e-cal.c:5042
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: calendar/libecal/e-cal.c:5097
+#: camel/providers/smtp/camel-smtp-transport.c:212
msgid "Authentication required"
msgstr "Authentication required"
-#: calendar/libecal/e-cal.c:5044
+#: calendar/libecal/e-cal.c:5099
msgid "A CORBA exception has occurred"
msgstr "A CORBA exception has occurred"
-#: calendar/libecal/e-cal.c:5046 camel/providers/imap/camel-imap-command.c:310
+#: calendar/libecal/e-cal.c:5101
+#: camel/providers/groupwise/camel-groupwise-transport.c:212
+#: camel/providers/imap/camel-imap-command.c:310
#: camel/providers/imap/camel-imap-command.c:410
#: camel/providers/imap4/camel-imap4-store.c:376
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
-#: camel/providers/pop3/camel-pop3-store.c:548
+#: camel/providers/pop3/camel-pop3-store.c:533
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:546
#: servers/exchange/storage/e-storage.c:586
-#: servers/groupwise/e-gw-connection.c:174
+#: servers/groupwise/e-gw-connection.c:175
msgid "Unknown error"
msgstr "Unknown error"
-#: calendar/libecal/e-cal.c:5048 servers/exchange/storage/e-storage.c:554
+#: calendar/libecal/e-cal.c:5103 servers/exchange/storage/e-storage.c:554
msgid "No error"
msgstr "No error"
@@ -1231,43 +1234,43 @@ 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
+#: camel/camel-cipher-context.c:102
msgid "Signing is not supported by this cipher"
msgstr "Signing is not supported by this cipher"
-#: camel/camel-cipher-context.c:129
+#: camel/camel-cipher-context.c:128
msgid "Signing message"
msgstr "Signing message"
-#: camel/camel-cipher-context.c:146
+#: camel/camel-cipher-context.c:145
msgid "Verifying is not supported by this cipher"
msgstr "Verifying is not supported by this cipher"
-#: camel/camel-cipher-context.c:172
+#: camel/camel-cipher-context.c:171
msgid "Verifying message"
msgstr "Verifying message"
-#: camel/camel-cipher-context.c:190
+#: camel/camel-cipher-context.c:189
msgid "Encryption is not supported by this cipher"
msgstr "Encryption is not supported by this cipher"
-#: camel/camel-cipher-context.c:216
+#: camel/camel-cipher-context.c:215
msgid "Encrypting message"
msgstr "Encrypting message"
-#: camel/camel-cipher-context.c:233
+#: camel/camel-cipher-context.c:232
msgid "Decryption is not supported by this cipher"
msgstr "Decryption is not supported by this cipher"
-#: camel/camel-cipher-context.c:255
+#: camel/camel-cipher-context.c:254
msgid "Decrypting message"
msgstr "Decrypting message"
-#: camel/camel-cipher-context.c:272
+#: camel/camel-cipher-context.c:271
msgid "You may not import keys with this cipher"
msgstr "You may not import keys with this cipher"
-#: camel/camel-cipher-context.c:302
+#: camel/camel-cipher-context.c:301
msgid "You may not export keys with this cipher"
msgstr "You may not export keys with this cipher"
@@ -1319,10 +1322,16 @@ msgstr "Downloading new messages for offline mode"
msgid "Preparing folder '%s' for offline"
msgstr "Preparing folder '%s' for offline"
-#: camel/camel-disco-store.c:391 camel/providers/imap/camel-imap-store.c:3252
+#: camel/camel-disco-store.c:395
+#: camel/providers/groupwise/camel-groupwise-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:2944
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
+#: camel/camel-exception.c:308
+msgid "No description available"
+msgstr "No description available"
+
#: camel/camel-filter-driver.c:701 camel/camel-filter-search.c:523
#, c-format
msgid "Failed to create pipe to '%s': %s"
@@ -1522,7 +1531,7 @@ msgstr ""
"user: \"%s\""
#: camel/camel-gpg-context.c:803 camel/camel-gpg-context.c:1000
-#: camel/providers/nntp/camel-nntp-store.c:1276
+#: camel/providers/nntp/camel-nntp-store.c:1273
msgid "Cancelled."
msgstr "Cancelled."
@@ -1541,7 +1550,7 @@ msgstr "Failed to encrypt: No valid recipients specified."
#. always called on an i/o error
#: camel/camel-gpg-context.c:1138 camel/camel-gpg-context.c:1262
-#: camel/camel-gpg-context.c:1745 camel/camel-gpg-context.c:1790
+#: camel/camel-gpg-context.c:1744 camel/camel-gpg-context.c:1789
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
@@ -1553,8 +1562,8 @@ msgstr "Could not generate signing data: %s"
#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1464
#: camel/camel-gpg-context.c:1547 camel/camel-gpg-context.c:1562
-#: camel/camel-gpg-context.c:1667 camel/camel-gpg-context.c:1682
-#: camel/camel-gpg-context.c:1761 camel/camel-gpg-context.c:1806
+#: camel/camel-gpg-context.c:1666 camel/camel-gpg-context.c:1681
+#: camel/camel-gpg-context.c:1760 camel/camel-gpg-context.c:1805
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
@@ -1587,28 +1596,28 @@ msgstr "This is a digitally encrypted message part"
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Failed to decrypt MIME part: protocol error"
-#: camel/camel-gpg-context.c:1649
+#: camel/camel-gpg-context.c:1648
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: camel/camel-gpg-context.c:1703 camel/camel-smime-context.c:966
+#: camel/camel-gpg-context.c:1702 camel/camel-smime-context.c:966
msgid "Encrypted content"
msgstr "Encrypted content"
-#: camel/camel-gpg-context.c:1722
+#: camel/camel-gpg-context.c:1721
msgid "Unable to parse message content"
msgstr "Unable to parse message content"
-#: camel/camel-gpg-context.c:1746 camel/camel-gpg-context.c:1791
+#: camel/camel-gpg-context.c:1745 camel/camel-gpg-context.c:1790
#: camel/camel-tcp-stream-openssl.c:631
#: camel/providers/imap4/camel-imap4-engine.c:1550
#: camel/providers/imap4/camel-imap4-engine.c:1589
#: camel/providers/imap4/camel-imap4-engine.c:1634
#: camel/providers/imap4/camel-imap4-engine.c:1690
-#: camel/providers/imap4/camel-imap4-store.c:1434
+#: camel/providers/imap4/camel-imap4-store.c:1435
#: camel/providers/imap4/camel-imap4-utils.c:575
-#: camel/providers/smtp/camel-smtp-transport.c:163
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/providers/smtp/camel-smtp-transport.c:215
msgid "Unknown"
msgstr "Unknown"
@@ -1711,8 +1720,8 @@ 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/providers/pop3/camel-pop3-store.c:529
+#: camel/camel-net-utils.c:739 camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:527
msgid "Cancelled"
msgstr "Cancelled"
@@ -1747,12 +1756,12 @@ msgstr "Name lookup failed"
msgid "Name lookup failed: %s"
msgstr "Name lookup failed: %s"
-#: camel/camel-offline-folder.c:255
+#: camel/camel-offline-folder.c:253
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "Syncing messages in folder '%s' to disk"
-#: camel/camel-offline-journal.c:165 camel/camel-offline-journal.c:188
+#: camel/camel-offline-journal.c:162 camel/camel-offline-journal.c:185
#, c-format
msgid "Cannot write offline journal for folder `%s': %s"
msgstr "Cannot write offline journal for folder `%s': %s"
@@ -1943,8 +1952,8 @@ 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-kerberos4.c:226
-#: camel/providers/imap/camel-imap-store.c:1246
+#: camel/camel-sasl-kerberos4.c:228
+#: camel/providers/imap/camel-imap-store.c:1249
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
@@ -1952,16 +1961,16 @@ msgstr "Bad authentication response from server."
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:44
msgid "Kerberos 4"
msgstr "Kerberos 4"
-#: camel/camel-sasl-kerberos4.c:44
+#: camel/camel-sasl-kerberos4.c:46
msgid "This option will connect to the server using Kerberos 4 authentication."
msgstr ""
"This option will connect to the server using Kerberos 4 authentication."
-#: camel/camel-sasl-kerberos4.c:169
+#: camel/camel-sasl-kerberos4.c:171
#, c-format
msgid ""
"Could not get Kerberos ticket:\n"
@@ -2023,17 +2032,17 @@ msgstr "POP Before SMTP auth using a non-pop source"
msgid "Regular expression compilation failed: %s: %s"
msgstr "Regular expression compilation failed: %s: %s"
-#: camel/camel-service.c:272
+#: camel/camel-service.c:270
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' needs a username component"
-#: camel/camel-service.c:276
+#: camel/camel-service.c:274
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' needs a host component"
-#: camel/camel-service.c:280
+#: camel/camel-service.c:278
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' needs a path component"
@@ -2254,6 +2263,7 @@ msgid "export keys: unimplemented"
msgstr "export keys: unimplemented"
#: camel/camel-store.c:215
+#: camel/providers/groupwise/camel-groupwise-transport.c:168
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Cannot get folder: Invalid operation on this store"
@@ -2262,34 +2272,34 @@ msgstr "Cannot get folder: Invalid operation on this store"
msgid "Cannot create folder `%s': folder exists"
msgstr "Cannot create folder `%s': folder exists"
-#: camel/camel-store.c:301
+#: camel/camel-store.c:311
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Cannot create folder: Invalid operation on this store"
-#: camel/camel-store.c:329
+#: camel/camel-store.c:339
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Cannot create folder: %s: folder exists"
-#: camel/camel-store.c:393 camel/camel-vee-store.c:367
+#: camel/camel-store.c:403 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:443 camel/camel-vee-store.c:404
+#: camel/camel-store.c:453 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"
#. the name of the Trash folder, used for deleted messages
-#: camel/camel-store.c:784 camel/camel-vtrash-folder.c:47
+#: camel/camel-store.c:794 camel/camel-vtrash-folder.c:47
msgid "Trash"
msgstr "Trash"
#. the name of the Junk folder, used for spam messages
-#: camel/camel-store.c:787 camel/camel-vtrash-folder.c:49
+#: camel/camel-store.c:797 camel/camel-vtrash-folder.c:49
msgid "Junk"
msgstr "Junk"
@@ -2409,7 +2419,7 @@ 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:833
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:838
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2422,11 +2432,11 @@ msgstr ""
"Fingerprint: %s\n"
"Signature: %s"
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:839
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:844
msgid "GOOD"
msgstr "GOOD"
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:839
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:844
msgid "BAD"
msgstr "BAD"
@@ -2450,7 +2460,7 @@ msgstr ""
"Do you wish to accept anyway?"
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:843
+#: camel/camel-tcp-stream-ssl.c:848
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2465,7 +2475,7 @@ msgstr ""
"\n"
"Do you wish to accept?"
-#: camel/camel-tcp-stream-ssl.c:887
+#: camel/camel-tcp-stream-ssl.c:892
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2474,7 +2484,7 @@ msgstr ""
"Certificate problem: %s\n"
"Issuer: %s"
-#: camel/camel-tcp-stream-ssl.c:939
+#: camel/camel-tcp-stream-ssl.c:944
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2483,7 +2493,7 @@ msgstr ""
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: camel/camel-tcp-stream-ssl.c:957
+#: camel/camel-tcp-stream-ssl.c:962
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2492,7 +2502,7 @@ msgstr ""
"Certificate expired: %s\n"
"Issuer: %s"
-#: camel/camel-tcp-stream-ssl.c:974
+#: camel/camel-tcp-stream-ssl.c:979
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2506,17 +2516,17 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr "Could not parse URL `%s'"
-#: camel/camel-vee-folder.c:476
+#: camel/camel-vee-folder.c:475
#, c-format
msgid "Error storing `%s': %s"
msgstr "Error storing `%s': %s"
-#: camel/camel-vee-folder.c:518
+#: camel/camel-vee-folder.c:517
#, c-format
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:642 camel/camel-vee-folder.c:648
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Cannot copy or move messages into a Virtual Folder"
@@ -2542,8 +2552,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:115
-#: camel/providers/imap/camel-imap-folder.c:2004
+#: camel/providers/groupwise/camel-groupwise-folder.c:116
+#: camel/providers/imap/camel-imap-folder.c:2057
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2552,15 +2562,15 @@ msgstr ""
"Cannot get message: %s\n"
" %s"
-#: camel/providers/groupwise/camel-groupwise-folder.c:115
-#: camel/providers/imap/camel-imap-folder.c:2004
+#: camel/providers/groupwise/camel-groupwise-folder.c:116
+#: camel/providers/imap/camel-imap-folder.c:2057
#: camel/providers/local/camel-maildir-folder.c:245
#: camel/providers/local/camel-mbox-folder.c:340
#: camel/providers/local/camel-mh-folder.c:203
msgid "No such message"
msgstr "No such message"
-#: camel/providers/groupwise/camel-groupwise-folder.c:129
+#: camel/providers/groupwise/camel-groupwise-folder.c:128
#: camel/providers/imap4/camel-imap4-folder.c:787
#: camel/providers/nntp/camel-nntp-folder.c:157
#: camel/providers/nntp/camel-nntp-folder.c:233
@@ -2586,33 +2596,42 @@ msgstr "User cancelled"
msgid "Cannot get message %s: %s"
msgstr "Cannot get message %s: %s"
-#: camel/providers/groupwise/camel-groupwise-folder.c:153
+#: camel/providers/groupwise/camel-groupwise-folder.c:152
+#: camel/providers/groupwise/camel-groupwise-folder.c:160
#: camel/providers/imap4/camel-imap4-folder.c:810
msgid "This message is not available in offline mode."
msgstr "This message is not available in offline mode."
-#: camel/providers/groupwise/camel-groupwise-folder.c:164
#: camel/providers/groupwise/camel-groupwise-folder.c:171
-#: camel/providers/groupwise/camel-groupwise-folder.c:1129
+#: camel/providers/groupwise/camel-groupwise-folder.c:178
+#: camel/providers/groupwise/camel-groupwise-folder.c:1389
msgid "Could not get message"
msgstr "Could not get message"
-#: camel/providers/groupwise/camel-groupwise-folder.c:674
+#: camel/providers/groupwise/camel-groupwise-folder.c:702
#: camel/providers/imap/camel-imap-folder.c:246
#, c-format
msgid "Could not load summary for %s"
msgstr "Could not load summary for %s"
-#: camel/providers/groupwise/camel-groupwise-folder.c:1333
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "Cannot create message: %s"
+#: camel/providers/groupwise/camel-groupwise-folder.c:1025
+#: camel/providers/groupwise/camel-groupwise-store.c:563
+#: camel/providers/imap/camel-imap-folder.c:2369
+#: camel/providers/imap/camel-imap-folder.c:2439
+msgid "Fetching summary information for new messages"
+msgstr "Fetching summary information for new messages"
-#: camel/providers/groupwise/camel-groupwise-folder.c:1345
+#: camel/providers/groupwise/camel-groupwise-folder.c:1618
+#: camel/providers/groupwise/camel-groupwise-folder.c:1664
#, c-format
msgid "Cannot append message to folder `%s': %s"
msgstr "Cannot append message to folder `%s': %s"
+#: camel/providers/groupwise/camel-groupwise-folder.c:1652
+#, c-format
+msgid "Cannot create message: %s"
+msgstr "Cannot create message: %s"
+
#: camel/providers/groupwise/camel-groupwise-journal.c:283
#, c-format
msgid "Cannot get folder container %s"
@@ -2694,69 +2713,58 @@ msgid ""
msgstr ""
"This option will connect to the GroupWise server using a plaintext password."
-#: camel/providers/groupwise/camel-groupwise-store.c:274
+#: camel/providers/groupwise/camel-groupwise-store.c:104
msgid "Host or user not available in url"
msgstr "Host or user not available in URL"
-#: camel/providers/groupwise/camel-groupwise-store.c:369
+#: camel/providers/groupwise/camel-groupwise-store.c:203
#, c-format
msgid "%sPlease enter the GroupWise password for %s@%s"
msgstr "%sPlease enter the GroupWise password for %s@%s"
-#: camel/providers/groupwise/camel-groupwise-store.c:383
-#: camel/providers/imap/camel-imap-store.c:1325
+#: camel/providers/groupwise/camel-groupwise-store.c:217
+#: camel/providers/imap/camel-imap-store.c:1328
msgid "You didn't enter a password."
msgstr "You didn't enter a password."
-#: camel/providers/groupwise/camel-groupwise-store.c:397
+#: camel/providers/groupwise/camel-groupwise-store.c:231
msgid "Unable to authenticate to GroupWise server."
msgstr "Unable to authenticate with GroupWise server."
-#: camel/providers/groupwise/camel-groupwise-store.c:438
+#: camel/providers/groupwise/camel-groupwise-store.c:297
msgid "Some features may not work correctly with your current server version"
msgstr "Some features may not work correctly with your current server version"
-#: camel/providers/groupwise/camel-groupwise-store.c:539
-#: camel/providers/imap/camel-imap-store.c:1891
-#: camel/providers/imap/camel-imap-store.c:2077
+#: camel/providers/groupwise/camel-groupwise-store.c:470
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2048
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: camel/providers/groupwise/camel-groupwise-store.c:590
-#: camel/providers/imap/camel-imap-folder.c:2309
-#: camel/providers/imap/camel-imap-folder.c:2379
-msgid "Fetching summary information for new messages"
-msgstr "Fetching summary information for new messages"
-
-#: camel/providers/groupwise/camel-groupwise-store.c:727
-msgid "Cannot get folder info in offline mode."
-msgstr "Cannot get folder info in offline mode."
-
-#: camel/providers/groupwise/camel-groupwise-store.c:1031
+#: camel/providers/groupwise/camel-groupwise-store.c:1054
msgid "Cannot create GroupWise folders in offline mode."
msgstr "Cannot create GroupWise folders in offline mode."
-#: camel/providers/groupwise/camel-groupwise-store.c:1076
-msgid "Cannot delete GroupWise folders in offline mode."
-msgstr "Cannot delete GroupWise folders in offline mode."
-
-#: camel/providers/groupwise/camel-groupwise-store.c:1116
-msgid "Cannot rename GroupWise folders in offline mode."
-msgstr "Cannot rename GroupWise folders in offline mode."
+#: camel/providers/groupwise/camel-groupwise-store.c:1068
+#: camel/providers/imap/camel-imap-store.c:1932
+#: camel/providers/imap/camel-imap-store.c:2301
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "The parent folder is not allowed to contain subfolders"
-#: camel/providers/groupwise/camel-groupwise-store.c:1130
+#: camel/providers/groupwise/camel-groupwise-store.c:1145
+#: camel/providers/groupwise/camel-groupwise-store.c:1166
#, c-format
msgid "Cannot rename Groupwise folder `%s' to `%s'"
msgstr "Cannot rename Groupwise folder `%s' to `%s'"
-#: camel/providers/groupwise/camel-groupwise-store.c:1162
+#: camel/providers/groupwise/camel-groupwise-store.c:1198
#: camel/providers/groupwise/camel-groupwise-transport.c:121
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise server %s"
-#: camel/providers/groupwise/camel-groupwise-store.c:1164
+#: camel/providers/groupwise/camel-groupwise-store.c:1200
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "GroupWise service for %s on %s"
@@ -2770,15 +2778,21 @@ msgstr "GroupWise mail delivery via %s"
msgid "Sending Message"
msgstr "Sending Message"
+#: camel/providers/groupwise/camel-groupwise-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#, c-format
+msgid "Could not send message: %s"
+msgstr "Could not send message: %s"
+
#: camel/providers/imap/camel-imap-command.c:222
#: camel/providers/imap/camel-imap-command.c:264
#: camel/providers/imap/camel-imap-command.c:471
-#: camel/providers/imap/camel-imap-store.c:3292
+#: camel/providers/imap/camel-imap-store.c:2984
msgid "Operation cancelled"
msgstr "Operation cancelled"
#: camel/providers/imap/camel-imap-command.c:309
-#: camel/providers/imap/camel-imap-store.c:3295
+#: camel/providers/imap/camel-imap-store.c:2987
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %s"
@@ -2828,40 +2842,40 @@ msgid "Folder was destroyed and recreated on server."
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:596
+#: camel/providers/imap/camel-imap-folder.c:628
#: 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:1964
+#: camel/providers/imap/camel-imap-folder.c:2017
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "Unable to retrieve message: %s"
-#: camel/providers/imap/camel-imap-folder.c:2041
-#: camel/providers/imap/camel-imap-folder.c:2648
+#: camel/providers/imap/camel-imap-folder.c:2096
+#: camel/providers/imap/camel-imap-folder.c:2711
#: 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:2486
+#: camel/providers/imap/camel-imap-folder.c:2547
#, 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:2494
+#: camel/providers/imap/camel-imap-folder.c:2555
#, 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:2507
+#: camel/providers/imap/camel-imap-folder.c:2568
#, 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"
-#: camel/providers/imap/camel-imap-folder.c:2686
+#: camel/providers/imap/camel-imap-folder.c:2749
msgid "Could not find message body in FETCH response."
msgstr "Could not find message body in FETCH response."
@@ -2962,55 +2976,55 @@ msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"This option will connect to the IMAP server using a plaintext password."
-#: camel/providers/imap/camel-imap-store.c:422
+#: camel/providers/imap/camel-imap-store.c:420
#: camel/providers/imap4/camel-imap4-store.c:215
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
-#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap/camel-imap-store.c:422
#: camel/providers/imap4/camel-imap4-store.c:217
#, c-format
msgid "IMAP service for %s on %s"
msgstr "IMAP service for %s on %s"
-#: camel/providers/imap/camel-imap-store.c:554
-#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:567
#: camel/providers/imap4/camel-imap4-store.c:322
#: camel/providers/imap4/camel-imap4-store.c:337
-#: 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
+#: camel/providers/nntp/camel-nntp-store.c:186
+#: camel/providers/nntp/camel-nntp-store.c:201
+#: camel/providers/pop3/camel-pop3-store.c:167
+#: camel/providers/pop3/camel-pop3-store.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:254
+#: camel/providers/smtp/camel-smtp-transport.c:269
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Could not connect to %s: %s"
-#: camel/providers/imap/camel-imap-store.c:555
+#: camel/providers/imap/camel-imap-store.c:553
#: camel/providers/imap4/camel-imap4-store.c:323
-#: camel/providers/nntp/camel-nntp-store.c:201
-#: camel/providers/pop3/camel-pop3-store.c:170
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/providers/nntp/camel-nntp-store.c:187
+#: camel/providers/pop3/camel-pop3-store.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:255
msgid "SSL unavailable"
msgstr "SSL unavailable"
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/imap/camel-imap-store.c:836
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:834
#: camel/providers/imap4/camel-imap4-store.c:270
#: camel/providers/imap4/camel-imap4-store.c:334
#: camel/providers/imapp/camel-imapp-store.c:248
-#: camel/providers/nntp/camel-nntp-store.c:212
-#: camel/providers/nntp/camel-nntp-store.c:231
-#: camel/providers/pop3/camel-pop3-store.c:181
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/nntp/camel-nntp-store.c:198
+#: camel/providers/nntp/camel-nntp-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:266
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: camel/providers/imap/camel-imap-store.c:674
-#: camel/providers/imap/camel-imap-store.c:696
-#: camel/providers/imap/camel-imap-store.c:702
+#: camel/providers/imap/camel-imap-store.c:672
+#: camel/providers/imap/camel-imap-store.c:694
+#: camel/providers/imap/camel-imap-store.c:700
#: camel/providers/imap4/camel-imap4-store.c:362
#: camel/providers/imap4/camel-imap4-store.c:375
#: camel/providers/imap4/camel-imap4-store.c:391
@@ -3018,35 +3032,35 @@ msgstr "Connection cancelled"
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:675
-#: camel/providers/smtp/camel-smtp-transport.c:326
+#: camel/providers/imap/camel-imap-store.c:673
+#: camel/providers/smtp/camel-smtp-transport.c:323
msgid "STARTTLS not supported"
msgstr "STARTTLS not supported"
-#: camel/providers/imap/camel-imap-store.c:697
+#: camel/providers/imap/camel-imap-store.c:695
#: camel/providers/imap4/camel-imap4-store.c:363
-#: camel/providers/pop3/camel-pop3-store.c:246
+#: camel/providers/pop3/camel-pop3-store.c:244
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: camel/providers/imap/camel-imap-store.c:703
+#: camel/providers/imap/camel-imap-store.c:701
#: camel/providers/imap4/camel-imap4-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:252
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/smtp/camel-smtp-transport.c:362
msgid "SSL is not available in this build"
msgstr "SSL is not available in this build"
-#: camel/providers/imap/camel-imap-store.c:839
+#: camel/providers/imap/camel-imap-store.c:837
#: camel/providers/imap4/camel-imap4-store.c:273
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not connect with command \"%s\": %s"
#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: camel/providers/imap/camel-imap-store.c:1022
-#: camel/providers/imap/camel-imap-store.c:2441
+#: camel/providers/imap/camel-imap-store.c:1021
+#: camel/providers/imap/camel-imap-store.c:2397
#: camel/providers/imap4/camel-imap4-store-summary.c:368
-#: camel/providers/imap4/camel-imap4-store.c:1267
+#: camel/providers/imap4/camel-imap4-store.c:1268
#: camel/providers/local/camel-maildir-folder.c:75
#: camel/providers/local/camel-maildir-store.c:217
#: camel/providers/local/camel-maildir-store.c:289
@@ -3057,24 +3071,24 @@ msgstr "Could not connect with command \"%s\": %s"
msgid "Inbox"
msgstr "Inbox"
-#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/imap/camel-imap-store.c:1281
#, c-format
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:1288
-#: camel/providers/smtp/camel-smtp-transport.c:501
+#: camel/providers/imap/camel-imap-store.c:1291
+#: camel/providers/smtp/camel-smtp-transport.c:498
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: camel/providers/imap/camel-imap-store.c:1311
+#: camel/providers/imap/camel-imap-store.c:1314
#: camel/providers/imapp/camel-imapp-store.c:364
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%sPlease enter the IMAP password for %s@%s"
-#: camel/providers/imap/camel-imap-store.c:1354
+#: camel/providers/imap/camel-imap-store.c:1357
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3085,29 +3099,24 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1909
-#: camel/providers/imap/camel-imap-store.c:2283
-#: camel/providers/imap4/camel-imap4-store.c:856
+#: camel/providers/imap/camel-imap-store.c:1869
+#: camel/providers/imap/camel-imap-store.c:2239
+#: camel/providers/imap4/camel-imap4-store.c:857
#, 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\""
-#: camel/providers/imap/camel-imap-store.c:1967
-#: camel/providers/imap/camel-imap-store.c:2345
-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:2022
+#: camel/providers/imap/camel-imap-store.c:1986
#: camel/providers/local/camel-maildir-store.c:190
#: camel/providers/local/camel-mbox-store.c:199
-#: camel/providers/local/camel-mh-store.c:237
+#: camel/providers/local/camel-mh-store.c:249
#, c-format
msgid "Cannot create folder `%s': folder exists."
msgstr "Cannot create folder `%s': folder exists."
-#: camel/providers/imap/camel-imap-store.c:2294
+#: camel/providers/imap/camel-imap-store.c:2250
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
@@ -3236,114 +3245,114 @@ msgid ""
msgstr ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
-#: camel/providers/imap4/camel-imap4-store.c:477
+#: camel/providers/imap4/camel-imap4-store.c:478
#, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
msgstr ""
"Cannot authenticate with IMAP server %s using the %s authentication mechanism"
-#: camel/providers/imap4/camel-imap4-store.c:522
+#: camel/providers/imap4/camel-imap4-store.c:523
#, 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:592
+#: camel/providers/imap4/camel-imap4-store.c:593
#, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "Cannot authenticate with IMAP server %s using %s"
-#: camel/providers/imap4/camel-imap4-store.c:754
-#: camel/providers/imap4/camel-imap4-store.c:866
+#: camel/providers/imap4/camel-imap4-store.c:755
+#: camel/providers/imap4/camel-imap4-store.c:867
msgid "Cannot create IMAP folders in offline mode."
msgstr "Cannot create IMAP folders in offline mode."
-#: camel/providers/imap4/camel-imap4-store.c:793
+#: camel/providers/imap4/camel-imap4-store.c:794
#, 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:914
+#: camel/providers/imap4/camel-imap4-store.c:915
#, 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:920
+#: camel/providers/imap4/camel-imap4-store.c:921
#, c-format
msgid "Cannot create folder `%s': Bad command"
msgstr "Cannot create folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:951
+#: camel/providers/imap4/camel-imap4-store.c:952
#, c-format
msgid "Cannot delete folder `%s': Special folder"
msgstr "Cannot delete folder `%s': Special folder"
-#: camel/providers/imap4/camel-imap4-store.c:958
+#: camel/providers/imap4/camel-imap4-store.c:959
msgid "Cannot delete IMAP folders in offline mode."
msgstr "Cannot delete IMAP folders in offline mode."
-#: camel/providers/imap4/camel-imap4-store.c:1017
+#: camel/providers/imap4/camel-imap4-store.c:1018
#, 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:1022
+#: camel/providers/imap4/camel-imap4-store.c:1023
#, c-format
msgid "Cannot delete folder `%s': Bad command"
msgstr "Cannot delete folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:1042
+#: camel/providers/imap4/camel-imap4-store.c:1043
#, 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:1049
+#: camel/providers/imap4/camel-imap4-store.c:1050
msgid "Cannot rename IMAP folders in offline mode."
msgstr "Cannot rename IMAP folders in offline mode."
-#: camel/providers/imap4/camel-imap4-store.c:1080
+#: camel/providers/imap4/camel-imap4-store.c:1081
#, 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:1085
+#: camel/providers/imap4/camel-imap4-store.c:1086
#, 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:1432
+#: camel/providers/imap4/camel-imap4-store.c:1433
#, 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:1434
+#: camel/providers/imap4/camel-imap4-store.c:1435
msgid "Bad command"
msgstr "Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:1472
+#: camel/providers/imap4/camel-imap4-store.c:1473
msgid "Cannot subscribe to IMAP folders in offline mode."
msgstr "Cannot subscribe to IMAP folders in offline mode."
-#: camel/providers/imap4/camel-imap4-store.c:1517
+#: camel/providers/imap4/camel-imap4-store.c:1518
#, 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:1522
+#: camel/providers/imap4/camel-imap4-store.c:1523
#, 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:1544
+#: camel/providers/imap4/camel-imap4-store.c:1545
msgid "Cannot unsubscribe from IMAP folders in offline mode."
msgstr "Cannot unsubscribe from IMAP folders in offline mode."
-#: camel/providers/imap4/camel-imap4-store.c:1589
+#: camel/providers/imap4/camel-imap4-store.c:1590
#, 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:1594
+#: camel/providers/imap4/camel-imap4-store.c:1595
#, c-format
msgid "Cannot unsubscribe from folder `%s': Bad command"
msgstr "Cannot unsubscribe from folder `%s': Bad command"
@@ -3402,20 +3411,20 @@ msgid "Index message body data"
msgstr "Index message body data"
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:378
+#: camel/providers/local/camel-local-folder.c:381
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:382
#: camel/providers/local/camel-local-folder.c:385
+#: camel/providers/local/camel-local-folder.c:388
#, c-format
msgid "mailbox:%s (%s)"
msgstr "mailbox:%s (%s)"
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:392
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
@@ -3530,12 +3539,12 @@ msgstr "Could not delete folder index file `%s': %s"
msgid "Could not delete folder meta file `%s': %s"
msgstr "Could not delete folder meta file `%s': %s"
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:405
#, c-format
msgid "Could not save summary: %s: %s"
msgstr "Could not save summary: %s: %s"
-#: camel/providers/local/camel-local-summary.c:464
+#: camel/providers/local/camel-local-summary.c:463
msgid "Unable to add message to summary: unknown reason"
msgstr "Unable to add message to summary: unknown reason"
@@ -3580,14 +3589,14 @@ msgstr "Cannot create folder `%s': %s"
#: camel/providers/local/camel-maildir-store.c:159
#: camel/providers/local/camel-mbox-store.c:141
-#: camel/providers/local/camel-mh-store.c:205
+#: camel/providers/local/camel-mh-store.c:217
#, c-format
msgid "Cannot get folder `%s': %s"
msgstr "Cannot get folder `%s': %s"
#: camel/providers/local/camel-maildir-store.c:163
#: camel/providers/local/camel-mbox-store.c:149
-#: camel/providers/local/camel-mh-store.c:212
+#: camel/providers/local/camel-mh-store.c:224
#, c-format
msgid "Cannot get folder `%s': folder does not exist."
msgstr "Cannot get folder `%s': folder does not exist."
@@ -3599,7 +3608,7 @@ msgstr "Cannot get folder `%s': not a maildir directory."
#: camel/providers/local/camel-maildir-store.c:232
#: camel/providers/local/camel-maildir-store.c:270
-#: camel/providers/local/camel-mh-store.c:261
+#: camel/providers/local/camel-mh-store.c:273
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "Could not delete folder `%s': %s"
@@ -3633,7 +3642,7 @@ msgstr "Checking for new messages"
#: camel/providers/local/camel-mbox-summary.c:416
#: camel/providers/local/camel-mbox-summary.c:589
#: camel/providers/local/camel-mbox-summary.c:680
-#: camel/providers/local/camel-spool-summary.c:140
+#: camel/providers/local/camel-spool-summary.c:139
msgid "Storing folder"
msgstr "Storing folder"
@@ -3742,19 +3751,19 @@ msgstr "Cannot check folder: %s: %s"
#: camel/providers/local/camel-mbox-summary.c:594
#: camel/providers/local/camel-mbox-summary.c:685
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-spool-summary.c:144
#, c-format
msgid "Could not open file: %s: %s"
msgstr "Could not open file: %s: %s"
#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-spool-summary.c:165
+#: camel/providers/local/camel-spool-summary.c:164
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Cannot open temporary mailbox: %s"
#: camel/providers/local/camel-mbox-summary.c:619
-#: camel/providers/local/camel-mbox-summary.c:793
+#: camel/providers/local/camel-mbox-summary.c:791
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Could not close source folder %s: %s"
@@ -3770,31 +3779,31 @@ msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
#: camel/providers/local/camel-mbox-summary.c:696
-#: camel/providers/local/camel-mbox-summary.c:904
+#: camel/providers/local/camel-mbox-summary.c:902
#, c-format
msgid "Could not store folder: %s"
msgstr "Could not store folder: %s"
#: camel/providers/local/camel-mbox-summary.c:733
#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:935
-#: camel/providers/local/camel-mbox-summary.c:943
+#: camel/providers/local/camel-mbox-summary.c:933
+#: camel/providers/local/camel-mbox-summary.c:941
msgid "Summary and folder mismatch, even after a sync"
msgstr "Summary and folder mismatch, even after a sync"
-#: camel/providers/local/camel-mbox-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:867
+#: camel/providers/local/camel-spool-summary.c:336
#, c-format
msgid "Unknown error: %s"
msgstr "Unknown error: %s"
-#: camel/providers/local/camel-mbox-summary.c:998
-#: camel/providers/local/camel-mbox-summary.c:1024
+#: camel/providers/local/camel-mbox-summary.c:996
+#: camel/providers/local/camel-mbox-summary.c:1022
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "Error writing to temp mailbox: %s"
-#: camel/providers/local/camel-mbox-summary.c:1015
+#: camel/providers/local/camel-mbox-summary.c:1013
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "Writing to tmp mailbox failed: %s: %s"
@@ -3808,17 +3817,17 @@ msgstr "MH append message cancelled"
msgid "Cannot append message to mh folder: %s: %s"
msgstr "Cannot append message to mh folder: %s: %s"
-#: camel/providers/local/camel-mh-store.c:220
+#: camel/providers/local/camel-mh-store.c:232
#, c-format
msgid "Could not create folder `%s': %s"
msgstr "Could not create folder `%s': %s"
-#: camel/providers/local/camel-mh-store.c:232
+#: camel/providers/local/camel-mh-store.c:244
#, c-format
msgid "Cannot get folder `%s': not a directory."
msgstr "Cannot get folder `%s': not a directory."
-#: camel/providers/local/camel-mh-summary.c:247
+#: camel/providers/local/camel-mh-summary.c:246
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "Cannot open MH directory path: %s: %s"
@@ -3888,21 +3897,21 @@ msgstr "Spool folders cannot be renamed"
msgid "Spool folders cannot be deleted"
msgstr "Spool folders cannot be deleted"
-#: camel/providers/local/camel-spool-summary.c:178
-#: camel/providers/local/camel-spool-summary.c:188
-#: camel/providers/local/camel-spool-summary.c:198
+#: camel/providers/local/camel-spool-summary.c:177
+#: camel/providers/local/camel-spool-summary.c:187
+#: camel/providers/local/camel-spool-summary.c:197
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "Could not sync temporary folder %s: %s"
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:213
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "Could not sync spool folder %s: %s"
-#: camel/providers/local/camel-spool-summary.c:245
-#: camel/providers/local/camel-spool-summary.c:264
-#: camel/providers/local/camel-spool-summary.c:277
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:263
+#: camel/providers/local/camel-spool-summary.c:276
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
@@ -3959,22 +3968,22 @@ msgstr ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
-#: camel/providers/nntp/camel-nntp-store.c:234
+#: camel/providers/nntp/camel-nntp-store.c:220
#, c-format
msgid "Could not read greeting from %s: %s"
msgstr "Could not read greeting from %s: %s"
-#: camel/providers/nntp/camel-nntp-store.c:246
+#: camel/providers/nntp/camel-nntp-store.c:232
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP server %s returned error code %d: %s"
-#: camel/providers/nntp/camel-nntp-store.c:423
+#: camel/providers/nntp/camel-nntp-store.c:409
#, c-format
msgid "USENET News via %s"
msgstr "USENET News via %s"
-#: camel/providers/nntp/camel-nntp-store.c:813
+#: camel/providers/nntp/camel-nntp-store.c:799
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -3985,7 +3994,7 @@ msgstr ""
"\n"
"%s"
-#: camel/providers/nntp/camel-nntp-store.c:907
+#: camel/providers/nntp/camel-nntp-store.c:893
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
@@ -3995,7 +4004,7 @@ msgstr ""
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
-#: camel/providers/nntp/camel-nntp-store.c:939
+#: camel/providers/nntp/camel-nntp-store.c:925
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
@@ -4005,67 +4014,67 @@ msgstr ""
"\n"
"newsgroup does not exist!"
-#: camel/providers/nntp/camel-nntp-store.c:964
+#: camel/providers/nntp/camel-nntp-store.c:950
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "You cannot create a folder in a News store: subscribe instead."
-#: camel/providers/nntp/camel-nntp-store.c:972
+#: camel/providers/nntp/camel-nntp-store.c:958
msgid "You cannot rename a folder in a News store."
msgstr "You cannot rename a folder in a News store."
-#: camel/providers/nntp/camel-nntp-store.c:980
+#: camel/providers/nntp/camel-nntp-store.c:966
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:1150
+#: camel/providers/nntp/camel-nntp-store.c:1147
msgid "Authentication requested but no username provided"
msgstr "Authentication requested but no username provided"
-#: camel/providers/nntp/camel-nntp-store.c:1158
+#: camel/providers/nntp/camel-nntp-store.c:1155
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "Please enter the NNTP password for %s@%s"
-#: camel/providers/nntp/camel-nntp-store.c:1162
+#: camel/providers/nntp/camel-nntp-store.c:1159
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "Cannot authenticate with server: %s"
-#: camel/providers/nntp/camel-nntp-store.c:1278
+#: camel/providers/nntp/camel-nntp-store.c:1275
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP Command failed: %s"
-#: camel/providers/nntp/camel-nntp-store.c:1334
+#: camel/providers/nntp/camel-nntp-store.c:1331
msgid "Not connected."
msgstr "Not connected."
-#: camel/providers/nntp/camel-nntp-store.c:1387
+#: camel/providers/nntp/camel-nntp-store.c:1384
#, c-format
msgid "No such folder: %s"
msgstr "No such folder: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:221
-#: camel/providers/nntp/camel-nntp-summary.c:317
+#: camel/providers/nntp/camel-nntp-summary.c:220
+#: camel/providers/nntp/camel-nntp-summary.c:316
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
-#: camel/providers/nntp/camel-nntp-summary.c:228
+#: camel/providers/nntp/camel-nntp-summary.c:227
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "Unexpected server response from xover: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:331
+#: camel/providers/nntp/camel-nntp-summary.c:330
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Unexpected server response from head: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:371
+#: camel/providers/nntp/camel-nntp-summary.c:370
msgid "Use cancel"
msgstr "Use cancel"
-#: camel/providers/nntp/camel-nntp-summary.c:373
+#: camel/providers/nntp/camel-nntp-summary.c:372
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
@@ -4138,30 +4147,30 @@ msgstr ""
"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
+#: camel/providers/pop3/camel-pop3-store.c:202
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
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
-#: camel/providers/pop3/camel-pop3-store.c:245
-#: camel/providers/pop3/camel-pop3-store.c:251
+#: camel/providers/pop3/camel-pop3-store.c:216
+#: camel/providers/pop3/camel-pop3-store.c:233
+#: camel/providers/pop3/camel-pop3-store.c:243
+#: camel/providers/pop3/camel-pop3-store.c:249
#, c-format
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
+#: camel/providers/pop3/camel-pop3-store.c:217
msgid "STLS not supported"
msgstr "STLS not supported"
-#: camel/providers/pop3/camel-pop3-store.c:363
+#: camel/providers/pop3/camel-pop3-store.c:361
#, c-format
msgid "Could not connect to POP server %s"
msgstr "Could not connect to POP server %s"
-#: camel/providers/pop3/camel-pop3-store.c:404
-#: camel/providers/pop3/camel-pop3-store.c:518
+#: camel/providers/pop3/camel-pop3-store.c:402
+#: camel/providers/pop3/camel-pop3-store.c:516
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4170,28 +4179,28 @@ msgstr ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:418
#, c-format
msgid "SASL `%s' Login failed for POP server %s: %s"
msgstr "SASL `%s' Login failed for POP server %s: %s"
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:430
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "Cannot login to POP server %s: SASL Protocol error"
-#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:449
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "Failed to authenticate on POP server %s: %s"
-#: camel/providers/pop3/camel-pop3-store.c:477
+#: camel/providers/pop3/camel-pop3-store.c:475
#, c-format
msgid "%sPlease enter the POP password for %s on host %s"
msgstr "%sPlease enter the POP password for %s on host %s"
-#: camel/providers/pop3/camel-pop3-store.c:532
-#: camel/providers/pop3/camel-pop3-store.c:545
+#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:543
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4200,7 +4209,7 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
-#: camel/providers/pop3/camel-pop3-store.c:539
+#: camel/providers/pop3/camel-pop3-store.c:537
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4209,7 +4218,7 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending username: %s"
-#: camel/providers/pop3/camel-pop3-store.c:645
+#: camel/providers/pop3/camel-pop3-store.c:643
#, c-format
msgid "No such folder `%s'."
msgstr "No such folder `%s'."
@@ -4240,11 +4249,6 @@ msgstr "Could not create pipe to sendmail: %s: mail not sent"
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "Could not fork sendmail: %s: mail not sent"
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Could not send message: %s"
-
#: camel/providers/sendmail/camel-sendmail-transport.c:234
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
@@ -4276,133 +4280,133 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "For delivering mail by connecting to a remote mailhub using SMTP."
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:162
msgid "Syntax error, command unrecognized"
msgstr "Syntax error, command unrecognized"
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:164
msgid "Syntax error in parameters or arguments"
msgstr "Syntax error in parameters or arguments"
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:166
msgid "Command not implemented"
msgstr "Command not implemented"
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:168
msgid "Command parameter not implemented"
msgstr "Command parameter not implemented"
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:170
msgid "System status, or system help reply"
msgstr "System status, or system help reply"
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:172
msgid "Help message"
msgstr "Help message"
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:174
msgid "Service ready"
msgstr "Service ready"
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:176
msgid "Service closing transmission channel"
msgstr "Service closing transmission channel"
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:178
msgid "Service not available, closing transmission channel"
msgstr "Service not available, closing transmission channel"
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:180
msgid "Requested mail action okay, completed"
msgstr "Requested mail action okay, completed"
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:182
msgid "User not local; will forward to <forward-path>"
msgstr "User not local; will forward to <forward-path>"
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:184
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Requested mail action not taken: mailbox unavailable"
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:186
msgid "Requested action not taken: mailbox unavailable"
msgstr "Requested action not taken: mailbox unavailable"
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:188
msgid "Requested action aborted: error in processing"
msgstr "Requested action aborted: error in processing"
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:190
msgid "User not local; please try <forward-path>"
msgstr "User not local; please try <forward-path>"
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:192
msgid "Requested action not taken: insufficient system storage"
msgstr "Requested action not taken: insufficient system storage"
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:194
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Requested mail action aborted: exceeded storage allocation"
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:196
msgid "Requested action not taken: mailbox name not allowed"
msgstr "Requested action not taken: mailbox name not allowed"
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:198
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Start mail input; end with <CRLF>.<CRLF>"
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:200
msgid "Transaction failed"
msgstr "Transaction failed"
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:204
msgid "A password transition is needed"
msgstr "A password transition is needed"
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:206
msgid "Authentication mechanism is too weak"
msgstr "Authentication mechanism is too weak"
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:208
msgid "Encryption required for requested authentication mechanism"
msgstr "Encryption required for requested authentication mechanism"
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:210
msgid "Temporary authentication failure"
msgstr "Temporary authentication failure"
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:291
msgid "Welcome response error"
msgstr "Welcome response error"
-#: camel/providers/smtp/camel-smtp-transport.c:325
-#: camel/providers/smtp/camel-smtp-transport.c:358
-#: camel/providers/smtp/camel-smtp-transport.c:364
+#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:355
+#: camel/providers/smtp/camel-smtp-transport.c:361
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr "Failed to connect to SMTP server %s in secure mode: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:331
#, c-format
msgid "STARTTLS command failed: %s"
msgstr "STARTTLS command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:349
+#: camel/providers/smtp/camel-smtp-transport.c:346
msgid "STARTTLS command failed"
msgstr "STARTTLS command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:491
+#: camel/providers/smtp/camel-smtp-transport.c:488
#, 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:529
+#: camel/providers/smtp/camel-smtp-transport.c:526
#, 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:548
+#: camel/providers/smtp/camel-smtp-transport.c:545
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4413,93 +4417,93 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:669
#, c-format
msgid "SMTP server %s"
msgstr "SMTP server %s"
-#: camel/providers/smtp/camel-smtp-transport.c:674
+#: camel/providers/smtp/camel-smtp-transport.c:671
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "SMTP mail delivery via %s"
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:689
msgid "Cannot send message: service not connected."
msgstr "Cannot send message: service not connected."
-#: camel/providers/smtp/camel-smtp-transport.c:698
+#: camel/providers/smtp/camel-smtp-transport.c:695
msgid "Cannot send message: sender address not valid."
msgstr "Cannot send message: sender address not valid."
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:699
msgid "Sending message"
msgstr "Sending message"
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:714
msgid "Cannot send message: no recipients defined."
msgstr "Cannot send message: no recipients defined."
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:725
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:897
+#: camel/providers/smtp/camel-smtp-transport.c:894
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: camel/providers/smtp/camel-smtp-transport.c:923
+#: camel/providers/smtp/camel-smtp-transport.c:920
#, c-format
msgid "HELO command failed: %s"
msgstr "HELO command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:937
msgid "HELO command failed"
msgstr "HELO command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1003
msgid "SMTP Authentication"
msgstr "SMTP Authentication"
-#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: camel/providers/smtp/camel-smtp-transport.c:1009
msgid "Error creating SASL authentication object."
msgstr "Error creating SASL authentication object."
-#: camel/providers/smtp/camel-smtp-transport.c:1029
-#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1037
#, c-format
msgid "AUTH command failed: %s"
msgstr "AUTH command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1043
msgid "AUTH command failed"
msgstr "AUTH command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1105
msgid "Bad authentication response from server.\n"
msgstr "Bad authentication response from server.\n"
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1130
#, 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:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1147
msgid "MAIL FROM command failed"
msgstr "MAIL FROM command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1171
#, 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:1193
+#: camel/providers/smtp/camel-smtp-transport.c:1190
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1232
-#: camel/providers/smtp/camel-smtp-transport.c:1290
-#: camel/providers/smtp/camel-smtp-transport.c:1309
+#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1287
+#: camel/providers/smtp/camel-smtp-transport.c:1306
#, c-format
msgid "DATA command failed: %s: mail not sent"
msgstr "DATA command failed: %s: mail not sent"
@@ -4507,106 +4511,106 @@ 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:1249
-#: camel/providers/smtp/camel-smtp-transport.c:1325
+#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1322
msgid "DATA command failed"
msgstr "DATA command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1348
+#: camel/providers/smtp/camel-smtp-transport.c:1345
#, c-format
msgid "RSET command failed: %s"
msgstr "RSET command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1361
msgid "RSET command failed"
msgstr "RSET command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1387
+#: camel/providers/smtp/camel-smtp-transport.c:1384
#, c-format
msgid "QUIT command failed: %s"
msgstr "QUIT command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1401
+#: camel/providers/smtp/camel-smtp-transport.c:1398
msgid "QUIT command failed"
msgstr "QUIT command failed"
-#: libedataserver/e-categories.c:238
+#: libedataserver/e-categories.c:239
msgid "Business"
msgstr "Business"
-#: libedataserver/e-categories.c:239
+#: libedataserver/e-categories.c:240
msgid "Competition"
msgstr "Competition"
-#: libedataserver/e-categories.c:240
+#: libedataserver/e-categories.c:241
msgid "Favorites"
msgstr "Favourites"
-#: libedataserver/e-categories.c:241
+#: libedataserver/e-categories.c:242
msgid "Gifts"
msgstr "Gifts"
-#: libedataserver/e-categories.c:242
+#: libedataserver/e-categories.c:243
msgid "Goals/Objectives"
msgstr "Goals/Objectives"
-#: libedataserver/e-categories.c:243
+#: libedataserver/e-categories.c:244
msgid "Holiday"
msgstr "Holiday"
-#: libedataserver/e-categories.c:244
+#: libedataserver/e-categories.c:245
msgid "Holiday Cards"
msgstr "Holiday Cards"
-#: libedataserver/e-categories.c:245
+#: libedataserver/e-categories.c:246
msgid "Hot Contacts"
msgstr "Hot Contacts"
-#: libedataserver/e-categories.c:246
+#: libedataserver/e-categories.c:247
msgid "Ideas"
msgstr "Ideas"
-#: libedataserver/e-categories.c:247
+#: libedataserver/e-categories.c:248
msgid "International"
msgstr "International"
-#: libedataserver/e-categories.c:248
+#: libedataserver/e-categories.c:249
msgid "Key Customer"
msgstr "Key Customer"
-#: libedataserver/e-categories.c:249
+#: libedataserver/e-categories.c:250
msgid "Miscellaneous"
msgstr "Miscellaneous"
-#: libedataserver/e-categories.c:250
+#: libedataserver/e-categories.c:251
msgid "Personal"
msgstr "Personal"
-#: libedataserver/e-categories.c:251
+#: libedataserver/e-categories.c:252
msgid "Phone Calls"
msgstr "Phone Calls"
-#: libedataserver/e-categories.c:252
+#: libedataserver/e-categories.c:253
msgid "Status"
msgstr "Status"
-#: libedataserver/e-categories.c:253
+#: libedataserver/e-categories.c:254
msgid "Strategies"
msgstr "Strategies"
-#: libedataserver/e-categories.c:254
+#: libedataserver/e-categories.c:255
msgid "Suppliers"
msgstr "Suppliers"
-#: libedataserver/e-categories.c:255
+#: libedataserver/e-categories.c:256
msgid "Time & Expenses"
msgstr "Time & Expenses"
-#: libedataserver/e-categories.c:256
+#: libedataserver/e-categories.c:257
msgid "VIP"
msgstr "VIP"
-#: libedataserver/e-categories.c:257
+#: libedataserver/e-categories.c:258
msgid "Waiting"
msgstr "Waiting"
@@ -4790,15 +4794,15 @@ msgstr "_Edit"
msgid "categories"
msgstr "categories"
-#: libedataserverui/e-name-selector-dialog.c:211
+#: libedataserverui/e-name-selector-dialog.c:215
msgid "Select Contacts from Address Book"
msgstr "Select Contacts from Address Book"
-#: libedataserverui/e-name-selector-dialog.c:502
+#: libedataserverui/e-name-selector-dialog.c:507
msgid "_Add"
msgstr "_Add"
-#: libedataserverui/e-name-selector-dialog.c:527
+#: libedataserverui/e-name-selector-dialog.c:532
msgid "_Remove"
msgstr "_Remove"
@@ -4840,7 +4844,7 @@ msgid "_Search:"
msgstr "_Search:"
#. Edit Contact item
-#: libedataserverui/e-name-selector-entry.c:1820
+#: libedataserverui/e-name-selector-entry.c:1830
#, c-format
msgid "_Edit %s"
msgstr "_Edit %s"
@@ -4862,14 +4866,14 @@ msgstr "Select destination"
msgid "_Destination"
msgstr "_Destination"
-#: servers/exchange/lib/e2k-autoconfig.c:1573
-#: servers/exchange/storage/exchange-account.c:905
+#: servers/exchange/lib/e2k-autoconfig.c:1574
+#: servers/exchange/storage/exchange-account.c:939
#, c-format
msgid "Enter password for %s"
msgstr "Enter password for %s"
-#: servers/exchange/lib/e2k-autoconfig.c:1574
-#: servers/exchange/storage/exchange-account.c:910
+#: servers/exchange/lib/e2k-autoconfig.c:1575
+#: servers/exchange/storage/exchange-account.c:944
msgid "Enter password"
msgstr "Enter password"
@@ -4981,26 +4985,26 @@ msgstr "This operation cannot be performed in off-line mode"
#. i18n: This is the title of an "other user's folders"
#. hierarchy. Eg, "John Doe's Folders".
-#: servers/exchange/storage/exchange-account.c:609
+#: servers/exchange/storage/exchange-account.c:642
#, c-format
msgid "%s's Folders"
msgstr "%s's Folders"
-#: servers/exchange/storage/exchange-account.c:1262
+#: servers/exchange/storage/exchange-account.c:1301
msgid "Personal Folders"
msgstr "Personal Folders"
-#: servers/exchange/storage/exchange-account.c:1277
+#: servers/exchange/storage/exchange-account.c:1315
msgid "Favorite Public Folders"
msgstr "Favourite Public Folders"
#. i18n: Outlookism
-#: servers/exchange/storage/exchange-account.c:1294
+#: servers/exchange/storage/exchange-account.c:1332
msgid "All Public Folders"
msgstr "All Public Folders"
#. i18n: Outlookism
-#: servers/exchange/storage/exchange-account.c:1308
+#: servers/exchange/storage/exchange-account.c:1346
msgid "Global Address List"
msgstr "Global Address List"
@@ -5032,19 +5036,19 @@ msgstr "Sent Items"
msgid "Tasks"
msgstr "Tasks"
-#: servers/groupwise/e-gw-connection.c:158
+#: servers/groupwise/e-gw-connection.c:159
msgid "Invalid connection"
msgstr "Invalid connection"
-#: servers/groupwise/e-gw-connection.c:162
+#: servers/groupwise/e-gw-connection.c:163
msgid "Invalid response from server"
msgstr "Invalid response from server"
-#: servers/groupwise/e-gw-connection.c:164
+#: servers/groupwise/e-gw-connection.c:165
msgid "No response from the server"
msgstr "No response from the server"
-#: servers/groupwise/e-gw-connection.c:170
+#: servers/groupwise/e-gw-connection.c:171
msgid "Bad parameter"
msgstr "Bad parameter"