[evolution-data-server] Updated British English translation
- From: Philip Withnall <pwithnall src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Updated British English translation
- Date: Sat, 12 Sep 2009 23:29:29 +0000 (UTC)
commit e9dade9619df86e1d28a7d1235fa9d366a17eb7e
Author: Philip Withnall <philip tecnocode co uk>
Date: Sun Sep 13 00:29:03 2009 +0100
Updated British English translation
po/en_GB.po | 2042 +++++++++++++++++++++++++++++------------------------------
1 files changed, 999 insertions(+), 1043 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 37c6eda..03c483e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,170 +2,86 @@
# Copyright (C) 2000 Free Software Foundation, Inc.
# Robert Brady <rwb197 zepler org>, 2000.
# Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
-#
+# Philip Withnall <philip tecnocode co uk>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-23 20:49+0000\n"
+"POT-Creation-Date: 2009-09-13 00:28+0100\n"
"PO-Revision-Date: 2009-02-23 20:50+0000\n"
-"Last-Translator: David Lodge <dave cirt net>\n"
-"Language-Team: <en li org>\n"
+"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"Language-Team: British English <en li org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
msgid "Loading..."
-msgstr "Loading..."
+msgstr "Loadingâ?¦"
#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
msgid "Searching..."
-msgstr "Searching..."
+msgstr "Searchingâ?¦"
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
#, c-format
msgid "Downloading contacts (%d)... "
-msgstr "Downloading contacts (%d)... "
+msgstr "Downloading contacts (%d)â?¦ "
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
#, c-format
msgid "Updating contacts cache (%d)... "
-msgstr "Updating contacts cache (%d)... "
+msgstr "Updating contacts cache (%d)â?¦ "
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
msgid "Using Distinguished Name (DN)"
msgstr "Using Distinguished Name (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
msgid "Using Email Address"
msgstr "Using E-mail Address"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
msgid "Reconnecting to LDAP server..."
-msgstr "Reconnecting to LDAP server..."
+msgstr "Reconnecting to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
msgid "Adding contact to LDAP server..."
-msgstr "Adding contact to LDAP server..."
+msgstr "Adding contact to LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
msgid "Removing contact from LDAP server..."
-msgstr "Removing contact from LDAP server..."
+msgstr "Removing contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
msgid "Modifying contact from LDAP server..."
-msgstr "Modifying contact from LDAP server..."
+msgstr "Modifying contact from LDAP serverâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
msgid "Receiving LDAP search results..."
-msgstr "Receiving LDAP search results..."
+msgstr "Receiving LDAP search resultsâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
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:260 ../addressbook/libebook/e-book.c:264
-#: ../addressbook/libebook/e-book.c:469 ../addressbook/libebook/e-book.c:473
-#: ../addressbook/libebook/e-book.c:612 ../addressbook/libebook/e-book.c:616
-#: ../addressbook/libebook/e-book.c:703 ../addressbook/libebook/e-book.c:707
-#: ../addressbook/libebook/e-book.c:1003 ../addressbook/libebook/e-book.c:1008
-#: ../addressbook/libebook/e-book.c:1187 ../addressbook/libebook/e-book.c:1191
-#: ../addressbook/libebook/e-book.c:1346 ../addressbook/libebook/e-book.c:1350
-#: ../addressbook/libebook/e-book.c:1552 ../addressbook/libebook/e-book.c:1556
-#: ../addressbook/libebook/e-book.c:1795 ../addressbook/libebook/e-book.c:1799
-#: ../addressbook/libebook/e-book.c:2033 ../addressbook/libebook/e-book.c:2037
-#: ../addressbook/libebook/e-book.c:2242 ../addressbook/libebook/e-book.c:2246
-#: ../addressbook/libebook/e-book.c:3405
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" on book before \"%s\""
-
-#: ../addressbook/libebook/e-book.c:273 ../addressbook/libebook/e-book.c:482
-#: ../addressbook/libebook/e-book.c:625 ../addressbook/libebook/e-book.c:716
-#: ../addressbook/libebook/e-book.c:1018 ../addressbook/libebook/e-book.c:1201
-#: ../addressbook/libebook/e-book.c:1360 ../addressbook/libebook/e-book.c:1565
-#: ../addressbook/libebook/e-book.c:1808 ../addressbook/libebook/e-book.c:2047
-#: ../addressbook/libebook/e-book.c:2255 ../addressbook/libebook/e-book.c:2634
-#: ../addressbook/libebook/e-book.c:2833
-#, c-format
-msgid "book busy"
-msgstr "book busy"
-
-#: ../addressbook/libebook/e-book.c:304 ../addressbook/libebook/e-book.c:308
-#: ../addressbook/libebook/e-book.c:513 ../addressbook/libebook/e-book.c:517
-#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:656
-#: ../addressbook/libebook/e-book.c:743 ../addressbook/libebook/e-book.c:747
-#: ../addressbook/libebook/e-book.c:1045 ../addressbook/libebook/e-book.c:1048
-#: ../addressbook/libebook/e-book.c:1231 ../addressbook/libebook/e-book.c:1234
-#: ../addressbook/libebook/e-book.c:1387 ../addressbook/libebook/e-book.c:1391
-#: ../addressbook/libebook/e-book.c:1601 ../addressbook/libebook/e-book.c:1605
-#: ../addressbook/libebook/e-book.c:1855 ../addressbook/libebook/e-book.c:1859
-#: ../addressbook/libebook/e-book.c:2077 ../addressbook/libebook/e-book.c:2081
-#: ../addressbook/libebook/e-book.c:2281 ../addressbook/libebook/e-book.c:2285
-#: ../addressbook/libebook/e-book.c:2518 ../addressbook/libebook/e-book.c:2660
-#: ../addressbook/libebook/e-book.c:2664 ../addressbook/libebook/e-book.c:2859
-#: ../addressbook/libebook/e-book.c:2863 ../addressbook/libebook/e-book.c:3414
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA exception making \"%s\" call"
-
-#: ../addressbook/libebook/e-book.c:2507
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: there is no current operation"
-
-#: ../addressbook/libebook/e-book.c:2532
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: could not cancel"
-
-#: ../addressbook/libebook/e-book.c:2620 ../addressbook/libebook/e-book.c:2624
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" on book after \"%s\""
-
-#: ../addressbook/libebook/e-book.c:2688
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: cancelled"
-
-#: ../addressbook/libebook/e-book.c:3269
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: Invalid source."
-
-#: ../addressbook/libebook/e-book.c:3277 ../addressbook/libebook/e-book.c:3343
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: no factories available for URI `%s'"
-
-#: ../addressbook/libebook/e-book.c:3289
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: Could not create EBookListener"
-
-#: ../addressbook/libebook/e-book.c:3556
+#: ../addressbook/libebook/e-book.c:1837
#, 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:3689
+#: ../addressbook/libebook/e-book.c:1967
#, c-format
msgid "%s: there was no source for uid `%s' stored in gconf."
msgstr "%s: there was no source for uid `%s' stored in gconf."
@@ -356,7 +272,7 @@ msgstr "Weblog URL"
#. Contact categories
#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../libedataserverui/e-categories-dialog.c:632
msgid "Categories"
msgstr "Categories"
@@ -622,7 +538,7 @@ msgstr "Birth Date"
#: ../addressbook/libebook/e-contact.c:260
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../libedataserver/e-categories.c:45
msgid "Anniversary"
msgstr "Anniversary"
@@ -706,7 +622,7 @@ msgid "Unnamed List"
msgstr "Unnamed List"
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:46
msgid "Birthday"
msgstr "Birthday"
@@ -720,274 +636,274 @@ msgstr "Birthday: %s"
msgid "Anniversary: %s"
msgstr "Anniversary: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:234
msgid "Cannot save calendar data: Malformed URI."
msgstr "Cannot save calendar data: Malformed URI."
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:247
msgid "Cannot save calendar data"
msgstr "Cannot save calendar data"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
msgid "Could not create thread for getting deltas"
msgstr "Could not create thread for getting deltas"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
+#: ../calendar/backends/google/e-cal-backend-google.c:1189
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
+#: ../calendar/backends/http/e-cal-backend-http.c:673
+#: ../calendar/backends/weather/e-cal-backend-weather.c:486
msgid "Could not create cache file"
msgstr "Could not create cache file"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
msgid "Could not create thread for populating cache"
msgstr "Could not create thread for populating cache"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1917
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
msgid "Reply Requested: by "
msgstr "Reply Requested: by "
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1922
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
msgid "Reply Requested: When convenient"
msgstr "Reply Requested: When convenient"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
#, c-format
msgid "Loading %s items"
msgstr "Loading %s items"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
msgid "Calendar"
msgstr "Calendar"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
msgid "Invalid server URI"
msgstr "Invalid server URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
+#: ../calendar/libecal/e-cal.c:5117
#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1147
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1217
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
+#: ../camel/providers/groupwise/camel-groupwise-store.c:598
+#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/http/e-cal-backend-http.c:330
msgid "Redirected to Invalid URI"
msgstr "Redirected to Invalid URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:353
msgid "Bad file format."
msgstr "Bad file format."
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:360
msgid "Not a calendar."
msgstr "Not a calendar."
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:150
msgid "Could not retrieve weather data"
msgstr "Could not retrieve weather data"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
msgid "Weather: Fog"
msgstr "Weather: Fog"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
msgid "Weather: Cloudy"
msgstr "Weather: Cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
msgid "Weather: Cloudy Night"
msgstr "Weather: Cloudy Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
msgid "Weather: Overcast"
msgstr "Weather: Overcast"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
msgid "Weather: Showers"
msgstr "Weather: Showers"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
msgid "Weather: Snow"
msgstr "Weather: Snow"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
msgid "Weather: Sunny"
msgstr "Weather: Sunny"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
msgid "Weather: Clear Night"
msgstr "Weather: Clear Night"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
msgid "Weather: Thunderstorms"
msgstr "Weather: Thunderstorms"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:400
msgid "Forecast"
msgstr "Forecast"
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1320
msgid "Untitled appointment"
msgstr "Untitled appointment"
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3945
msgid "1st"
msgstr "1st"
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3946
msgid "2nd"
msgstr "2nd"
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3947
msgid "3rd"
msgstr "3rd"
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3948
msgid "4th"
msgstr "4th"
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3949
msgid "5th"
msgstr "5th"
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3950
msgid "6th"
msgstr "6th"
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3951
msgid "7th"
msgstr "7th"
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3952
msgid "8th"
msgstr "8th"
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3953
msgid "9th"
msgstr "9th"
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3954
msgid "10th"
msgstr "10th"
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3955
msgid "11th"
msgstr "11th"
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3956
msgid "12th"
msgstr "12th"
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3957
msgid "13th"
msgstr "13th"
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3958
msgid "14th"
msgstr "14th"
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3959
msgid "15th"
msgstr "15th"
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3960
msgid "16th"
msgstr "16th"
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3961
msgid "17th"
msgstr "17th"
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3962
msgid "18th"
msgstr "18th"
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3963
msgid "19th"
msgstr "19th"
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3964
msgid "20th"
msgstr "20th"
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3965
msgid "21st"
msgstr "21st"
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3966
msgid "22nd"
msgstr "22nd"
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3967
msgid "23rd"
msgstr "23rd"
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3968
msgid "24th"
msgstr "24th"
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3969
msgid "25th"
msgstr "25th"
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3970
msgid "26th"
msgstr "26th"
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3971
msgid "27th"
msgstr "27th"
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3972
msgid "28th"
msgstr "28th"
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3973
msgid "29th"
msgstr "29th"
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3974
msgid "30th"
msgstr "30th"
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3975
msgid "31st"
msgstr "31st"
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
msgid "High"
msgstr "High"
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
msgid "Normal"
msgstr "Normal"
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
msgid "Low"
msgstr "Low"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:710
msgid "Undefined"
msgstr "Undefined"
-#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
@@ -996,112 +912,112 @@ msgstr "Enter password for %s (user %s)"
#. This password prompt will be prompted rarely. Since the key that is passed to
#. the auth_func corresponds to the parent user.
#.
-#: ../calendar/libecal/e-cal.c:1691
+#: ../calendar/libecal/e-cal.c:1707
#, 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:5070
+#: ../calendar/libecal/e-cal.c:5089
msgid "Invalid argument"
msgstr "Invalid argument"
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:5091
msgid "Backend is busy"
msgstr "Backend is busy"
-#: ../calendar/libecal/e-cal.c:5074
+#: ../calendar/libecal/e-cal.c:5093
#: ../calendar/libedata-cal/e-cal-backend-util.c:105
msgid "Repository is offline"
msgstr "Repository is offline"
-#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libecal/e-cal.c:5095
#: ../calendar/libedata-cal/e-cal-backend-util.c:129
msgid "No such calendar"
msgstr "No such calendar"
-#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libecal/e-cal.c:5097
#: ../calendar/libedata-cal/e-cal-backend-util.c:111
#: ../servers/groupwise/e-gw-connection.c:233
msgid "Object not found"
msgstr "Object not found"
-#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libecal/e-cal.c:5099
#: ../calendar/libedata-cal/e-cal-backend-util.c:113
#: ../servers/groupwise/e-gw-connection.c:227
msgid "Invalid object"
msgstr "Invalid object"
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:5101
msgid "URI not loaded"
msgstr "URI not loaded"
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:5103
msgid "URI already loaded"
msgstr "URI already loaded"
-#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libecal/e-cal.c:5105
#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
+#: ../servers/exchange/storage/e-storage.c:573
msgid "Permission denied"
msgstr "Permission denied"
-#: ../calendar/libecal/e-cal.c:5088
+#: ../calendar/libecal/e-cal.c:5107
#: ../calendar/libedata-cal/e-cal-backend-util.c:131
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Unknown User"
msgstr "Unknown User"
-#: ../calendar/libecal/e-cal.c:5090
+#: ../calendar/libecal/e-cal.c:5109
#: ../calendar/libedata-cal/e-cal-backend-util.c:115
msgid "Object ID already exists"
msgstr "Object ID already exists"
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:5111
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:5113
msgid "Operation has been canceled"
msgstr "Operation has been cancelled"
-#: ../calendar/libecal/e-cal.c:5096
+#: ../calendar/libecal/e-cal.c:5115
#: ../calendar/libedata-cal/e-cal-backend-util.c:143
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
-#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libecal/e-cal.c:5119
#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
msgid "Authentication required"
msgstr "Authentication required"
-#: ../calendar/libecal/e-cal.c:5102
+#: ../calendar/libecal/e-cal.c:5121
msgid "A CORBA exception has occurred"
msgstr "A CORBA exception has occurred"
-#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libecal/e-cal.c:5123
#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/imap/camel-imap-command.c:432
#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1547
+#: ../camel/providers/imap4/camel-imap4-engine.c:1585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1629
+#: ../camel/providers/imap4/camel-imap4-engine.c:1684
+#: ../camel/providers/imap4/camel-imap4-store.c:311
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
+#: ../camel/providers/pop3/camel-pop3-store.c:552
+#: ../camel/providers/pop3/camel-pop3-store.c:559
+#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../servers/exchange/storage/e-storage.c:587
#: ../servers/groupwise/e-gw-connection.c:241
msgid "Unknown error"
msgstr "Unknown error"
-#: ../calendar/libecal/e-cal.c:5106
+#: ../calendar/libecal/e-cal.c:5125
#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../servers/exchange/storage/e-storage.c:555
msgid "No error"
msgstr "No error"
@@ -1288,16 +1204,16 @@ msgstr "You may not export keys with this cypher"
msgid "Unable to create cache path"
msgstr "Unable to create cache path"
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:402
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not remove cache entry: %s: %s"
-#: ../camel/camel-db.c:469
+#: ../camel/camel-db.c:412
msgid "Insufficient memory"
msgstr "Insufficient memory"
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:197
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -1308,8 +1224,8 @@ msgstr ""
"Further operations on this server will not be replayed when you\n"
"reconnect to the network."
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:320
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1320,114 +1236,114 @@ msgstr ""
"%s\n"
"Changes made to this folder will not be resynchronised."
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:296
msgid "Resynchronizing with server"
msgstr "Resynchronising with server"
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
+#: ../camel/camel-disco-folder.c:43 ../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:105 ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
msgid "Downloading new messages for offline mode"
msgstr "Downloading new messages for offline mode"
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:466
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Preparing folder '%s' for offline"
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../camel/camel-disco-store.c:400
+#: ../camel/providers/groupwise/camel-groupwise-store.c:223
#: ../camel/providers/imap/camel-imap-store.c:1003
#: ../camel/providers/imap/camel-imap-store.c:1813
#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../camel/providers/imap/camel-imap-store.c:3014
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
-#: ../camel/camel-exception.c:262
+#: ../camel/camel-exception.c:260
msgid "No description available"
msgstr "No description available"
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Failed to create child process '%s': %s"
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:836
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Invalid message stream received from %s: %s"
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
msgid "Syncing folders"
msgstr "Syncing folders"
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Error parsing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Error executing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1216
msgid "Unable to open spool folder"
msgstr "Unable to open spool folder"
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1225
msgid "Unable to process spool folder"
msgstr "Unable to process spool folder"
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1241
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Getting message %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1250
+#: ../camel/camel-filter-driver.c:1245
msgid "Cannot open message"
msgstr "Cannot open message"
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
#, c-format
msgid "Failed on message %d"
msgstr "Failed on message %d"
-#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
msgid "Syncing folder"
msgstr "Syncing folder"
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
msgid "Complete"
msgstr "Complete"
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1338
#, c-format
msgid "Getting message %d of %d"
msgstr "Getting message %d of %d"
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1353
#, c-format
msgid "Failed at message %d of %d"
msgstr "Failed at message %d of %d"
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:137
msgid "Failed to retrieve message"
msgstr "Failed to retrieve message"
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:399
msgid "Invalid arguments to (system-flag)"
msgstr "Invalid arguments to (system-flag)"
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:414
msgid "Invalid arguments to (user-tag)"
msgstr "Invalid arguments to (user-tag)"
#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Error executing filter search: %s: %s"
@@ -1452,72 +1368,72 @@ msgstr ""
"Error executing search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) requires a single bool result"
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:905
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) not allowed inside %s"
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) requires a match type string"
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:945
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) expects an array result"
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:954
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) requires the folder set"
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-folder.c:683
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "Unsupported operation: append message: for %s"
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:1388
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "Unsupported operation: search by expression: for %s"
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:1429
#, c-format
msgid "Unsupported operation: count by expression: for %s"
msgstr "Unsupported operation: count by expression: for %s"
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:1468
#, c-format
msgid "Unsupported operation: search by UIDs: for %s"
msgstr "Unsupported operation: search by UIDs: for %s"
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1581
msgid "Moving messages"
msgstr "Moving messages"
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1581
msgid "Copying messages"
msgstr "Copying messages"
-#: ../camel/camel-folder.c:1942
+#: ../camel/camel-folder.c:1922
msgid "Learning junk"
msgstr "Learning junk"
-#: ../camel/camel-folder.c:1959
+#: ../camel/camel-folder.c:1939
msgid "Learning non-junk"
msgstr "Learning non-junk"
-#: ../camel/camel-folder.c:1978
+#: ../camel/camel-folder.c:1958
msgid "Filtering new message(s)"
msgstr "Filtering new message(s)"
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:751
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1528,15 +1444,15 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:766
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:824
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1545,7 +1461,7 @@ msgstr ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:828
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1554,45 +1470,46 @@ msgstr ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:833
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "Unexpected request from GnuPG for '%s'"
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1287
+#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/providers/nntp/camel-nntp-store.c:1313
msgid "Canceled."
msgstr "Cancelled."
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:872
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:884
+#: ../camel/camel-gpg-context.c:880
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:943
msgid "Failed to encrypt: No valid recipients specified."
msgstr "Failed to encrypt: No valid recipients specified."
#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1832 ../camel/camel-gpg-context.c:1877
+#: ../camel/camel-gpg-context.c:1212 ../camel/camel-gpg-context.c:1337
+#: ../camel/camel-gpg-context.c:1859 ../camel/camel-gpg-context.c:1904
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:392
+#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:602
#, c-format
msgid "Could not generate signing data: %s"
msgstr "Could not generate signing data: %s"
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1537
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1637
-#: ../camel/camel-gpg-context.c:1753 ../camel/camel-gpg-context.c:1768
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1893
+#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1553
+#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1649
+#: ../camel/camel-gpg-context.c:1664 ../camel/camel-gpg-context.c:1780
+#: ../camel/camel-gpg-context.c:1795 ../camel/camel-gpg-context.c:1875
+#: ../camel/camel-gpg-context.c:1920
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
@@ -1600,49 +1517,49 @@ msgstr "Failed to execute gpg."
msgid "This is a digitally signed message part"
msgstr "This is a digitally signed message part"
-#: ../camel/camel-gpg-context.c:1456 ../camel/camel-gpg-context.c:1462
-#: ../camel/camel-gpg-context.c:1468 ../camel/camel-gpg-context.c:1483
-#: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-gpg-context.c:1457 ../camel/camel-gpg-context.c:1463
+#: ../camel/camel-gpg-context.c:1469 ../camel/camel-gpg-context.c:1484
+#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
+#: ../camel/camel-smime-context.c:928
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1522
+#: ../camel/camel-gpg-context.c:1523
#, 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:1605
+#: ../camel/camel-gpg-context.c:1632
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Could not generate encrypting data: %s"
-#: ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-gpg-context.c:1682
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1716
-#: ../camel/camel-gpg-context.c:1735
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1762
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1725
+#: ../camel/camel-gpg-context.c:1752
msgid "Failed to decrypt MIME part: protocol error"
msgstr "Failed to decrypt MIME part: protocol error"
-#: ../camel/camel-gpg-context.c:1790 ../camel/camel-smime-context.c:969
+#: ../camel/camel-gpg-context.c:1817 ../camel/camel-smime-context.c:1186
msgid "Encrypted content"
msgstr "Encrypted content"
-#: ../camel/camel-gpg-context.c:1809
+#: ../camel/camel-gpg-context.c:1836
msgid "Unable to parse message content"
msgstr "Unable to parse message content"
-#: ../camel/camel-gpg-context.c:1833 ../camel/camel-gpg-context.c:1878
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
+#: ../camel/camel-gpg-context.c:1860 ../camel/camel-gpg-context.c:1905
+#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/providers/imap4/camel-imap4-utils.c:614
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
msgid "Unknown"
msgstr "Unknown"
@@ -1656,12 +1573,12 @@ msgstr "Cannot build locking helper pipe: %s"
msgid "Cannot fork locking helper: %s"
msgstr "Cannot fork locking helper: %s"
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr "Could not lock '%s': protocol error with lock-helper"
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:216
#, c-format
msgid "Could not lock '%s'"
msgstr "Could not lock '%s'"
@@ -1740,54 +1657,54 @@ msgstr "Error writing mail temp file: %s"
msgid "Error copying mail temp file: %s"
msgstr "Error copying mail temp file: %s"
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:592
msgid "parse error"
msgstr "parse error"
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
+#: ../camel/camel-net-utils.c:806
+#: ../camel/providers/pop3/camel-pop3-store.c:446
+#: ../camel/providers/pop3/camel-pop3-store.c:546
msgid "Canceled"
msgstr "Cancelled"
-#: ../camel/camel-net-utils.c:524
+#: ../camel/camel-net-utils.c:522
msgid "cannot create thread"
msgstr "cannot create thread"
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:678
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:700
msgid "Host lookup failed"
msgstr "Host lookup failed"
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:702
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "Host lookup failed: %s: %s"
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:810
msgid "Resolving address"
msgstr "Resolving address"
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:830
msgid "Name lookup failed"
msgstr "Name lookup failed"
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:833
#, c-format
msgid "Name lookup failed: %s"
msgstr "Name lookup failed: %s"
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:249
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "Syncing messages in folder '%s' to disk"
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "Cannot write offline journal for folder '%s': %s"
@@ -1815,24 +1732,24 @@ 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:373 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "No provider available for protocol '%s'"
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:36
msgid "Anonymous"
msgstr "Anonymous"
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:38
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:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
msgid "Authentication failed."
msgstr "Authentication failed."
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:130
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -1841,7 +1758,7 @@ msgstr ""
"Invalid e-mail address trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:142
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -1850,7 +1767,7 @@ msgstr ""
"Invalid opaque trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:154
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -1883,40 +1800,40 @@ 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:845
+#: ../camel/camel-sasl-digest-md5.c:844
msgid "Server challenge too long (>2048 octets)"
msgstr "Server challenge too long (>2048 octets)"
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:853
msgid "Server challenge invalid\n"
msgstr "Server challenge invalid\n"
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:859
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "Server challenge contained invalid \"Quality of Protection\" token"
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:889
msgid "Server response did not contain authorization data"
msgstr "Server response did not contain authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:907
msgid "Server response contained incomplete authorization data"
msgstr "Server response contained incomplete authorisation data"
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
msgid "Server response does not match"
msgstr "Server response does not match"
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:63
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:65
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr ""
"This option will connect to the server using Kerberos 5 authentication."
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:159
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
@@ -1924,11 +1841,11 @@ msgstr ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognised by the implementation."
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:164
msgid "The provided target_name parameter was ill-formed."
msgstr "The provided target_name parameter was ill-formed."
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:167
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
@@ -1936,7 +1853,7 @@ msgstr ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:171
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
@@ -1944,7 +1861,7 @@ msgstr ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../camel/camel-sasl-gssapi.c:176
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
@@ -1952,7 +1869,7 @@ msgstr ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:180
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
@@ -1960,30 +1877,30 @@ msgstr ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:185
msgid "The supplied context handle did not refer to a valid context."
msgstr "The supplied context handle did not refer to a valid context."
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:188
msgid "The consistency checks performed on the input_token failed."
msgstr "The consistency checks performed on the input_token failed."
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:191
msgid "The consistency checks performed on the credential failed."
msgstr "The consistency checks performed on the credential failed."
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:194
msgid "The referenced credentials have expired."
msgstr "The referenced credentials have expired."
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
+#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
+#: ../camel/camel-sasl-kerberos4.c:230
+#: ../camel/providers/imap/camel-imap-store.c:1274
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:309
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
@@ -1996,7 +1913,7 @@ 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:174
+#: ../camel/camel-sasl-kerberos4.c:173
#, c-format
msgid ""
"Could not get Kerberos ticket:\n"
@@ -2013,7 +1930,7 @@ msgstr "Login"
msgid "This option will connect to the server using a simple password."
msgstr "This option will connect to the server using a simple password."
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:134
msgid "Unknown authentication state."
msgstr "Unknown authentication state."
@@ -2058,22 +1975,22 @@ 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:270
+#: ../camel/camel-service.c:265
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' needs a username component"
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:269
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' needs a host component"
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:273
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' needs a path component"
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:307
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2082,220 +1999,214 @@ msgstr ""
"Could not create directory %s:\n"
"%s"
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:479
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "Please enter the %s password for %s on host %s."
-#: ../camel/camel-session.c:822
+#: ../camel/camel-session.c:817
msgid "Camel session doesn't support forwarding of a message."
msgstr "Camel session doesn't support forwarding of a message."
-#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Cannot find certificate for '%s'"
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:450
msgid "Cannot create CMS message"
msgstr "Cannot create CMS message"
-#: ../camel/camel-smime-context.c:245
+#: ../camel/camel-smime-context.c:455
msgid "Cannot create CMS signed data"
msgstr "Cannot create CMS signed data"
-#: ../camel/camel-smime-context.c:251
+#: ../camel/camel-smime-context.c:461
msgid "Cannot attach CMS signed data"
msgstr "Cannot attach CMS signed data"
-#: ../camel/camel-smime-context.c:258
+#: ../camel/camel-smime-context.c:468
msgid "Cannot attach CMS data"
msgstr "Cannot attach CMS data"
-#: ../camel/camel-smime-context.c:264
+#: ../camel/camel-smime-context.c:474
msgid "Cannot create CMS Signer information"
msgstr "Cannot create CMS Signer information"
-#: ../camel/camel-smime-context.c:270
+#: ../camel/camel-smime-context.c:480
msgid "Cannot find certificate chain"
msgstr "Cannot find certificate chain"
-#: ../camel/camel-smime-context.c:276
+#: ../camel/camel-smime-context.c:486
msgid "Cannot add CMS Signing time"
msgstr "Cannot add CMS Signing time"
-#: ../camel/camel-smime-context.c:298 ../camel/camel-smime-context.c:310
+#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Encryption certificate for '%s' does not exist"
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:527
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Cannot add SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:532
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:327
+#: ../camel/camel-smime-context.c:537
msgid "Cannot add encryption certificate"
msgstr "Cannot add encryption certificate"
-#: ../camel/camel-smime-context.c:333
+#: ../camel/camel-smime-context.c:543
msgid "Cannot add CMS Signer information"
msgstr "Cannot add CMS Signer information"
-#: ../camel/camel-smime-context.c:403 ../camel/camel-smime-context.c:851
+#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
msgid "Cannot create encoder context"
msgstr "Cannot create encoder context"
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:619
msgid "Failed to add data to CMS encoder"
msgstr "Failed to add data to CMS encoder"
-#: ../camel/camel-smime-context.c:414 ../camel/camel-smime-context.c:868
+#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
msgid "Failed to encode data"
msgstr "Failed to encode data"
-#: ../camel/camel-smime-context.c:487
+#: ../camel/camel-smime-context.c:697
msgid "Unverified"
msgstr "Unverified"
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:699
msgid "Good signature"
msgstr "Good signature"
-#: ../camel/camel-smime-context.c:491
+#: ../camel/camel-smime-context.c:701
msgid "Bad signature"
msgstr "Bad signature"
-#: ../camel/camel-smime-context.c:493
+#: ../camel/camel-smime-context.c:703
msgid "Content tampered with or altered in transit"
msgstr "Content tampered with or altered in transit"
-#: ../camel/camel-smime-context.c:495
+#: ../camel/camel-smime-context.c:705
msgid "Signing certificate not found"
msgstr "Signing certificate not found"
-#: ../camel/camel-smime-context.c:497
+#: ../camel/camel-smime-context.c:707
msgid "Signing certificate not trusted"
msgstr "Signing certificate not trusted"
-#: ../camel/camel-smime-context.c:499
+#: ../camel/camel-smime-context.c:709
msgid "Signature algorithm unknown"
msgstr "Signature algorithm unknown"
-#: ../camel/camel-smime-context.c:501
+#: ../camel/camel-smime-context.c:711
msgid "Signature algorithm unsupported"
msgstr "Signature algorithm unsupported"
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:713
msgid "Malformed signature"
msgstr "Malformed signature"
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:715
msgid "Processing error"
msgstr "Processing error"
-#: ../camel/camel-smime-context.c:542
+#: ../camel/camel-smime-context.c:753
msgid "No signed data in signature"
msgstr "No signed data in signature"
-#: ../camel/camel-smime-context.c:549
+#: ../camel/camel-smime-context.c:758
msgid "Digests missing from enveloped data"
msgstr "Digests missing from enveloped data"
-#: ../camel/camel-smime-context.c:562 ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
msgid "Cannot calculate digests"
msgstr "Cannot calculate digests"
-#: ../camel/camel-smime-context.c:577
+#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
msgid "Cannot set message digests"
msgstr "Cannot set message digests"
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:592
+#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
msgid "Certificate import failed"
msgstr "Certificate import failed"
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:817
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "Certificate is the only message, cannot verify certificates"
-#: ../camel/camel-smime-context.c:605
+#: ../camel/camel-smime-context.c:820
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "Certificate is the only message, certificates imported and verified"
-#: ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:824
msgid "Cannot find signature digests"
msgstr "Cannot find signature digests"
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:840
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "Signer: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:726
+#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
msgid "Decoder failed"
msgstr "Decoder failed"
-#: ../camel/camel-smime-context.c:785
+#: ../camel/camel-smime-context.c:1000
msgid "Cannot find common bulk encryption algorithm"
msgstr "Cannot find common bulk encryption algorithm"
-#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:794
+#: ../camel/camel-smime-context.c:1008
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Cannot allocate slot for encryption bulk key"
-#: ../camel/camel-smime-context.c:805
+#: ../camel/camel-smime-context.c:1019
msgid "Cannot create CMS Message"
msgstr "Cannot create CMS Message"
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:1025
msgid "Cannot create CMS Enveloped data"
msgstr "Cannot create CMS Enveloped data"
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:1031
msgid "Cannot attach CMS Enveloped data"
msgstr "Cannot attach CMS Enveloped data"
-#: ../camel/camel-smime-context.c:823
+#: ../camel/camel-smime-context.c:1037
msgid "Cannot attach CMS data object"
msgstr "Cannot attach CMS data object"
-#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1046
msgid "Cannot create CMS Recipient information"
msgstr "Cannot create CMS Recipient information"
-#: ../camel/camel-smime-context.c:837
+#: ../camel/camel-smime-context.c:1051
msgid "Cannot add CMS Recipient information"
msgstr "Cannot add CMS Recipient information"
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:1076
msgid "Failed to add data to encoder"
msgstr "Failed to add data to encoder"
-#: ../camel/camel-smime-context.c:949
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "Decoder failed, error %d"
-
-#: ../camel/camel-smime-context.c:956
+#: ../camel/camel-smime-context.c:1172
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: No encrypted content found"
-#: ../camel/camel-smime-context.c:983
+#: ../camel/camel-smime-context.c:1200
msgid "import keys: unimplemented"
msgstr "import keys: unimplemented"
-#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1208
msgid "export keys: unimplemented"
msgstr "export keys: unimplemented"
#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Cannot get folder: Invalid operation on this store"
@@ -2313,146 +2224,145 @@ 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:487 ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
#: ../camel/providers/local/camel-maildir-store.c:219
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
#: ../camel/providers/local/camel-maildir-store.c:291
#, 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:899 ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
msgid "Trash"
msgstr "Wastebasket"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
msgid "Junk"
msgstr "Junk"
-#: ../camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:564
msgid "Unable to get issuer's certificate"
msgstr "Unable to get issuer's certificate"
-#: ../camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:566
msgid "Unable to get Certificate Revocation List"
msgstr "Unable to get Certificate Revocation List"
-#: ../camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:568
msgid "Unable to decrypt certificate signature"
msgstr "Unable to decrypt certificate signature"
-#: ../camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:570
msgid "Unable to decrypt Certificate Revocation List signature"
msgstr "Unable to decrypt Certificate Revocation List signature"
-#: ../camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:572
msgid "Unable to decode issuer's public key"
msgstr "Unable to decode issuer's public key"
-#: ../camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:574
msgid "Certificate signature failure"
msgstr "Certificate signature failure"
-#: ../camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:576
msgid "Certificate Revocation List signature failure"
msgstr "Certificate Revocation List signature failure"
-#: ../camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:578
msgid "Certificate not yet valid"
msgstr "Certificate not yet valid"
-#: ../camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:580
msgid "Certificate has expired"
msgstr "Certificate has expired"
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL not yet valid"
+#: ../camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate Revocation List (CRL) not yet valid"
+msgstr "Certificate Revocation List (CRL) not yet valid"
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL has expired"
+#: ../camel/camel-tcp-stream-openssl.c:584
+msgid "Certificate Revocation List (CRL) has expired"
+msgstr "Certificate Revocation List (CRL) has expired"
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "Error in CRL"
+#: ../camel/camel-tcp-stream-openssl.c:589
+msgid "Error in Certificate Revocation List (CRL)"
+msgstr "Error in Certificate Revocation List (CRL)"
-#: ../camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:591
msgid "Out of memory"
msgstr "Out of memory"
-#: ../camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:593
msgid "Zero-depth self-signed certificate"
msgstr "Zero-depth self-signed certificate"
-#: ../camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:595
msgid "Self-signed certificate in chain"
msgstr "Self-signed certificate in chain"
-#: ../camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:597
msgid "Unable to get issuer's certificate locally"
msgstr "Unable to get issuer's certificate locally"
-#: ../camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:599
msgid "Unable to verify leaf signature"
msgstr "Unable to verify leaf signature"
-#: ../camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:601
msgid "Certificate chain too long"
msgstr "Certificate chain too long"
-#: ../camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:603
msgid "Certificate Revoked"
msgstr "Certificate Revoked"
-#: ../camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:605
msgid "Invalid Certificate Authority (CA)"
msgstr "Invalid Certificate Authority (CA)"
-#: ../camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:607
msgid "Path length exceeded"
msgstr "Path length exceeded"
-#: ../camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:609
msgid "Invalid purpose"
msgstr "Invalid purpose"
-#: ../camel/camel-tcp-stream-openssl.c:619
+#: ../camel/camel-tcp-stream-openssl.c:611
msgid "Certificate untrusted"
msgstr "Certificate untrusted"
-#: ../camel/camel-tcp-stream-openssl.c:621
+#: ../camel/camel-tcp-stream-openssl.c:613
msgid "Certificate rejected"
msgstr "Certificate rejected"
-#: ../camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:616
msgid "Subject/Issuer mismatch"
msgstr "Subject/Issuer mismatch"
-#: ../camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:618
msgid "AKID/SKID mismatch"
msgstr "AKID/SKID mismatch"
-#: ../camel/camel-tcp-stream-openssl.c:628
+#: ../camel/camel-tcp-stream-openssl.c:620
msgid "AKID/Issuer serial mismatch"
msgstr "AKID/Issuer serial mismatch"
-#: ../camel/camel-tcp-stream-openssl.c:630
+#: ../camel/camel-tcp-stream-openssl.c:622
msgid "Key usage does not support certificate signing"
msgstr "Key usage does not support certificate signing"
-#: ../camel/camel-tcp-stream-openssl.c:633
+#: ../camel/camel-tcp-stream-openssl.c:625
msgid "Error in application verification"
msgstr "Error in application verification"
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2465,15 +2375,15 @@ msgstr ""
"Fingerprint: %s\n"
"Signature: %s"
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
msgid "BAD"
msgstr "BAD"
-#: ../camel/camel-tcp-stream-openssl.c:708
+#: ../camel/camel-tcp-stream-openssl.c:700
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -2493,7 +2403,7 @@ msgstr ""
"Do you wish to accept anyway?"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:883
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2508,7 +2418,7 @@ msgstr ""
"\n"
"Do you wish to accept?"
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:927
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2517,7 +2427,7 @@ msgstr ""
"Certificate problem: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:979
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2526,7 +2436,7 @@ msgstr ""
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:997
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2535,7 +2445,7 @@ msgstr ""
"Certificate expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:1014
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2549,31 +2459,31 @@ msgstr ""
msgid "Could not parse URL '%s'"
msgstr "Could not parse URL '%s'"
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:580
#, c-format
msgid "Error storing '%s': %s"
msgstr "Error storing '%s': %s"
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:657
#, c-format
msgid "No such message %s in %s"
msgstr "No such message %s in %s"
-#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
+#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Cannot copy or move messages into a Virtual Folder"
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
+#: ../camel/camel-vee-store.c:353
msgid "Unmatched"
msgstr "Unmatched"
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:400
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Cannot delete folder: %s: No such folder"
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:422
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Cannot rename folder: %s: No such folder"
@@ -2596,19 +2506,19 @@ msgstr ""
" %s"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
+#: ../camel/providers/local/camel-maildir-folder.c:262
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:363
+#: ../camel/providers/local/camel-mbox-folder.c:414
+#: ../camel/providers/local/camel-mh-folder.c:226
msgid "No such message"
msgstr "No such message"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
+#: ../camel/providers/imap4/camel-imap4-folder.c:814
#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
#: ../camel/providers/pop3/camel-pop3-folder.c:268
#: ../camel/providers/pop3/camel-pop3-folder.c:578
#: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2617,11 +2527,11 @@ msgid "User canceled"
msgstr "User cancelled"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/imap4/camel-imap4-folder.c:819
#: ../camel/providers/nntp/camel-nntp-folder.c:166
#: ../camel/providers/nntp/camel-nntp-folder.c:168
#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
+#: ../camel/providers/nntp/camel-nntp-folder.c:252
#: ../camel/providers/pop3/camel-pop3-folder.c:388
#: ../camel/providers/pop3/camel-pop3-folder.c:581
#: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2633,191 +2543,196 @@ msgstr "Cannot get message %s: %s"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2303
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/imap4/camel-imap4-folder.c:837
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:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:199
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1818
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1869
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
msgid "Could not get message"
msgstr "Could not get message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:883
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
+#: ../camel/providers/imap/camel-imap-folder.c:296
#, c-format
msgid "Could not load summary for %s"
msgstr "Could not load summary for %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1143
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#, c-format
+msgid "Checking for deleted messages %s"
+msgstr "Checking for deleted messages %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
msgid "Trash Folder Full. Please Empty."
msgstr "Wastebasket Folder Full. Please Empty."
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1352
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
+#: ../camel/providers/groupwise/camel-groupwise-store.c:633
+#: ../camel/providers/groupwise/camel-groupwise-store.c:763
+#: ../camel/providers/imap/camel-imap-folder.c:3421
+#: ../camel/providers/imap/camel-imap-folder.c:3497
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr "Fetching summary information for new messages in %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2200
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
#, 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:2188
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
#, c-format
msgid "Cannot create message: %s"
msgstr "Cannot create message: %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
#, c-format
msgid "Cannot get folder container %s"
msgstr "Cannot get folder container %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
+#: ../camel/providers/imap4/camel-imap4-journal.c:311
msgid "Cannot append message in offline mode: cache unavailable"
msgstr "Cannot append message in offline mode: cache unavailable"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
+#: ../camel/providers/imap4/camel-imap4-journal.c:327
#, c-format
msgid "Cannot append message in offline mode: %s"
msgstr "Cannot append message in offline mode: %s"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
msgid "Checking for new mail"
msgstr "Checking for new mail"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:50
#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/imap4/camel-imap4-provider.c:40
msgid "C_heck for new messages in all folders"
msgstr "C_heck for new messages in all folders"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap4/camel-imap4-provider.c:51
#: ../camel/providers/local/camel-local-provider.c:46
#: ../camel/providers/local/camel-local-provider.c:86
#: ../camel/providers/local/camel-local-provider.c:106
msgid "Options"
msgstr "Options"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "_Apply filters to new messages in Inbox on this server"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
msgid "Check new messages for J_unk contents"
msgstr "Check new messages for J_unk contents"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
#: ../camel/providers/imap/camel-imap-provider.c:74
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "Only check for Junk messages in the IN_BOX folder"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
msgid "Automatically synchroni_ze account locally"
msgstr "Automatically synchroni_se account locally"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
msgid "SOAP Settings"
msgstr "SOAP Settings"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../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:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
msgid "For accessing Novell GroupWise servers"
msgstr "For accessing Novell GroupWise servers"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
+#: ../camel/providers/hula/camel-hula-provider.c:93
#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
+#: ../camel/providers/imap4/camel-imap4-provider.c:83
#: ../camel/providers/imapp/camel-imapp-provider.c:67
#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
msgid "Password"
msgstr "Password"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
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:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:102
msgid "Host or user not available in url"
msgstr "Host or user not available in url"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:204
+#: ../camel/providers/imap/camel-imap-store.c:1358
msgid "You did not enter a password."
msgstr "You did not enter a password."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:319
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:524
+#: ../camel/providers/groupwise/camel-groupwise-store.c:540
#: ../camel/providers/imap/camel-imap-store.c:1849
#: ../camel/providers/imap/camel-imap-store.c:2047
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
msgid "Cannot create GroupWise folders in offline mode."
msgstr "Cannot create GroupWise folders in offline mode."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
#: ../camel/providers/imap/camel-imap-store.c:1924
#: ../camel/providers/imap/camel-imap-store.c:2304
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:1333
#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
#, 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:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise server %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "GroupWise service for %s on %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "GroupWise mail delivery via %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
msgid "Sending Message"
msgstr "Sending Message"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
msgid ""
"You have exceeded this account's storage limit. Your messages are queued in "
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2827,94 +2742,94 @@ msgstr ""
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
"of your mail.\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
#, c-format
msgid "Could not send message: %s"
msgstr "Could not send message: %s"
-#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../camel/providers/hula/camel-hula-provider.c:48
#: ../camel/providers/imap/camel-imap-provider.c:44
msgid "Checking for New Mail"
msgstr "Checking for New Mail"
-#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/hula/camel-hula-provider.c:53
#: ../camel/providers/imap/camel-imap-provider.c:52
msgid "Connection to Server"
msgstr "Connection to Server"
-#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:55
#: ../camel/providers/imap/camel-imap-provider.c:54
msgid "_Use custom command to connect to server"
msgstr "_Use custom command to connect to server"
-#: ../camel/providers/hula/camel-hula-provider.c:58
+#: ../camel/providers/hula/camel-hula-provider.c:57
#: ../camel/providers/imap/camel-imap-provider.c:56
msgid "Command:"
msgstr "Command:"
-#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/hula/camel-hula-provider.c:60
#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
#: ../camel/providers/nntp/camel-nntp-provider.c:44
msgid "Folders"
msgstr "Folders"
-#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/hula/camel-hula-provider.c:62
#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
msgid "_Show only subscribed folders"
msgstr "_Show only subscribed folders"
-#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/hula/camel-hula-provider.c:64
#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/imap4/camel-imap4-provider.c:47
msgid "O_verride server-supplied folder namespace"
msgstr "O_verride server-supplied folder namespace"
-#: ../camel/providers/hula/camel-hula-provider.c:67
+#: ../camel/providers/hula/camel-hula-provider.c:66
msgid "Namespace"
msgstr "Namespace"
-#: ../camel/providers/hula/camel-hula-provider.c:78
+#: ../camel/providers/hula/camel-hula-provider.c:76
msgid "Hula"
msgstr "Hula"
-#: ../camel/providers/hula/camel-hula-provider.c:80
+#: ../camel/providers/hula/camel-hula-provider.c:78
msgid "For accessing Hula servers"
msgstr "For accessing Hula servers"
-#: ../camel/providers/hula/camel-hula-provider.c:97
+#: ../camel/providers/hula/camel-hula-provider.c:95
msgid "This option will connect to the Hula server using a plaintext password."
msgstr ""
"This option will connect to the Hula server using a plaintext password."
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:181
+#: ../camel/providers/imap/camel-imap-command.c:265
msgid "No output stream"
msgstr "No output stream"
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:186
+#: ../camel/providers/imap/camel-imap-command.c:270
msgid "No input stream"
msgstr "No input stream"
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:229
+#: ../camel/providers/imap/camel-imap-command.c:278
+#: ../camel/providers/imap/camel-imap-command.c:492
+#: ../camel/providers/imap/camel-imap-store.c:3051
msgid "Operation cancelled"
msgstr "Operation cancelled"
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:331
+#: ../camel/providers/imap/camel-imap-store.c:3056
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %s"
#. for imap ALERT codes, account user host
#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:354
+#: ../camel/providers/imap/camel-imap-command.c:352
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -2923,107 +2838,107 @@ msgstr ""
"Alert from IMAP server %s %s:\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:421
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "Unexpected response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:431
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP command failed: %s"
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:506
msgid "Server response ended too soon."
msgstr "Server response ended too soon."
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:712
#, 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:751
+#: ../camel/providers/imap/camel-imap-command.c:748
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "Unexpected OK response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:91
msgid "Always check for new mail in this folder"
msgstr "Always check for new mail in this folder"
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:277
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Could not create directory %s: %s"
#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:919
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Scanning for changed messages in %s"
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../camel/providers/imap/camel-imap-folder.c:1987
#, c-format
msgid "Unexpected response status '%s' after APPEND command"
msgstr "Unexpected response status '%s' after APPEND command"
-#: ../camel/providers/imap/camel-imap-folder.c:1965
+#: ../camel/providers/imap/camel-imap-folder.c:2002
msgid "No response on continuation after APPEND command"
msgstr "No response on continuation after APPEND command"
-#: ../camel/providers/imap/camel-imap-folder.c:2010
+#: ../camel/providers/imap/camel-imap-folder.c:2047
msgid "Unknown error occurred during APPEND command!"
msgstr "Unknown error occurred during APPEND command!"
-#: ../camel/providers/imap/camel-imap-folder.c:2842
+#: ../camel/providers/imap/camel-imap-folder.c:2878
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "Unable to retrieve message: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2913
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "Cannot get message with message ID %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2914
msgid "No such message available."
msgstr "No such message available."
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:2975
+#: ../camel/providers/imap/camel-imap-folder.c:3808
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
msgid "This message is not currently available"
msgstr "This message is not currently available"
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:3624
#, 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:3575
+#: ../camel/providers/imap/camel-imap-folder.c:3632
#, 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:3791
+#: ../camel/providers/imap/camel-imap-folder.c:3846
msgid "Could not find message body in FETCH response."
msgstr "Could not find message body in FETCH response."
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
+#: ../camel/providers/imap/camel-imap-message-cache.c:181
+#: ../camel/providers/imap/camel-imap-message-cache.c:244
#, c-format
msgid "Could not open cache directory: %s"
msgstr "Could not open cache directory: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:330
+#: ../camel/providers/imap/camel-imap-message-cache.c:387
+#: ../camel/providers/imap/camel-imap-message-cache.c:418
+#: ../camel/providers/imap/camel-imap-message-cache.c:450
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "Failed to cache message %s: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:530
#, c-format
msgid "Failed to cache %s: %s"
msgstr "Failed to cache %s: %s"
@@ -3033,12 +2948,12 @@ msgid "Ch_eck for new messages in subscribed folders"
msgstr "Ch_eck for new messages in subscribed folders"
#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
+#: ../camel/providers/imap4/camel-imap4-provider.c:49
msgid "Namespace:"
msgstr "Namespace:"
#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:53
msgid "_Apply filters to new messages in INBOX on this server"
msgstr "_Apply filters to new messages in INBOX on this server"
@@ -3047,7 +2962,7 @@ msgid "Check new messages for Jun_k contents"
msgstr "Check new messages for Jun_k contents"
#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:59
msgid "Automatically synchroni_ze remote mail locally"
msgstr "Automatically synchroni_se remote mail locally"
@@ -3066,36 +2981,36 @@ msgstr ""
"This option will connect to the IMAP server using a plaintext password."
#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap4/camel-imap4-store.c:210
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap4/camel-imap4-store.c:212
#, c-format
msgid "IMAP service for %s on %s"
msgstr "IMAP service for %s on %s"
#: ../camel/providers/imap/camel-imap-store.c:568
#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap4/camel-imap4-store.c:247
+#: ../camel/providers/imap4/camel-imap4-store.c:262
+#: ../camel/providers/nntp/camel-nntp-store.c:182
+#: ../camel/providers/nntp/camel-nntp-store.c:197
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:274
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Could not connect to %s: %s"
#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap4/camel-imap4-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
msgid "SSL unavailable"
msgstr "SSL unavailable"
@@ -3108,15 +3023,15 @@ msgstr "Connection cancelled"
#: ../camel/providers/imap/camel-imap-store.c:710
#: ../camel/providers/imap/camel-imap-store.c:716
#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap4/camel-imap4-store.c:310
+#: ../camel/providers/imap4/camel-imap4-store.c:325
+#: ../camel/providers/imap4/camel-imap4-store.c:334
#, 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:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
msgid "STARTTLS not supported"
msgstr "STARTTLS not supported"
@@ -3125,8 +3040,8 @@ msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
msgid "SSL is not available in this build"
msgstr "SSL is not available in this build"
@@ -3138,43 +3053,30 @@ 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:1053
#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
+#: ../camel/providers/imap4/camel-imap4-store.c:1403
+#: ../camel/providers/local/camel-maildir-folder.c:80
#: ../camel/providers/local/camel-maildir-store.c:219
#: ../camel/providers/local/camel-maildir-store.c:291
#: ../camel/providers/local/camel-maildir-store.c:517
#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
+#: ../camel/providers/local/camel-spool-store.c:463
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
msgid "Inbox"
msgstr "Inbox"
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Drafts"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "Sent"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "Templates"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:1305
#, 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:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1389
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3187,7 +3089,7 @@ msgstr ""
#: ../camel/providers/imap/camel-imap-store.c:1861
#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap4/camel-imap4-store.c:954
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3207,50 +3109,54 @@ msgstr "Cannot create folder '%s': folder exists."
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
+#: ../camel/providers/imap/camel-imap-store.c:3053
+msgid "Server unexpectedly disconnected"
+msgstr "Server unexpectedly disconnected"
+
+#: ../camel/providers/imap4/camel-imap4-command.c:572
+#: ../camel/providers/imap4/camel-imap4-command.c:579
#, 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:686
+#: ../camel/providers/imap4/camel-imap4-command.c:681
#, c-format
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "Unexpected response from IMAP4 server %s: %s"
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
+#: ../camel/providers/imap4/camel-imap4-engine.c:215
#, c-format
msgid "Unexpected greeting from IMAP server %s."
msgstr "Unexpected greeting from IMAP server %s."
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imap4/camel-imap4-engine.c:440
#, c-format
msgid "Cannot select folder '%s': Invalid mailbox name"
msgstr "Cannot select folder '%s': Invalid mailbox name"
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
+#: ../camel/providers/imap4/camel-imap4-engine.c:446
#, c-format
msgid "Cannot select folder '%s': Bad command"
msgstr "Cannot select folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
+#: ../camel/providers/imap4/camel-imap4-engine.c:1414
#, c-format
msgid "Failed to send command to IMAP server %s: %s"
msgstr "Failed to send command to IMAP server %s: %s"
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+#: ../camel/providers/imap4/camel-imap4-engine.c:1416
msgid "service unavailable"
msgstr "service unavailable"
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
+#: ../camel/providers/imap4/camel-imap4-engine.c:1546
+#: ../camel/providers/imap4/camel-imap4-engine.c:1584
+#: ../camel/providers/imap4/camel-imap4-engine.c:1628
+#: ../camel/providers/imap4/camel-imap4-engine.c:1683
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "IMAP4 server %s unexpectedly disconnected: %s"
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
+#: ../camel/providers/imap4/camel-imap4-folder.c:87
msgid ""
"Enable extended Mailing-List detection required for some filter and vFolder "
"rules"
@@ -3258,116 +3164,116 @@ msgstr ""
"Enable extended Mailing-List detection required for some filter and vFolder "
"rules"
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
+#: ../camel/providers/imap4/camel-imap4-folder.c:88
msgid "Expire cached messages that haven't been read in X seconds"
msgstr "Expire cached messages that haven't been read in X seconds"
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
msgid "Expire cached messages older than X seconds"
msgstr "Expire cached messages older than X seconds"
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#: ../camel/providers/imap4/camel-imap4-folder.c:427
#, c-format
msgid "Cannot access folder '%s': %s"
msgstr "Cannot access folder '%s': %s"
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
+#: ../camel/providers/imap4/camel-imap4-folder.c:484
#, c-format
msgid "Cannot sync flags to folder '%s': Unknown error"
msgstr "Cannot syncronise flags to folder '%s': Unknown error"
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
+#: ../camel/providers/imap4/camel-imap4-folder.c:490
#, c-format
msgid "Cannot sync flags to folder '%s': Bad command"
msgstr "Cannot syncronise flags to folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
+#: ../camel/providers/imap4/camel-imap4-folder.c:630
#, c-format
msgid "Cannot expunge folder '%s': Unknown error"
msgstr "Cannot expunge folder '%s': Unknown error"
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
+#: ../camel/providers/imap4/camel-imap4-folder.c:635
#, c-format
msgid "Cannot expunge folder '%s': Bad command"
msgstr "Cannot expunge folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
+#: ../camel/providers/imap4/camel-imap4-folder.c:891
#, 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:903
+#: ../camel/providers/imap4/camel-imap4-folder.c:896
#, 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:947
+#: ../camel/providers/imap4/camel-imap4-folder.c:940
#, c-format
msgid "Cannot append message to folder '%s': Folder is read-only"
msgstr "Cannot append message to folder '%s': Folder is read-only"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#: ../camel/providers/imap4/camel-imap4-folder.c:1033
#, 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:1070
+#: ../camel/providers/imap4/camel-imap4-folder.c:1063
#, 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:1190
+#: ../camel/providers/imap4/camel-imap4-folder.c:1182
#, c-format
msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
msgstr "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
+#: ../camel/providers/imap4/camel-imap4-folder.c:1186
#, c-format
msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
msgstr "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
#, 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:1206
+#: ../camel/providers/imap4/camel-imap4-folder.c:1198
#, 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:56
+#: ../camel/providers/imap4/camel-imap4-provider.c:55
msgid "Check new messages for _Junk contents"
msgstr "Check new messages for _Junk contents"
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#: ../camel/providers/imap4/camel-imap4-provider.c:57
msgid "Only check for Junk messa_ges in the INBOX folder"
msgstr "Only check for Junk messa_ges in the INBOX folder"
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
+#: ../camel/providers/imap4/camel-imap4-provider.c:66
msgid "IMAP4rev1"
msgstr "IMAP4rev1"
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
+#: ../camel/providers/imap4/camel-imap4-provider.c:68
msgid "For reading and storing mail on IMAPv4rev1 servers."
msgstr "For reading and storing mail on IMAPv4rev1 servers."
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
+#: ../camel/providers/imap4/camel-imap4-provider.c:85
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:263
+#: ../camel/providers/imap4/camel-imap4-store.c:259
#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
+#: ../camel/providers/nntp/camel-nntp-store.c:194
+#: ../camel/providers/nntp/camel-nntp-store.c:213
+#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:271
msgid "Connection canceled"
msgstr "Connection cancelled"
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imap4/camel-imap4-store.c:296
#, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
@@ -3376,155 +3282,155 @@ msgstr ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
+#: ../camel/providers/imap4/camel-imap4-store.c:326
+#: ../camel/providers/pop3/camel-pop3-store.c:249
msgid "TLS negotiations failed"
msgstr "TLS negotiations failed"
-#: ../camel/providers/imap4/camel-imap4-store.c:415
+#: ../camel/providers/imap4/camel-imap4-store.c:411
#, 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"
-#: ../camel/providers/imap4/camel-imap4-store.c:538
+#: ../camel/providers/imap4/camel-imap4-store.c:534
#, 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:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
+#: ../camel/providers/imap4/camel-imap4-store.c:697
+#: ../camel/providers/imap4/camel-imap4-store.c:964
msgid "Cannot create IMAP folders in offline mode."
msgstr "Cannot create IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:740
+#: ../camel/providers/imap4/camel-imap4-store.c:736
#, c-format
msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
msgstr "Cannot get folder '%s' on IMAP server %s: Unknown error"
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap4/camel-imap4-store.c:816
#, c-format
msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
msgstr "Cannot get LIST information for '%s' on IMAP server %s: %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
msgid "Bad command"
msgstr "Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap4/camel-imap4-store.c:897
#, 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:907
+#: ../camel/providers/imap4/camel-imap4-store.c:902
#, c-format
msgid "Cannot create folder '%s': Bad command"
msgstr "Cannot create folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap4/camel-imap4-store.c:1008
#, c-format
msgid "Cannot delete folder '%s': Special folder"
msgstr "Cannot delete folder '%s': Special folder"
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
+#: ../camel/providers/imap4/camel-imap4-store.c:1015
msgid "Cannot delete IMAP folders in offline mode."
msgstr "Cannot delete IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap4/camel-imap4-store.c:1074
#, 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:1084
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
#, c-format
msgid "Cannot delete folder '%s': Bad command"
msgstr "Cannot delete folder '%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imap4/camel-imap4-store.c:1099
#, 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:1111
+#: ../camel/providers/imap4/camel-imap4-store.c:1106
msgid "Cannot rename IMAP folders in offline mode."
msgstr "Cannot rename IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imap4/camel-imap4-store.c:1137
#, 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:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
#, c-format
msgid "Cannot rename folder '%s' to '%s': Bad command"
msgstr "Cannot rename folder '%s' to '%s': Bad command"
#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imap4/camel-imap4-store.c:1572
#, 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:1638
+#: ../camel/providers/imap4/camel-imap4-store.c:1633
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:1683
+#: ../camel/providers/imap4/camel-imap4-store.c:1678
#, 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:1688
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
#, 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:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:1705
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:1755
+#: ../camel/providers/imap4/camel-imap4-store.c:1750
#, 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:1760
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
#, 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:1596
+#: ../camel/providers/imap4/camel-imap4-summary.c:1590
msgid "Scanning for changed messages"
msgstr "Scanning for changed messages"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imap4/camel-imap4-summary.c:1611
#, c-format
msgid "IMAP server %s is in an inconsistent state."
msgstr "IMAP server %s is in an inconsistent state."
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#: ../camel/providers/imap4/camel-imap4-summary.c:1638
msgid "Fetching envelopes of new messages"
msgstr "Fetching envelopes of new messages"
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imap4/camel-imap4-utils.c:429
#, c-format
msgid "Unexpected token in response from IMAP server %s: "
msgstr "Unexpected token in response from IMAP server %s: "
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
+#: ../camel/providers/imap4/camel-imap4-utils.c:452
msgid "No data"
msgstr "No data"
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imap4/camel-imap4-utils.c:613
#, c-format
msgid "IMAP server %s unexpectedly disconnected: %s"
msgstr "IMAP server %s unexpectedly disconnected: %s"
#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
msgid "Message storage"
msgstr "Message storage"
@@ -3549,30 +3455,30 @@ msgstr ""
msgid "Could not connect to %s (port %s): %s"
msgstr "Could not connect to %s (port %s): %s"
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapp/camel-imapp-store.c:348
#, c-format
msgid "Could not connect to POP server on %s"
msgstr "Could not connect to POP server on %s"
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../camel/providers/local/camel-local-folder.c:178
msgid "Index message body data"
msgstr "Index message body data"
#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:395
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:402
#, c-format
-msgid "mailbox:%s (%s)"
-msgstr "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
+msgstr "mailbox: %s (%s)"
#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:406
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
@@ -3638,7 +3544,7 @@ msgstr "Standard Unix mbox spool directory"
#: ../camel/providers/local/camel-local-store.c:165
#: ../camel/providers/local/camel-local-store.c:276
#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-spool-store.c:128
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "Store root %s is not an absolute path"
@@ -3686,31 +3592,31 @@ 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:508
+#: ../camel/providers/local/camel-local-summary.c:515
msgid "Unable to add message to summary: unknown reason"
msgstr "Unable to add message to summary: unknown reason"
-#: ../camel/providers/local/camel-maildir-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:228
msgid "Maildir append message canceled"
msgstr "Maildir append message cancelled"
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:231
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Cannot append message to maildir folder: %s: %s"
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:261
+#: ../camel/providers/local/camel-maildir-folder.c:290
+#: ../camel/providers/local/camel-maildir-folder.c:304
+#: ../camel/providers/local/camel-maildir-folder.c:312
+#: ../camel/providers/local/camel-mbox-folder.c:362
+#: ../camel/providers/local/camel-mbox-folder.c:413
+#: ../camel/providers/local/camel-mbox-folder.c:434
+#: ../camel/providers/local/camel-mbox-folder.c:465
+#: ../camel/providers/local/camel-mbox-folder.c:473
+#: ../camel/providers/local/camel-mh-folder.c:225
+#: ../camel/providers/local/camel-mh-folder.c:236
+#: ../camel/providers/local/camel-mh-folder.c:244
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -3719,7 +3625,7 @@ msgstr ""
"Cannot get message: %s from folder %s\n"
" %s"
-#: ../camel/providers/local/camel-maildir-folder.c:298
+#: ../camel/providers/local/camel-maildir-folder.c:313
msgid "Invalid message contents"
msgstr "Invalid message contents"
@@ -3762,60 +3668,60 @@ msgid "not a maildir directory"
msgstr "not a maildir directory"
#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-spool-store.c:330
+#: ../camel/providers/local/camel-spool-store.c:344
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "Could not scan folder '%s': %s"
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:437
+#: ../camel/providers/local/camel-maildir-summary.c:556
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "Cannot open maildir directory path: %s: %s"
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:549
msgid "Checking folder consistency"
msgstr "Checking folder consistency"
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:658
msgid "Checking for new messages"
msgstr "Checking for new messages"
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:148
+#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:842
+#: ../camel/providers/local/camel-spool-summary.c:150
msgid "Storing folder"
msgstr "Storing folder"
-#: ../camel/providers/local/camel-mbox-folder.c:159
+#: ../camel/providers/local/camel-mbox-folder.c:167
#: ../camel/providers/local/camel-spool-folder.c:150
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "Cannot create folder lock on %s: %s"
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:231
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "Cannot open mailbox: %s: %s\n"
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:297
msgid "Mail append canceled"
msgstr "Mail append cancelled"
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:300
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "Cannot append message to mbox file: %s: %s"
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:466
msgid "The folder appears to be irrecoverably corrupted."
msgstr "The folder appears to be irrecoverably corrupted."
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
+#: ../camel/providers/local/camel-mbox-folder.c:474
+#: ../camel/providers/local/camel-mh-folder.c:245
msgid "Message construction failed."
msgstr "Message construction failed."
@@ -3884,85 +3790,85 @@ msgstr "Could not rename '%s': '%s': %s"
msgid "Could not rename '%s' to %s: %s"
msgstr "Could not rename '%s' to %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:532
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "Could not open folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:582
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "Fatal mail parser error near position %ld in folder %s"
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:659
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Cannot check folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:847
+#: ../camel/providers/local/camel-spool-summary.c:155
#, c-format
msgid "Could not open file: %s: %s"
msgstr "Could not open file: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-spool-summary.c:168
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Cannot open temporary mailbox: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:752
+#: ../camel/providers/local/camel-mbox-summary.c:956
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Could not close source folder %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:761
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "Could not close temporary folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:776
#, c-format
msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:858
+#: ../camel/providers/local/camel-mbox-summary.c:1083
#, c-format
msgid "Could not store folder: %s"
msgstr "Could not store folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:897
+#: ../camel/providers/local/camel-mbox-summary.c:905
#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:1121
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:1038
+#: ../camel/providers/local/camel-mbox-summary.c:1046
#: ../camel/providers/local/camel-spool-summary.c:334
#, c-format
msgid "Unknown error: %s"
msgstr "Unknown error: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1189
+#: ../camel/providers/local/camel-mbox-summary.c:1215
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "Writing to temporary mailbox failed: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1206
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "Writing to temporary mailbox failed: %s: %s"
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:180
msgid "MH append message canceled"
msgstr "MH append message cancelled"
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:183
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "Cannot append message to mh folder: %s: %s"
@@ -3977,27 +3883,27 @@ msgstr "Could not create folder '%s': %s"
msgid "Cannot get folder '%s': not a directory."
msgstr "Cannot get folder '%s': not a directory."
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:240
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "Cannot open MH directory path: %s: %s"
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:134
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "Spool '%s' cannot be opened: %s"
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:146
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "Spool '%s' is not a regular file or directory"
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:165
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "Folder '%s/%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:175
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -4006,12 +3912,12 @@ msgstr ""
"Could not open folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:179
#, c-format
msgid "Folder '%s' does not exist."
msgstr "Folder '%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:184
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -4020,41 +3926,41 @@ msgstr ""
"Could not create folder '%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:192
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "'%s' is not a mailbox file."
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:209
msgid "Store does not support an INBOX"
msgstr "Store does not support an INBOX"
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
#, c-format
msgid "Spool mail file %s"
msgstr "Spool mail file %s"
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
#, c-format
msgid "Spool folder tree %s"
msgstr "Spool folder tree %s"
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:229
msgid "Spool folders cannot be renamed"
msgstr "Spool folders cannot be renamed"
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:237
msgid "Spool folders cannot be deleted"
msgstr "Spool folders cannot be deleted"
-#: ../camel/providers/local/camel-spool-summary.c:179
-#: ../camel/providers/local/camel-spool-summary.c:189
-#: ../camel/providers/local/camel-spool-summary.c:199
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:200
#, 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:215
+#: ../camel/providers/local/camel-spool-summary.c:216
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "Could not sync spool folder %s: %s"
@@ -4071,25 +3977,25 @@ msgstr ""
"Folder may be corrupt; copy saved in '%s'"
#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
+#: ../camel/providers/nntp/camel-nntp-folder.c:226
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "Internal error: UID in invalid format: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:414
#, c-format
msgid "Posting failed: %s"
msgstr "Posting failed: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:432
msgid "You cannot post NNTP messages while working offline!"
msgstr "You cannot post NNTP messages while working offline!"
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:443
msgid "You cannot copy messages from a NNTP folder!"
msgstr "You cannot copy messages from a NNTP folder!"
@@ -4119,22 +4025,22 @@ msgstr ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:216
#, 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:229
+#: ../camel/providers/nntp/camel-nntp-store.c:228
#, 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:406
+#: ../camel/providers/nntp/camel-nntp-store.c:410
#, c-format
msgid "USENET News via %s"
msgstr "USENET News via %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:798
+#: ../camel/providers/nntp/camel-nntp-store.c:819
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4145,7 +4051,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:892
+#: ../camel/providers/nntp/camel-nntp-store.c:913
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
@@ -4155,7 +4061,7 @@ msgstr ""
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
-#: ../camel/providers/nntp/camel-nntp-store.c:924
+#: ../camel/providers/nntp/camel-nntp-store.c:945
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
@@ -4165,62 +4071,62 @@ msgstr ""
"\n"
"newsgroup does not exist!"
-#: ../camel/providers/nntp/camel-nntp-store.c:949
+#: ../camel/providers/nntp/camel-nntp-store.c:970
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:957
+#: ../camel/providers/nntp/camel-nntp-store.c:978
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:965
+#: ../camel/providers/nntp/camel-nntp-store.c:986
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:1154
+#: ../camel/providers/nntp/camel-nntp-store.c:1180
msgid "Authentication requested but no username provided"
msgstr "Authentication requested but no username provided"
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "Cannot authenticate to server: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1289
+#: ../camel/providers/nntp/camel-nntp-store.c:1315
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP Command failed: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1343
+#: ../camel/providers/nntp/camel-nntp-store.c:1369
msgid "Not connected."
msgstr "Not connected."
-#: ../camel/providers/nntp/camel-nntp-store.c:1396
+#: ../camel/providers/nntp/camel-nntp-store.c:1422
#, c-format
msgid "No such folder: %s"
msgstr "No such folder: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:272
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:279
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "Unexpected server response from xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Unexpected server response from head: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:420
msgid "Use cancel"
msgstr "Use cancel"
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:422
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
@@ -4259,28 +4165,28 @@ msgstr "Retrieving POP message %d"
msgid "Unknown reason"
msgstr "Unknown reason"
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
msgid "_Leave messages on server"
msgstr "_Leave messages on server"
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
#, c-format
msgid "_Delete after %s day(s)"
msgstr "_Delete after %s day(s)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
msgid "Disable _support for all POP3 extensions"
msgstr "Disable _support for all POP3 extensions"
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:59
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
+#: ../camel/providers/pop3/camel-pop3-provider.c:76
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4288,7 +4194,7 @@ 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
+#: ../camel/providers/pop3/camel-pop3-provider.c:86
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 "
@@ -4298,34 +4204,34 @@ 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:209
+#: ../camel/providers/pop3/camel-pop3-store.c:207
#, 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:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:248
+#: ../camel/providers/pop3/camel-pop3-store.c:254
#, 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:227
+#: ../camel/providers/pop3/camel-pop3-store.c:225
msgid "STLS not supported by server"
msgstr "STLS not supported by server"
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:255
msgid "TLS is not available in this build"
msgstr "TLS is not available in this build"
-#: ../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:537
+#: ../camel/providers/pop3/camel-pop3-store.c:402
+#: ../camel/providers/pop3/camel-pop3-store.c:535
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4334,22 +4240,22 @@ 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:510
+#: ../camel/providers/pop3/camel-pop3-store.c:508
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4358,8 +4264,8 @@ msgstr ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
"attack suspected. Please contact your admin."
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:549
+#: ../camel/providers/pop3/camel-pop3-store.c:562
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4368,7 +4274,7 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:556
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4377,7 +4283,7 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending username: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:669
#, c-format
msgid "No such folder '%s'."
msgstr "No such folder '%s'."
@@ -4394,173 +4300,173 @@ msgstr ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
msgid "Could not parse recipient list"
msgstr "Could not parse recipient list"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "Could not create pipe to sendmail: %s: mail not sent"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
#, c-format
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:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail exited with signal %s: mail not sent."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "Could not execute %s: mail not sent."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail exited with status %d: mail not sent."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
msgid "sendmail"
msgstr "sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
msgid "Mail delivery via the sendmail program"
msgstr "Mail delivery via the sendmail program"
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
msgid "SMTP"
msgstr "SMTP"
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
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:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
msgid "Syntax error, command unrecognized"
msgstr "Syntax error, command unrecognised"
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
msgid "Syntax error in parameters or arguments"
msgstr "Syntax error in parameters or arguments"
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
msgid "Command not implemented"
msgstr "Command not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
msgid "Command parameter not implemented"
msgstr "Command parameter not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
msgid "System status, or system help reply"
msgstr "System status, or system help reply"
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
msgid "Help message"
msgstr "Help message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
msgid "Service ready"
msgstr "Service ready"
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
msgid "Service closing transmission channel"
msgstr "Service closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
msgid "Service not available, closing transmission channel"
msgstr "Service not available, closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
msgid "Requested mail action okay, completed"
msgstr "Requested mail action okay, completed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
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:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Requested mail action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
msgid "Requested action not taken: mailbox unavailable"
msgstr "Requested action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
msgid "Requested action aborted: error in processing"
msgstr "Requested action aborted: error in processing"
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
msgid "User not local; please try <forward-path>"
msgstr "User not local; please try <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
msgid "Requested action not taken: insufficient system storage"
msgstr "Requested action not taken: insufficient system storage"
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Requested mail action aborted: exceeded storage allocation"
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
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:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Start mail input; end with <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
msgid "Transaction failed"
msgstr "Transaction failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
msgid "A password transition is needed"
msgstr "A password transition is needed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
msgid "Authentication mechanism is too weak"
msgstr "Authentication mechanism is too weak"
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
msgid "Encryption required for requested authentication mechanism"
msgstr "Encryption required for requested authentication mechanism"
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
msgid "Temporary authentication failure"
msgstr "Temporary authentication failure"
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
msgid "Welcome response error"
msgstr "Welcome response error"
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:370
#, 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:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:340
#, c-format
msgid "STARTTLS command failed: %s"
msgstr "STARTTLS command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:355
msgid "STARTTLS command failed"
msgstr "STARTTLS command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:496
#, 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:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:567
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4571,93 +4477,93 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
#, c-format
msgid "SMTP server %s"
msgstr "SMTP server %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "SMTP mail delivery via %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
msgid "Cannot send message: service not connected."
msgstr "Cannot send message: service not connected."
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
msgid "Cannot send message: sender address not valid."
msgstr "Cannot send message: sender address not valid."
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
msgid "Sending message"
msgstr "Sending message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
msgid "Cannot send message: no recipients defined."
msgstr "Cannot send message: no recipients defined."
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
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:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../camel/providers/smtp/camel-smtp-transport.c:1010
#, c-format
msgid "HELO command failed: %s"
msgstr "HELO command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1027
msgid "HELO command failed"
msgstr "HELO command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
msgid "SMTP Authentication"
msgstr "SMTP Authentication"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
msgid "Error creating SASL authentication object."
msgstr "Error creating SASL authentication object."
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
#, c-format
msgid "AUTH command failed: %s"
msgstr "AUTH command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
msgid "AUTH command failed"
msgstr "AUTH command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
msgid "Bad authentication response from server.\n"
msgstr "Bad authentication response from server.\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1230
#, 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:1248
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
msgid "MAIL FROM command failed"
msgstr "MAIL FROM command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1271
#, 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:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1399
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
#, c-format
msgid "DATA command failed: %s: mail not sent"
msgstr "DATA command failed: %s: mail not sent"
@@ -4665,108 +4571,108 @@ 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:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
msgid "DATA command failed"
msgstr "DATA command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1457
#, c-format
msgid "RSET command failed: %s"
msgstr "RSET command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
+#: ../camel/providers/smtp/camel-smtp-transport.c:1473
msgid "RSET command failed"
msgstr "RSET command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1496
#, c-format
msgid "QUIT command failed: %s"
msgstr "QUIT command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
msgid "QUIT command failed"
msgstr "QUIT command failed"
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:47
msgid "Business"
msgstr "Business"
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
msgid "Competition"
msgstr "Competition"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
msgid "Favorites"
msgstr "Favourites"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
msgid "Gifts"
msgstr "Gifts"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
msgid "Goals/Objectives"
msgstr "Goals/Objectives"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
msgid "Holiday"
msgstr "Holiday"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
msgid "Holiday Cards"
msgstr "Holiday Cards"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
msgid "Hot Contacts"
msgstr "Hot Contacts"
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
msgid "Ideas"
msgstr "Ideas"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
msgid "International"
msgstr "International"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
msgid "Key Customer"
msgstr "Key Customer"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
msgid "Miscellaneous"
msgstr "Miscellaneous"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
msgid "Personal"
msgstr "Personal"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
msgid "Phone Calls"
msgstr "Phone Calls"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
msgid "Status"
msgstr "Status"
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
msgid "Strategies"
msgstr "Strategies"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
msgid "Suppliers"
msgstr "Suppliers"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
msgid "Time & Expenses"
msgstr "Time & Expenses"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
msgid "Waiting"
msgstr "Waiting"
@@ -4774,7 +4680,7 @@ msgstr "Waiting"
#. in 12-hour format.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -4782,7 +4688,7 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
#. in 24-hour format.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -4790,7 +4696,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
#. in 12-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
@@ -4798,78 +4704,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
#. in 24-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
msgid "%a %m/%d/%Y %I %p"
msgstr "%a %d/%m/%Y %I %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
msgid "%a %m/%d/%Y %H"
msgstr "%a %d/%m/%Y %H"
#. strptime format of a weekday and a date.
#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
+#: ../libedataserver/e-time-utils.c:1882
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%d/%m/%Y %I:%M:%S %p"
#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%d/%m/%Y %H:%M:%S"
#. strptime format of a date and a time, in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
msgid "%m/%d/%Y %I:%M %p"
msgstr "%d/%m/%Y %I:%M %p"
#. strptime format of a date and a time, in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
msgid "%m/%d/%Y %H:%M"
msgstr "%d/%m/%Y %H:%M"
#. strptime format of a date and a time, in 12-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
msgid "%m/%d/%Y %I %p"
msgstr "%d/%m/%Y %I %p"
#. strptime format of a date and a time, in 24-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format of a weekday and a date.
#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
#. strptime format for a time of day, in 12-hour format.
#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -4877,24 +4783,24 @@ msgstr "%H:%M:%S"
#. in 12-hour format.
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
#. strftime format of a time in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
msgid "%H:%M"
msgstr "%H:%M"
#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
+#: ../libedataserver/e-time-utils.c:1840
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1844
msgid "%I %p"
msgstr "%I %p"
@@ -4906,7 +4812,7 @@ msgstr "Accessing LDAP Server anonymously"
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:338
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
@@ -4915,43 +4821,43 @@ msgstr ""
"There is already a category '%s' in the configuration. Please use another "
"name"
-#: ../libedataserverui/e-categories-dialog.c:526
+#: ../libedataserverui/e-categories-dialog.c:641
msgid "Icon"
msgstr "Icon"
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:646
msgid "Category"
msgstr "Category"
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.ui.h:1
msgid "Category Icon"
msgstr "Category Icon"
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:2
msgid "Category Properties"
msgstr "Category Properties"
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:3
msgid "Category _Icon"
msgstr "Category _Icon"
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:4
msgid "Category _Name"
msgstr "Category _Name"
-#: ../libedataserverui/e-categories-dialog.glade.h:5
+#: ../libedataserverui/e-categories-dialog.ui.h:5
msgid "Item(s) belong to these _categories:"
msgstr "Item(s) belong to these _categories:"
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:6
msgid "_Available Categories:"
msgstr "_Available Categories:"
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:7
msgid "_Edit"
msgstr "_Edit"
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:8
msgid "categories"
msgstr "categories"
@@ -4968,85 +4874,85 @@ msgstr "Colour Info"
msgid "The color to render"
msgstr "The colour to render"
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:292
msgid "Select Contacts from Address Book"
msgstr "Select Contacts from Address Book"
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:579
msgid "_Add"
msgstr "_Add"
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:604
msgid "_Remove"
msgstr "_Remove"
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "Any Category"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
msgid "*"
msgstr "*"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
msgid "<b>Co_ntacts</b>"
msgstr "<b>Co_ntacts</b>"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
msgid "<b>Show Contacts</b>"
msgstr "<b>Show Contacts</b>"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
msgid "Address B_ook:"
msgstr "Address B_ook:"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
msgid "Address Book"
msgstr "Address Book"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
msgid "Cate_gory:"
msgstr "Cate_gory:"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
msgid "Contacts"
msgstr "Contacts"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
msgid "Search"
msgstr "Search"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
msgid "_Search:"
msgstr "_Search:"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2494
#, c-format
msgid "E_xpand %s Inline"
msgstr "E_xpand %s Inline"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2509
#, c-format
msgid "Cop_y %s"
msgstr "Cop_y %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2519
#, c-format
msgid "C_ut %s"
msgstr "C_ut %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2536
#, c-format
msgid "_Edit %s"
msgstr "_Edit %s"
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:469
#, c-format
msgid "_Delete %s"
msgstr "_Delete %s"
@@ -5056,23 +4962,23 @@ msgstr "_Delete %s"
msgid "Keyring key is unusable: no user or host name"
msgstr "Keyring key is unusable: no user or host name"
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:1093
msgid "You have the Caps Lock key on."
msgstr "You have the Caps Lock key on."
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1215
msgid "_Remember this passphrase"
msgstr "_Remember this passphrase"
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1216
msgid "_Remember this passphrase for the remainder of this session"
msgstr "_Remember this passphrase for the remainder of this session"
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1221
msgid "_Remember this password"
msgstr "_Remember this password"
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1222
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
@@ -5085,137 +4991,137 @@ msgstr "Select destination"
msgid "_Destination"
msgstr "_Destination"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
+#: ../servers/exchange/lib/e2k-autoconfig.c:1694
+#: ../servers/exchange/storage/exchange-account.c:954
#, c-format
msgid "Enter password for %s"
msgstr "Enter password for %s"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
+#: ../servers/exchange/lib/e2k-autoconfig.c:1695
+#: ../servers/exchange/storage/exchange-account.c:959
msgid "Enter password"
msgstr "Enter password"
#. i18n: These are Outlook's words for the default roles in
#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
+#: ../servers/exchange/lib/e2k-security-descriptor.c:844
msgid "Owner"
msgstr "Owner"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
+#: ../servers/exchange/lib/e2k-security-descriptor.c:854
msgid "Publishing Editor"
msgstr "Publishing Editor"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
+#: ../servers/exchange/lib/e2k-security-descriptor.c:862
msgid "Editor"
msgstr "Editor"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
+#: ../servers/exchange/lib/e2k-security-descriptor.c:869
msgid "Publishing Author"
msgstr "Publishing Author"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
+#: ../servers/exchange/lib/e2k-security-descriptor.c:875
msgid "Author"
msgstr "Author"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
+#: ../servers/exchange/lib/e2k-security-descriptor.c:880
msgid "Non-editing Author"
msgstr "Non-editing Author"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
+#: ../servers/exchange/lib/e2k-security-descriptor.c:884
msgid "Reviewer"
msgstr "Reviewer"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
+#: ../servers/exchange/lib/e2k-security-descriptor.c:886
msgid "Contributor"
msgstr "Contributor"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
+#: ../servers/exchange/lib/e2k-security-descriptor.c:888
msgid "None"
msgstr "None"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
+#: ../servers/exchange/lib/e2k-security-descriptor.c:903
msgid "Custom"
msgstr "Custom"
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../servers/exchange/storage/e-storage.c:557
msgid "Generic error"
msgstr "Generic error"
-#: ../servers/exchange/storage/e-storage.c:557
+#: ../servers/exchange/storage/e-storage.c:559
msgid "A folder with the same name already exists"
msgstr "A folder with the same name already exists"
-#: ../servers/exchange/storage/e-storage.c:559
+#: ../servers/exchange/storage/e-storage.c:561
msgid "The specified folder type is not valid"
msgstr "The specified folder type is not valid"
-#: ../servers/exchange/storage/e-storage.c:561
+#: ../servers/exchange/storage/e-storage.c:563
msgid "I/O error"
msgstr "I/O error"
-#: ../servers/exchange/storage/e-storage.c:563
+#: ../servers/exchange/storage/e-storage.c:565
msgid "Not enough space to create the folder"
msgstr "Not enough space to create the folder"
-#: ../servers/exchange/storage/e-storage.c:565
+#: ../servers/exchange/storage/e-storage.c:567
msgid "The folder is not empty"
msgstr "The folder is not empty"
-#: ../servers/exchange/storage/e-storage.c:567
+#: ../servers/exchange/storage/e-storage.c:569
msgid "The specified folder was not found"
msgstr "The specified folder was not found"
-#: ../servers/exchange/storage/e-storage.c:569
+#: ../servers/exchange/storage/e-storage.c:571
msgid "Function not implemented in this storage"
msgstr "Function not implemented in this storage"
-#: ../servers/exchange/storage/e-storage.c:573
+#: ../servers/exchange/storage/e-storage.c:575
msgid "Operation not supported"
msgstr "Operation not supported"
-#: ../servers/exchange/storage/e-storage.c:575
+#: ../servers/exchange/storage/e-storage.c:577
msgid "The specified type is not supported in this storage"
msgstr "The specified type is not supported in this storage"
-#: ../servers/exchange/storage/e-storage.c:577
+#: ../servers/exchange/storage/e-storage.c:579
msgid "The specified folder cannot be modified or removed"
msgstr "The specified folder cannot be modified or removed"
-#: ../servers/exchange/storage/e-storage.c:579
+#: ../servers/exchange/storage/e-storage.c:581
msgid "Cannot make a folder a child of one of its descendants"
msgstr "Cannot make a folder a child of one of its descendants"
-#: ../servers/exchange/storage/e-storage.c:581
+#: ../servers/exchange/storage/e-storage.c:583
msgid "Cannot create a folder with that name"
msgstr "Cannot create a folder with that name"
-#: ../servers/exchange/storage/e-storage.c:583
+#: ../servers/exchange/storage/e-storage.c:585
msgid "This operation cannot be performed in off-line mode"
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:642
+#: ../servers/exchange/storage/exchange-account.c:639
#, c-format
msgid "%s's Folders"
msgstr "%s's Folders"
-#: ../servers/exchange/storage/exchange-account.c:1265
+#: ../servers/exchange/storage/exchange-account.c:1259
msgid "Personal Folders"
msgstr "Personal Folders"
-#: ../servers/exchange/storage/exchange-account.c:1280
+#: ../servers/exchange/storage/exchange-account.c:1274
msgid "Favorite Public Folders"
msgstr "Favourite Public Folders"
#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
+#: ../servers/exchange/storage/exchange-account.c:1291
msgid "All Public Folders"
msgstr "All Public Folders"
#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
+#: ../servers/exchange/storage/exchange-account.c:1305
msgid "Global Address List"
msgstr "Global Address List"
@@ -5223,6 +5129,10 @@ msgstr "Global Address List"
msgid "Deleted Items"
msgstr "Deleted Items"
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
+msgid "Drafts"
+msgstr "Drafts"
+
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
msgid "Journal"
msgstr "Journal"
@@ -5275,12 +5185,58 @@ msgstr "Evolution Data Server interface check service"
msgid "Evolution Data Server logging service"
msgstr "Evolution Data Server logging service"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "\"%s\" on book before \"%s\""
+
+#~ msgid "book busy"
+#~ msgstr "book busy"
+
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA exception making \"%s\" call"
+
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: there is no current operation"
+
+#~ msgid "%s: could not cancel"
+#~ msgstr "%s: could not cancel"
+
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "\"%s\" on book after \"%s\""
+
+#~ msgid "%s: canceled"
+#~ msgstr "%s: cancelled"
+
+#~ msgid "%s: Invalid source."
+#~ msgstr "%s: Invalid source."
+
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: no factories available for URI `%s'"
+
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: Could not create EBookListener"
+
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "Decoder failed, error %d"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL not yet valid"
+
+#~ msgid "CRL has expired"
+#~ msgstr "CRL has expired"
+
+#~ msgid "Error in CRL"
+#~ msgstr "Error in CRL"
+
+#~ msgid "Sent"
+#~ msgstr "Sent"
+
+#~ msgid "Templates"
+#~ msgstr "Templates"
+
# dialog display isn't working out
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "Multiple segmentation faults occurred; cannot display error dialogue\n"
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "Multiple segmentation faults occurred; cannot display error dialogue\n"
#~ msgid "Fair"
#~ msgstr "Fair"
@@ -5441,7 +5397,7 @@ msgstr "Multiple segmentation faults occurred; cannot display error dialogue\n"
#~ msgstr "Select User"
#~ msgid "Addressbook..."
-#~ msgstr "Addressbook..."
+#~ msgstr "Addressbookâ?¦"
#~ msgid "\t\t\t\t\t\t"
#~ msgstr "\t\t\t\t\t\t"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
