msgstr ""
"Project-Id-Version: evolution-data-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-19 23:33-0500\n"
+"POT-Creation-Date: 2007-08-23 18:46-0400\n"
"PO-Revision-Date: 2005-07-26 13:04-0400\n"
"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
"Language-Team: Canadian English <adamw@gnome.org>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:536
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2213
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:484
+#: ../addressbook/backends/file/e-book-backend-file.c:554
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2312
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:486
msgid "Loading..."
msgstr "Loading..."
-#: ../addressbook/backends/file/e-book-backend-file.c:538
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2172
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2192
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2211
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4038
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:486
+#: ../addressbook/backends/file/e-book-backend-file.c:557
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2271
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2291
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4150
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:488
msgid "Searching..."
msgstr "Searching..."
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2496
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4202
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2672
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4309
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "Downloading contacts (%d)... "
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2645
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2812
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2848
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2827
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3018
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3062
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "Updating contacts cache (%d)... "
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:713
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742
msgid "Using Distinguished Name (DN)"
msgstr "Using Distinguished Name (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:716
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745
msgid "Using Email Address"
msgstr "Using Email Address"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:935
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:998
msgid "Reconnecting to LDAP server..."
msgstr "Reconnecting to LDAP server..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1534
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1592
msgid "Adding contact to LDAP server..."
msgstr "Adding contact to LDAP server..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1668
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1720
msgid "Removing contact from LDAP server..."
msgstr "Removing contact from LDAP server..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1988
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2025
msgid "Modifying contact from LDAP server..."
msgstr "Modifying contact from LDAP server..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3900
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4021
msgid "Receiving LDAP search results..."
msgstr "Receiving LDAP search results..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4060
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4170
msgid "Error performing search"
msgstr "Error performing search"
#: ../addressbook/libebook/e-book.c:1836 ../addressbook/libebook/e-book.c:1840
#: ../addressbook/libebook/e-book.c:2077 ../addressbook/libebook/e-book.c:2081
#: ../addressbook/libebook/e-book.c:2293 ../addressbook/libebook/e-book.c:2297
-#: ../addressbook/libebook/e-book.c:3393
+#: ../addressbook/libebook/e-book.c:3431
#, c-format
msgid "\"%s\" on book before \"%s\""
msgstr "\"%s\" on book before \"%s\""
#: ../addressbook/libebook/e-book.c:1044 ../addressbook/libebook/e-book.c:1235
#: ../addressbook/libebook/e-book.c:1396 ../addressbook/libebook/e-book.c:1608
#: ../addressbook/libebook/e-book.c:1849 ../addressbook/libebook/e-book.c:2091
-#: ../addressbook/libebook/e-book.c:2306 ../addressbook/libebook/e-book.c:2642
-#: ../addressbook/libebook/e-book.c:2848
+#: ../addressbook/libebook/e-book.c:2306 ../addressbook/libebook/e-book.c:2672
+#: ../addressbook/libebook/e-book.c:2878
+#, c-format
msgid "book busy"
msgstr "book busy"
#: ../addressbook/libebook/e-book.c:1896 ../addressbook/libebook/e-book.c:1900
#: ../addressbook/libebook/e-book.c:2123 ../addressbook/libebook/e-book.c:2127
#: ../addressbook/libebook/e-book.c:2334 ../addressbook/libebook/e-book.c:2338
-#: ../addressbook/libebook/e-book.c:2583 ../addressbook/libebook/e-book.c:2670
-#: ../addressbook/libebook/e-book.c:2674 ../addressbook/libebook/e-book.c:2876
-#: ../addressbook/libebook/e-book.c:2880 ../addressbook/libebook/e-book.c:3402
+#: ../addressbook/libebook/e-book.c:2613 ../addressbook/libebook/e-book.c:2700
+#: ../addressbook/libebook/e-book.c:2704 ../addressbook/libebook/e-book.c:2906
+#: ../addressbook/libebook/e-book.c:2910 ../addressbook/libebook/e-book.c:3440
#, c-format
msgid "CORBA exception making \"%s\" call"
msgstr "CORBA exception making \"%s\" call"
-#: ../addressbook/libebook/e-book.c:2564
+#: ../addressbook/libebook/e-book.c:2594
#, c-format
msgid "%s: there is no current operation"
msgstr "%s: there is no current operation"
-#: ../addressbook/libebook/e-book.c:2599
+#: ../addressbook/libebook/e-book.c:2629
#, c-format
-msgid "%s: couldn't cancel"
+msgid "%s: could not cancel"
msgstr "%s: could not cancel"
-#: ../addressbook/libebook/e-book.c:2628 ../addressbook/libebook/e-book.c:2632
+#: ../addressbook/libebook/e-book.c:2658 ../addressbook/libebook/e-book.c:2662
#, c-format
msgid "\"%s\" on book after \"%s\""
msgstr "\"%s\" on book after \"%s\""
-#: ../addressbook/libebook/e-book.c:2698
+#: ../addressbook/libebook/e-book.c:2728
#, c-format
-msgid "%s: cancelled"
+msgid "%s: canceled"
msgstr "%s: cancelled"
-#: ../addressbook/libebook/e-book.c:3259
+#: ../addressbook/libebook/e-book.c:3295
#, c-format
msgid "%s: Invalid source."
msgstr "%s: Invalid source."
-#: ../addressbook/libebook/e-book.c:3267 ../addressbook/libebook/e-book.c:3331
+#: ../addressbook/libebook/e-book.c:3303 ../addressbook/libebook/e-book.c:3369
#, c-format
-msgid "%s: no factories available for uri `%s'"
+msgid "%s: no factories available for URI `%s'"
msgstr "%s: no factories available for URI `%s'"
-#: ../addressbook/libebook/e-book.c:3279
+#: ../addressbook/libebook/e-book.c:3315
#, c-format
msgid "%s: Could not create EBookListener"
msgstr "%s: Could not create EBookListener"
-#: ../addressbook/libebook/e-book.c:3542
+#: ../addressbook/libebook/e-book.c:3580
#, c-format
-msgid "%s: there was no self contact uid stored in gconf"
+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:3672
+#: ../addressbook/libebook/e-book.c:3713
#, 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."
-#: ../addressbook/libebook/e-contact.c:108
+#. Dummy row as EContactField starts from 1
+#: ../addressbook/libebook/e-contact.c:114
msgid "Unique ID"
msgstr "Unique ID"
-#: ../addressbook/libebook/e-contact.c:109
+#: ../addressbook/libebook/e-contact.c:115
msgid "File Under"
msgstr "File Under"
+#. URI of the book to which the contact belongs to
+#: ../addressbook/libebook/e-contact.c:117
+msgid "Book URI"
+msgstr "Book URI"
+
#. Name fields
#. FN isn't really a structured field - we use a getter/setter
#. so we can set the N property (since evo 1.4 works fine with
#. vcards that don't even have a N attribute. *sigh*)
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:123
msgid "Full Name"
msgstr "Full Name"
-#: ../addressbook/libebook/e-contact.c:116
-msgid "Name"
-msgstr "Name"
-
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:124
msgid "Given Name"
msgstr "Given Name"
-#: ../addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:125
msgid "Family Name"
msgstr "Family Name"
-#: ../addressbook/libebook/e-contact.c:119
+#: ../addressbook/libebook/e-contact.c:126
msgid "Nickname"
msgstr "Nickname"
-#: ../addressbook/libebook/e-contact.c:120
-msgid "Name or Org"
-msgstr "Name or Org"
+#. Email fields
+#: ../addressbook/libebook/e-contact.c:129
+msgid "Email 1"
+msgstr "Email 1"
-#. Address fields
-#: ../addressbook/libebook/e-contact.c:123
-msgid "Address List"
-msgstr "Address List"
+#: ../addressbook/libebook/e-contact.c:130
+msgid "Email 2"
+msgstr "Email 2"
-#: ../addressbook/libebook/e-contact.c:124
-msgid "Home Address"
-msgstr "Home Address"
+#: ../addressbook/libebook/e-contact.c:131
+msgid "Email 3"
+msgstr "Email 3"
-#: ../addressbook/libebook/e-contact.c:125
-msgid "Work Address"
-msgstr "Work Address"
+#: ../addressbook/libebook/e-contact.c:132
+msgid "Email 4"
+msgstr "Email 4"
-#: ../addressbook/libebook/e-contact.c:126
-msgid "Other Address"
-msgstr "Other Address"
+#: ../addressbook/libebook/e-contact.c:134
+msgid "Mailer"
+msgstr "Mailer"
-#: ../addressbook/libebook/e-contact.c:128
+#. Address Labels
+#: ../addressbook/libebook/e-contact.c:137
msgid "Home Address Label"
msgstr "Home Address Label"
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:138
msgid "Work Address Label"
msgstr "Work Address Label"
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:139
msgid "Other Address Label"
msgstr "Other Address Label"
-#: ../addressbook/libebook/e-contact.c:132
+#. Phone fields
+#: ../addressbook/libebook/e-contact.c:142
msgid "Assistant Phone"
msgstr "Assistant Phone"
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:143
msgid "Business Phone"
msgstr "Business Phone"
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:144
msgid "Business Phone 2"
msgstr "Business Phone 2"
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:145
msgid "Business Fax"
msgstr "Business Fax"
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:146
msgid "Callback Phone"
msgstr "Callback Phone"
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:147
msgid "Car Phone"
msgstr "Car Phone"
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:148
msgid "Company Phone"
msgstr "Company Phone"
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:149
msgid "Home Phone"
msgstr "Home Phone"
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:150
msgid "Home Phone 2"
msgstr "Home Phone 2"
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:151
msgid "Home Fax"
msgstr "Home Fax"
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:152
msgid "ISDN"
msgstr "ISDN"
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:153
msgid "Mobile Phone"
msgstr "Mobile Phone"
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:154
msgid "Other Phone"
msgstr "Other Phone"
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:155
msgid "Other Fax"
msgstr "Other Fax"
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:156
msgid "Pager"
msgstr "Pager"
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:157
msgid "Primary Phone"
msgstr "Primary Phone"
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:158
msgid "Radio"
msgstr "Radio"
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:159
msgid "Telex"
msgstr "Telex"
-#: ../addressbook/libebook/e-contact.c:150
+#. To translators: TTY is Teletypewriter
+#: ../addressbook/libebook/e-contact.c:161
msgid "TTY"
msgstr "TTY"
-#. Email fields
-#: ../addressbook/libebook/e-contact.c:153
-msgid "Email List"
-msgstr "Email List"
+#. Organizational fields
+#: ../addressbook/libebook/e-contact.c:164
+msgid "Organization"
+msgstr "Organization"
-#: ../addressbook/libebook/e-contact.c:154
-msgid "Email 1"
-msgstr "Email 1"
+#: ../addressbook/libebook/e-contact.c:165
+msgid "Organizational Unit"
+msgstr "Organizational Unit"
-#: ../addressbook/libebook/e-contact.c:155
-msgid "Email 2"
-msgstr "Email 2"
+#: ../addressbook/libebook/e-contact.c:166
+msgid "Office"
+msgstr "Office"
-#: ../addressbook/libebook/e-contact.c:156
-msgid "Email 3"
-msgstr "Email 3"
+#: ../addressbook/libebook/e-contact.c:167
+msgid "Title"
+msgstr "Title"
-#: ../addressbook/libebook/e-contact.c:157
-msgid "Email 4"
-msgstr "Email 4"
+#: ../addressbook/libebook/e-contact.c:168
+msgid "Role"
+msgstr "Role"
-#: ../addressbook/libebook/e-contact.c:158
-msgid "Mailer"
-msgstr "Mailer"
+#: ../addressbook/libebook/e-contact.c:169
+msgid "Manager"
+msgstr "Manager"
-#: ../addressbook/libebook/e-contact.c:159
-msgid "Wants HTML Mail"
-msgstr "Wants HTML Mail"
+#: ../addressbook/libebook/e-contact.c:170
+msgid "Assistant"
+msgstr "Assistant"
-#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:162
-msgid "AIM Screen Name List"
-msgstr "AIM Screen Name List"
+#. Web fields
+#: ../addressbook/libebook/e-contact.c:173
+msgid "Homepage URL"
+msgstr "Homepage URL"
-#: ../addressbook/libebook/e-contact.c:163
-msgid "GroupWise Id List"
-msgstr "GroupWise ID List"
+#: ../addressbook/libebook/e-contact.c:174
+msgid "Weblog URL"
+msgstr "Weblog URL"
-#: ../addressbook/libebook/e-contact.c:164
-msgid "Jabber Id List"
-msgstr "Jabber ID List"
+#. Contact categories
+#: ../addressbook/libebook/e-contact.c:177
+#: ../libedataserverui/e-categories-dialog.c:439
+msgid "Categories"
+msgstr "Categories"
-#: ../addressbook/libebook/e-contact.c:165
-msgid "Yahoo! Screen Name List"
-msgstr "Yahoo! Screen Name List"
+#. Collaboration fields
+#: ../addressbook/libebook/e-contact.c:180
+msgid "Calendar URI"
+msgstr "Calendar URI"
-#: ../addressbook/libebook/e-contact.c:166
-msgid "MSN Screen Name List"
-msgstr "MSN Screen Name List"
+#: ../addressbook/libebook/e-contact.c:181
+msgid "Free/Busy URL"
+msgstr "Free/Busy URL"
-#: ../addressbook/libebook/e-contact.c:167
-msgid "ICQ Id List"
-msgstr "ICQ ID List"
+#: ../addressbook/libebook/e-contact.c:182
+msgid "ICS Calendar"
+msgstr "ICS Calendar"
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:183
+msgid "Video Conferencing URL"
+msgstr "Video Conferencing URL"
+
+#. Misc fields
+#: ../addressbook/libebook/e-contact.c:186
+msgid "Spouse's Name"
+msgstr "Spouse's Name"
+
+#: ../addressbook/libebook/e-contact.c:187
+msgid "Note"
+msgstr "Note"
+
+#. Instant messaging fields
+#: ../addressbook/libebook/e-contact.c:190
msgid "AIM Home Screen Name 1"
msgstr "AIM Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:191
msgid "AIM Home Screen Name 2"
msgstr "AIM Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:192
msgid "AIM Home Screen Name 3"
msgstr "AIM Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:193
msgid "AIM Work Screen Name 1"
msgstr "AIM Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:194
msgid "AIM Work Screen Name 2"
msgstr "AIM Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:195
msgid "AIM Work Screen Name 3"
msgstr "AIM Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:196
msgid "GroupWise Home Screen Name 1"
msgstr "GroupWise Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook/e-contact.c:197
msgid "GroupWise Home Screen Name 2"
msgstr "GroupWise Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:198
msgid "GroupWise Home Screen Name 3"
msgstr "GroupWise Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:199
msgid "GroupWise Work Screen Name 1"
msgstr "GroupWise Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:200
msgid "GroupWise Work Screen Name 2"
msgstr "GroupWise Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:201
msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:202
msgid "Jabber Home Id 1"
msgstr "Jabber Home ID 1"
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:203
msgid "Jabber Home Id 2"
msgstr "Jabber Home ID 2"
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:204
msgid "Jabber Home Id 3"
msgstr "Jabber Home ID 3"
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:205
msgid "Jabber Work Id 1"
msgstr "Jabber Work ID 1"
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:206
msgid "Jabber Work Id 2"
msgstr "Jabber Work ID 2"
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:207
msgid "Jabber Work Id 3"
msgstr "Jabber Work ID 3"
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:208
msgid "Yahoo! Home Screen Name 1"
msgstr "Yahoo! Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:209
msgid "Yahoo! Home Screen Name 2"
msgstr "Yahoo! Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:210
msgid "Yahoo! Home Screen Name 3"
msgstr "Yahoo! Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:211
msgid "Yahoo! Work Screen Name 1"
msgstr "Yahoo! Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:212
msgid "Yahoo! Work Screen Name 2"
msgstr "Yahoo! Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:213
msgid "Yahoo! Work Screen Name 3"
msgstr "Yahoo! Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:214
msgid "MSN Home Screen Name 1"
msgstr "MSN Home Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:215
msgid "MSN Home Screen Name 2"
msgstr "MSN Home Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:216
msgid "MSN Home Screen Name 3"
msgstr "MSN Home Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:217
msgid "MSN Work Screen Name 1"
msgstr "MSN Work Screen Name 1"
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:218
msgid "MSN Work Screen Name 2"
msgstr "MSN Work Screen Name 2"
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:219
msgid "MSN Work Screen Name 3"
msgstr "MSN Work Screen Name 3"
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:220
msgid "ICQ Home Id 1"
msgstr "ICQ Home ID 1"
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:221
msgid "ICQ Home Id 2"
msgstr "ICQ Home ID 2"
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:222
msgid "ICQ Home Id 3"
msgstr "ICQ Home ID 3"
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:223
msgid "ICQ Work Id 1"
msgstr "ICQ Work ID 1"
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:224
msgid "ICQ Work Id 2"
msgstr "ICQ Work ID 2"
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:225
msgid "ICQ Work Id 3"
msgstr "ICQ Work ID 3"
-#. Organizational fields
-#: ../addressbook/libebook/e-contact.c:207
-msgid "Organization"
-msgstr "Organization"
-
-#: ../addressbook/libebook/e-contact.c:208
-msgid "Organizational Unit"
-msgstr "Organizational Unit"
-
-#: ../addressbook/libebook/e-contact.c:209
-msgid "Office"
-msgstr "Office"
-
-#: ../addressbook/libebook/e-contact.c:211
-msgid "Title"
-msgstr "Title"
+#. Last modified time
+#: ../addressbook/libebook/e-contact.c:228
+msgid "Last Revision"
+msgstr "Last Revision"
-#: ../addressbook/libebook/e-contact.c:212
-msgid "Role"
-msgstr "Role"
+#: ../addressbook/libebook/e-contact.c:229
+msgid "Name or Org"
+msgstr "Name or Org"
-#: ../addressbook/libebook/e-contact.c:213
-msgid "Manager"
-msgstr "Manager"
+#. Address fields
+#: ../addressbook/libebook/e-contact.c:232
+msgid "Address List"
+msgstr "Address List"
-#: ../addressbook/libebook/e-contact.c:214
-msgid "Assistant"
-msgstr "Assistant"
+#: ../addressbook/libebook/e-contact.c:233
+msgid "Home Address"
+msgstr "Home Address"
-#. Web fields
-#: ../addressbook/libebook/e-contact.c:217
-msgid "Homepage URL"
-msgstr "Homepage URL"
+#: ../addressbook/libebook/e-contact.c:234
+msgid "Work Address"
+msgstr "Work Address"
-#: ../addressbook/libebook/e-contact.c:218
-msgid "Weblog URL"
-msgstr "Weblog URL"
+#: ../addressbook/libebook/e-contact.c:235
+msgid "Other Address"
+msgstr "Other Address"
-#: ../addressbook/libebook/e-contact.c:219
-msgid "Video Conferencing URL"
-msgstr "Video Conferencing URL"
+#. Contact categories
+#: ../addressbook/libebook/e-contact.c:238
+msgid "Category List"
+msgstr "Category List"
#. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:241
msgid "Photo"
msgstr "Photo"
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:242
msgid "Logo"
msgstr "Logo"
-#. Security fields
-#: ../addressbook/libebook/e-contact.c:226
-msgid "X.509 Certificate"
-msgstr "X.509 Certificate"
+#: ../addressbook/libebook/e-contact.c:244
+msgid "Name"
+msgstr "Name"
-#. Contact categories
-#: ../addressbook/libebook/e-contact.c:229
-msgid "Category List"
-msgstr "Category List"
+#: ../addressbook/libebook/e-contact.c:245
+msgid "Email List"
+msgstr "Email List"
+
+#. Instant messaging fields
+#: ../addressbook/libebook/e-contact.c:248
+msgid "AIM Screen Name List"
+msgstr "AIM Screen Name List"
+
+#: ../addressbook/libebook/e-contact.c:249
+msgid "GroupWise Id List"
+msgstr "GroupWise ID List"
+
+#: ../addressbook/libebook/e-contact.c:250
+msgid "Jabber Id List"
+msgstr "Jabber ID List"
-#: ../addressbook/libebook/e-contact.c:230
-#: ../libedataserverui/e-categories-dialog.c:410
-msgid "Categories"
-msgstr "Categories"
+#: ../addressbook/libebook/e-contact.c:251
+msgid "Yahoo! Screen Name List"
+msgstr "Yahoo! Screen Name List"
-#. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:233
-msgid "Calendar URI"
-msgstr "Calendar URI"
+#: ../addressbook/libebook/e-contact.c:252
+msgid "MSN Screen Name List"
+msgstr "MSN Screen Name List"
-#: ../addressbook/libebook/e-contact.c:234
-msgid "Free/Busy URL"
-msgstr "Free/Busy URL"
+#: ../addressbook/libebook/e-contact.c:253
+msgid "ICQ Id List"
+msgstr "ICQ ID List"
-#: ../addressbook/libebook/e-contact.c:235
-msgid "ICS Calendar"
-msgstr "ICS Calendar"
+#: ../addressbook/libebook/e-contact.c:255
+msgid "Wants HTML Mail"
+msgstr "Wants HTML Mail"
-#. Misc fields
-#: ../addressbook/libebook/e-contact.c:238
-msgid "Spouse's Name"
-msgstr "Spouse's Name"
+#: ../addressbook/libebook/e-contact.c:257
+msgid "List"
+msgstr "List"
-#: ../addressbook/libebook/e-contact.c:239
-msgid "Note"
-msgstr "Note"
+#: ../addressbook/libebook/e-contact.c:258
+msgid "List Show Addresses"
+msgstr "List Show Addresses"
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:260
msgid "Birth Date"
msgstr "Birth Date"
-#. Add default categories only if gconf doesn't contain any category list
-#. Make sure we have all categories
-#: ../addressbook/libebook/e-contact.c:242
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:460
-#: ../libedataserver/e-categories.c:240
+#: ../addressbook/libebook/e-contact.c:261
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
+#: ../libedataserver/e-categories.c:41
msgid "Anniversary"
msgstr "Anniversary"
-#: ../addressbook/libebook/e-contact.c:244
-msgid "List"
-msgstr "List"
+#. Security fields
+#: ../addressbook/libebook/e-contact.c:264
+msgid "X.509 Certificate"
+msgstr "X.509 Certificate"
-#: ../addressbook/libebook/e-contact.c:245
-msgid "List Show Addresses"
-msgstr "List Show Addresses"
+#: ../addressbook/libebook/e-contact.c:266
+msgid "Gadu-Gadu Home Id 1"
+msgstr "Gadu-Gadu Home ID 1"
-#. Last modified time
-#: ../addressbook/libebook/e-contact.c:248
-msgid "Last Revision"
-msgstr "Last Revision"
+#: ../addressbook/libebook/e-contact.c:267
+msgid "Gadu-Gadu Home Id 2"
+msgstr "Gadu-Gadu Home ID 2"
-#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:250
-msgid "Book URI"
-msgstr "Book URI"
+#: ../addressbook/libebook/e-contact.c:268
+msgid "Gadu-Gadu Home Id 3"
+msgstr "Gadu-Gadu Home ID 3"
+
+#: ../addressbook/libebook/e-contact.c:269
+msgid "Gadu-Gadu Work Id 1"
+msgstr "Gadu-Gadu Work ID 1"
+
+#: ../addressbook/libebook/e-contact.c:270
+msgid "Gadu-Gadu Work Id 2"
+msgstr "Gadu-Gadu Work ID 2"
+
+#: ../addressbook/libebook/e-contact.c:271
+msgid "Gadu-Gadu Work Id 3"
+msgstr "Gadu-Gadu Work ID 3"
-#: ../addressbook/libebook/e-contact.c:1238
-#: ../addressbook/libebook/e-destination.c:771
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Id List"
+msgstr "Gadu-Gadu ID List"
+
+#. Geo information
+#: ../addressbook/libebook/e-contact.c:275
+msgid "Geographic Information"
+msgstr "Geographic Information"
+
+#: ../addressbook/libebook/e-contact.c:1492
+#: ../addressbook/libebook/e-destination.c:770
msgid "Unnamed List"
msgstr "Unnamed List"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:462
-#: ../libedataserver/e-categories.c:241
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:465
+#: ../libedataserver/e-categories.c:42
msgid "Birthday"
msgstr "Birthday"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:488
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:491
#, c-format
msgid "Birthday: %s"
msgstr "Birthday: %s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:512
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:515
#, c-format
msgid "Anniversary: %s"
msgstr "Anniversary: %s"
-#: ../calendar/backends/file/e-cal-backend-file.c:203
-msgid "Can't save calendar data: Malformed URI."
-msgstr "Can't save calendar data: Malformed URI."
+#: ../calendar/backends/file/e-cal-backend-file.c:202
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "Cannot save calendar data: Malformed URI."
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:871
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1462
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:981
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1760
msgid "Reply Requested: by "
msgstr "Reply Requested: by "
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:876
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1467
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:986
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1765
msgid "Reply Requested: When convenient"
msgstr "Reply Requested: When convenient"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:191
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:266
#, c-format
msgid "Loading %s items"
msgstr "Loading %s items"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:715
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:257
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:786
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
msgid "Calendar"
msgstr "Calendar"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:771
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:843
msgid "Invalid server URI"
msgstr "Invalid server URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:787
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:796
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:881
-#: ../calendar/libecal/e-cal.c:5131
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:897
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:917
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:945
-#: ../camel/providers/groupwise/camel-groupwise-store.c:515
-#: ../camel/providers/groupwise/camel-groupwise-store.c:530
-#: ../camel/providers/groupwise/camel-groupwise-store.c:572
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1059
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:178
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:862
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:871
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:971
+#: ../calendar/libecal/e-cal.c:5001
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1046
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1078
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1116
+#: ../camel/providers/groupwise/camel-groupwise-store.c:586
+#: ../camel/providers/groupwise/camel-groupwise-store.c:601
+#: ../camel/providers/groupwise/camel-groupwise-store.c:712
+#: ../camel/providers/groupwise/camel-groupwise-store.c:754
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1248
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:186
msgid "Authentication failed"
msgstr "Authentication failed"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:837
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:913
msgid "Could not create thread for getting deltas"
msgstr "Could not create thread for getting deltas"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:862
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1109
-#: ../calendar/backends/http/e-cal-backend-http.c:520
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:953
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1227
+#: ../calendar/backends/http/e-cal-backend-http.c:597
#: ../calendar/backends/weather/e-cal-backend-weather.c:452
msgid "Could not create cache file"
msgstr "Could not create cache file"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:875
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:965
msgid "Could not create thread for populating cache"
msgstr "Could not create thread for populating cache"
-#: ../calendar/backends/http/e-cal-backend-http.c:259
+#: ../calendar/backends/http/e-cal-backend-http.c:271
msgid "Redirected to Invalid URI"
msgstr "Redirected to Invalid URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:283
+#: ../calendar/backends/http/e-cal-backend-http.c:295
msgid "Bad file format."
msgstr "Bad file format."
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:301
msgid "Not a calendar."
msgstr "Not a calendar."
msgid "Could not retrieve weather data"
msgstr "Could not retrieve weather data"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:200
+#: ../calendar/backends/weather/e-cal-backend-weather.c:202
msgid "Fair"
msgstr "Fair"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:201
+#: ../calendar/backends/weather/e-cal-backend-weather.c:203
msgid "Snow showers"
msgstr "Snow showers"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:202
+#: ../calendar/backends/weather/e-cal-backend-weather.c:204
msgid "Snow"
msgstr "Snow"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:203
+#: ../calendar/backends/weather/e-cal-backend-weather.c:205
msgid "Partly cloudy"
msgstr "Partly cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:204
+#: ../calendar/backends/weather/e-cal-backend-weather.c:206
msgid "Smoke"
msgstr "Smoke"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:205
+#: ../calendar/backends/weather/e-cal-backend-weather.c:207
msgid "Thunderstorms"
msgstr "Thunderstorms"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:206
+#: ../calendar/backends/weather/e-cal-backend-weather.c:208
msgid "Cloudy"
msgstr "Cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:207
+#: ../calendar/backends/weather/e-cal-backend-weather.c:209
msgid "Drizzle"
msgstr "Drizzle"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:208
+#: ../calendar/backends/weather/e-cal-backend-weather.c:210
msgid "Sunny"
msgstr "Sunny"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:209
+#: ../calendar/backends/weather/e-cal-backend-weather.c:211
msgid "Dust"
msgstr "Dust"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:210
+#: ../calendar/backends/weather/e-cal-backend-weather.c:212
msgid "Clear"
msgstr "Clear"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:211
+#: ../calendar/backends/weather/e-cal-backend-weather.c:213
msgid "Mostly cloudy"
msgstr "Mostly cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:212
+#: ../calendar/backends/weather/e-cal-backend-weather.c:214
msgid "Windy"
msgstr "Windy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:213
+#: ../calendar/backends/weather/e-cal-backend-weather.c:215
msgid "Rain showers"
msgstr "Rain showers"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:214
+#: ../calendar/backends/weather/e-cal-backend-weather.c:216
msgid "Foggy"
msgstr "Foggy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:215
+#: ../calendar/backends/weather/e-cal-backend-weather.c:217
msgid "Rain/snow mixed"
msgstr "Rain/snow mixed"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:216
+#: ../calendar/backends/weather/e-cal-backend-weather.c:218
msgid "Sleet"
msgstr "Sleet"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:217
+#: ../calendar/backends/weather/e-cal-backend-weather.c:219
msgid "Very hot/humid"
msgstr "Very hot/humid"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:218
+#: ../calendar/backends/weather/e-cal-backend-weather.c:220
msgid "Blizzard"
msgstr "Blizzard"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:219
+#: ../calendar/backends/weather/e-cal-backend-weather.c:221
msgid "Freezing rain"
msgstr "Freezing rain"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:220
+#: ../calendar/backends/weather/e-cal-backend-weather.c:222
msgid "Haze"
msgstr "Haze"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:221
+#: ../calendar/backends/weather/e-cal-backend-weather.c:223
msgid "Blowing snow"
msgstr "Blowing snow"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:222
+#: ../calendar/backends/weather/e-cal-backend-weather.c:224
msgid "Freezing drizzle"
msgstr "Freezing drizzle"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:223
+#: ../calendar/backends/weather/e-cal-backend-weather.c:225
msgid "Very cold/wind chill"
msgstr "Very cold/wind chill"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:224
+#: ../calendar/backends/weather/e-cal-backend-weather.c:226
msgid "Rain"
msgstr "Rain"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:234
-#: ../calendar/backends/weather/e-cal-backend-weather.c:242
+#: ../calendar/backends/weather/e-cal-backend-weather.c:236
#: ../calendar/backends/weather/e-cal-backend-weather.c:244
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
msgid "Weather: Sunny"
msgstr "Weather: Sunny"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:235
-#: ../calendar/backends/weather/e-cal-backend-weather.c:236
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:237
+#: ../calendar/backends/weather/e-cal-backend-weather.c:238
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
msgid "Weather: Snow"
msgstr "Weather: Snow"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:237
+#: ../calendar/backends/weather/e-cal-backend-weather.c:239
msgid "Weather: Partly Cloudy"
msgstr "Weather: Partly Cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:238
-#: ../calendar/backends/weather/e-cal-backend-weather.c:243
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:240
+#: ../calendar/backends/weather/e-cal-backend-weather.c:245
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
msgid "Weather: Fog"
msgstr "Weather: Foggy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:239
+#: ../calendar/backends/weather/e-cal-backend-weather.c:241
msgid "Weather: Thunderstorms"
msgstr "Weather: Thunderstorms"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:240
-#: ../calendar/backends/weather/e-cal-backend-weather.c:245
+#: ../calendar/backends/weather/e-cal-backend-weather.c:242
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
msgid "Weather: Cloudy"
msgstr "Weather: Cloudy"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:241
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:243
#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
msgid "Weather: Rain"
msgstr "Weather: Rain"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:333
+#: ../calendar/backends/weather/e-cal-backend-weather.c:335
#, c-format
msgid "%.1f°C - %s"
msgstr "%.1f°C - %s"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:335
+#: ../calendar/backends/weather/e-cal-backend-weather.c:337
#, c-format
msgid "%.1f°F - %s"
msgstr "%.1f°F - %s"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:338
+#: ../calendar/backends/weather/e-cal-backend-weather.c:340
#, c-format
msgid "%.1f/%.1f°C - %s"
msgstr "%.1f/%.1f°C - %s"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:340
+#: ../calendar/backends/weather/e-cal-backend-weather.c:342
#, c-format
msgid "%.1f/%.1f°F - %s"
msgstr "%.1f/%.1f°F - %s"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:346
+#: ../calendar/backends/weather/e-cal-backend-weather.c:348
#, c-format
msgid "%d%% chance of precipitation\n"
msgstr "%d%% chance of precipitation\n"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:353
+#: ../calendar/backends/weather/e-cal-backend-weather.c:355
#, c-format
msgid "%.1fcm snow\n"
msgstr "%.1fcm snow\n"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:355
+#: ../calendar/backends/weather/e-cal-backend-weather.c:357
#, c-format
msgid "%.1fin snow\n"
msgstr "%.1fin snow\n"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:358
+#: ../calendar/backends/weather/e-cal-backend-weather.c:360
#, c-format
msgid "%.1f-%.1fcm snow\n"
msgstr "%.1f-%.1fcm snow\n"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:360
+#: ../calendar/backends/weather/e-cal-backend-weather.c:362
#, c-format
msgid "%.1f-%.1fin snow\n"
msgstr "%.1f-%.1fin snow\n"
msgid "Untitled appointment"
msgstr "Untitled appointment"
-#: ../calendar/libecal/e-cal-recur.c:4026
+#: ../calendar/libecal/e-cal-recur.c:4038
msgid "1st"
msgstr "1st"
-#: ../calendar/libecal/e-cal-recur.c:4027
+#: ../calendar/libecal/e-cal-recur.c:4039
msgid "2nd"
msgstr "2nd"
-#: ../calendar/libecal/e-cal-recur.c:4028
+#: ../calendar/libecal/e-cal-recur.c:4040
msgid "3rd"
msgstr "3rd"
-#: ../calendar/libecal/e-cal-recur.c:4029
+#: ../calendar/libecal/e-cal-recur.c:4041
msgid "4th"
msgstr "4th"
-#: ../calendar/libecal/e-cal-recur.c:4030
+#: ../calendar/libecal/e-cal-recur.c:4042
msgid "5th"
msgstr "5th"
-#: ../calendar/libecal/e-cal-recur.c:4031
+#: ../calendar/libecal/e-cal-recur.c:4043
msgid "6th"
msgstr "6th"
-#: ../calendar/libecal/e-cal-recur.c:4032
+#: ../calendar/libecal/e-cal-recur.c:4044
msgid "7th"
msgstr "7th"
-#: ../calendar/libecal/e-cal-recur.c:4033
+#: ../calendar/libecal/e-cal-recur.c:4045
msgid "8th"
msgstr "8th"
-#: ../calendar/libecal/e-cal-recur.c:4034
+#: ../calendar/libecal/e-cal-recur.c:4046
msgid "9th"
msgstr "9th"
-#: ../calendar/libecal/e-cal-recur.c:4035
+#: ../calendar/libecal/e-cal-recur.c:4047
msgid "10th"
msgstr "10th"
-#: ../calendar/libecal/e-cal-recur.c:4036
+#: ../calendar/libecal/e-cal-recur.c:4048
msgid "11th"
msgstr "11th"
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4049
msgid "12th"
msgstr "12th"
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4050
msgid "13th"
msgstr "13th"
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4051
msgid "14th"
msgstr "14th"
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4052
msgid "15th"
msgstr "15th"
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4053
msgid "16th"
msgstr "16th"
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4054
msgid "17th"
msgstr "17th"
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4055
msgid "18th"
msgstr "18th"
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4056
msgid "19th"
msgstr "19th"
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4057
msgid "20th"
msgstr "20th"
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4058
msgid "21st"
msgstr "21st"
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4059
msgid "22nd"
msgstr "22nd"
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4060
msgid "23rd"
msgstr "23rd"
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4061
msgid "24th"
msgstr "24th"
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4062
msgid "25th"
msgstr "25th"
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4063
msgid "26th"
msgstr "26th"
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4064
msgid "27th"
msgstr "27th"
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4065
msgid "28th"
msgstr "28th"
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4066
msgid "29th"
msgstr "29th"
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4067
msgid "30th"
msgstr "30th"
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4068
msgid "31st"
msgstr "31st"
-#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:709
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:710
msgid "High"
msgstr "High"
-#: ../calendar/libecal/e-cal-util.c:683 ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712
msgid "Normal"
msgstr "Normal"
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714
msgid "Low"
msgstr "Low"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:707
+#: ../calendar/libecal/e-cal-util.c:708
msgid "Undefined"
msgstr "Undefined"
-#. FIXME: Try to get the parent uri so that we dont have to ask the password again
-#: ../calendar/libecal/e-cal.c:1705
-#, 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:1708 ../libedataserverui/e-book-auth-util.c:192
+#: ../calendar/libecal/e-cal.c:1658 ../libedataserverui/e-book-auth-util.c:198
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Enter password for %s (user %s)"
-#: ../calendar/libecal/e-cal.c:5103
+#.
+#. 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:1672
+#, 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:4973
msgid "Invalid argument"
msgstr "Invalid argument"
-#: ../calendar/libecal/e-cal.c:5105
+#: ../calendar/libecal/e-cal.c:4975
msgid "Backend is busy"
msgstr "Backend is busy"
-#: ../calendar/libecal/e-cal.c:5107
+#: ../calendar/libecal/e-cal.c:4977
msgid "Repository is offline"
msgstr "Repository is offline"
-#: ../calendar/libecal/e-cal.c:5109
+#: ../calendar/libecal/e-cal.c:4979
msgid "No such calendar"
msgstr "No such calendar"
-#: ../calendar/libecal/e-cal.c:5111 ../servers/groupwise/e-gw-connection.c:172
+#: ../calendar/libecal/e-cal.c:4981 ../servers/groupwise/e-gw-connection.c:176
msgid "Object not found"
msgstr "Object not found"
-#: ../calendar/libecal/e-cal.c:5113 ../servers/groupwise/e-gw-connection.c:166
+#: ../calendar/libecal/e-cal.c:4983 ../servers/groupwise/e-gw-connection.c:170
msgid "Invalid object"
msgstr "Invalid object"
-#: ../calendar/libecal/e-cal.c:5115
+#: ../calendar/libecal/e-cal.c:4985
msgid "URI not loaded"
msgstr "URI not loaded"
-#: ../calendar/libecal/e-cal.c:5117
+#: ../calendar/libecal/e-cal.c:4987
msgid "URI already loaded"
msgstr "URI already loaded"
-#: ../calendar/libecal/e-cal.c:5119
-#: ../servers/exchange/storage/e-storage.c:572
+#: ../calendar/libecal/e-cal.c:4989
+#: ../servers/exchange/storage/e-storage.c:571
msgid "Permission denied"
msgstr "Permission denied"
-#: ../calendar/libecal/e-cal.c:5121 ../servers/groupwise/e-gw-connection.c:174
+#: ../calendar/libecal/e-cal.c:4991 ../servers/groupwise/e-gw-connection.c:178
msgid "Unknown User"
msgstr "Unknown User"
-#: ../calendar/libecal/e-cal.c:5123
+#: ../calendar/libecal/e-cal.c:4993
msgid "Object ID already exists"
msgstr "Object ID already exists"
-#: ../calendar/libecal/e-cal.c:5125
+#: ../calendar/libecal/e-cal.c:4995
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: ../calendar/libecal/e-cal.c:5127
-msgid "Operation has been cancelled"
-msgstr "Operation has been canceled"
+#: ../calendar/libecal/e-cal.c:4997
+msgid "Operation has been canceled"
+msgstr "Operation has been cancelled"
-#: ../calendar/libecal/e-cal.c:5129
+#: ../calendar/libecal/e-cal.c:4999
msgid "Could not cancel operation"
msgstr "Could not cancel operation"
-#: ../calendar/libecal/e-cal.c:5133
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../calendar/libecal/e-cal.c:5003
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
msgid "Authentication required"
msgstr "Authentication required"
-#: ../calendar/libecal/e-cal.c:5135
+#: ../calendar/libecal/e-cal.c:5005
msgid "A CORBA exception has occurred"
msgstr "A CORBA exception has occurred"
-#: ../calendar/libecal/e-cal.c:5137
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:217
-#: ../camel/providers/imap/camel-imap-command.c:311
-#: ../camel/providers/imap/camel-imap-command.c:411
-#: ../camel/providers/imap4/camel-imap4-store.c:383
-#: ../camel/providers/pop3/camel-pop3-store.c:533
-#: ../camel/providers/pop3/camel-pop3-store.c:540
-#: ../camel/providers/pop3/camel-pop3-store.c:546
-#: ../servers/exchange/storage/e-storage.c:586
-#: ../servers/groupwise/e-gw-connection.c:180
+#: ../calendar/libecal/e-cal.c:5007
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:225
+#: ../camel/providers/imap/camel-imap-command.c:312
+#: ../camel/providers/imap/camel-imap-command.c:412
+#: ../camel/providers/imap/camel-imap-store.c:760
+#: ../camel/providers/imap4/camel-imap4-store.c:313
+#: ../camel/providers/pop3/camel-pop3-store.c:549
+#: ../camel/providers/pop3/camel-pop3-store.c:556
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../servers/exchange/storage/e-storage.c:585
+#: ../servers/groupwise/e-gw-connection.c:184
msgid "Unknown error"
msgstr "Unknown error"
-#: ../calendar/libecal/e-cal.c:5139
-#: ../servers/exchange/storage/e-storage.c:554
+#: ../calendar/libecal/e-cal.c:5009
+#: ../servers/exchange/storage/e-storage.c:553
msgid "No error"
msgstr "No error"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:65
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:576
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:769
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:796
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:801
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:994
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
#, c-format
msgid "\"%s\" expects no arguments"
msgstr "\"%s\" expects no arguments"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:98
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:208
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:250
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:286
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:834
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1059
#, c-format
msgid "\"%s\" expects one argument"
msgstr "\"%s\" expects one argument"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:104
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:111
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:520
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
#, c-format
msgid "\"%s\" expects the first argument to be a string"
msgstr "\"%s\" expects the first argument to be a string"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
#, c-format
msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
msgstr "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:158
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:359
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:514
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:608
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
#, c-format
msgid "\"%s\" expects two arguments"
msgstr "\"%s\" expects two arguments"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:164
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:214
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:365
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:614
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:840
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1065
#, c-format
msgid "\"%s\" expects the first argument to be a time_t"
msgstr "\"%s\" expects the first argument to be a time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:172
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
#, c-format
msgid "\"%s\" expects the second argument to be an integer"
msgstr "\"%s\" expects the second argument to be an integer"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:373
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:622
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:847
#, c-format
msgid "\"%s\" expects the second argument to be a time_t"
msgstr "\"%s\" expects the second argument to be a time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:528
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
#, c-format
msgid "\"%s\" expects the second argument to be a string"
msgstr "\"%s\" expects the second argument to be a string"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:548
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
#, c-format
msgid ""
"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\""
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
msgstr ""
"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\""
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:671
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:896
#, c-format
msgid "\"%s\" expects at least one argument"
msgstr "\"%s\" expects at least one argument"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:685
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:910
#, c-format
msgid ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
msgid "You may not export keys with this cipher"
msgstr "You may not export keys with this cipher"
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:137
msgid "Unable to create cache path"
msgstr "Unable to create cache path"
-#: ../camel/camel-data-cache.c:383
+#: ../camel/camel-data-cache.c:384
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not remove cache entry: %s: %s"
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:198
#, c-format
msgid ""
"Could not write log entry: %s\n"
"Further operations on this server will not be replayed when you\n"
"reconnect to the network."
-#: ../camel/camel-disco-diary.c:260
+#: ../camel/camel-disco-diary.c:261
#, c-format
msgid ""
"Could not open `%s':\n"
"%s\n"
"Changes made to this folder will not be resynchronized."
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:297
msgid "Resynchronizing with server"
msgstr "Resynchronizing with server"
-#: ../camel/camel-disco-folder.c:42 ../camel/camel-offline-folder.c:50
+#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
msgid "Copy folder content locally for offline operation"
msgstr "Copy folder content locally for offline operation"
-#: ../camel/camel-disco-folder.c:104 ../camel/camel-offline-folder.c:109
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
msgid "Downloading new messages for offline mode"
msgstr "Downloading new messages for offline mode"
-#: ../camel/camel-disco-folder.c:467
+#: ../camel/camel-disco-folder.c:468
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Preparing folder '%s' for offline"
-#: ../camel/camel-disco-store.c:401
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1250
-#: ../camel/providers/imap/camel-imap-store.c:2964
+#: ../camel/camel-disco-store.c:403
+#: ../camel/providers/imap/camel-imap-store.c:2997
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
-#: ../camel/camel-exception.c:308
+#: ../camel/camel-exception.c:304
msgid "No description available"
msgstr "No description available"
-#: ../camel/camel-filter-driver.c:749
+#: ../camel/camel-filter-driver.c:752
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "Failed to create child process '%s': %s"
-#: ../camel/camel-filter-driver.c:791
+#: ../camel/camel-filter-driver.c:794
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Invalid message stream received from %s: %s"
-#: ../camel/camel-filter-driver.c:978 ../camel/camel-filter-driver.c:987
+#: ../camel/camel-filter-driver.c:983 ../camel/camel-filter-driver.c:992
msgid "Syncing folders"
msgstr "Syncing folders"
-#: ../camel/camel-filter-driver.c:1076 ../camel/camel-filter-driver.c:1454
+#: ../camel/camel-filter-driver.c:1081 ../camel/camel-filter-driver.c:1460
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Error parsing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1085 ../camel/camel-filter-driver.c:1463
+#: ../camel/camel-filter-driver.c:1090 ../camel/camel-filter-driver.c:1469
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Error executing filter: %s: %s"
-#: ../camel/camel-filter-driver.c:1152
+#: ../camel/camel-filter-driver.c:1158
msgid "Unable to open spool folder"
msgstr "Unable to open spool folder"
-#: ../camel/camel-filter-driver.c:1161
+#: ../camel/camel-filter-driver.c:1167
msgid "Unable to process spool folder"
msgstr "Unable to process spool folder"
-#: ../camel/camel-filter-driver.c:1176
+#: ../camel/camel-filter-driver.c:1182
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Getting message %d (%d%%)"
-#: ../camel/camel-filter-driver.c:1180
+#: ../camel/camel-filter-driver.c:1186
msgid "Cannot open message"
msgstr "Cannot open message"
-#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1193
+#: ../camel/camel-filter-driver.c:1187 ../camel/camel-filter-driver.c:1199
#, c-format
msgid "Failed on message %d"
msgstr "Failed on message %d"
-#: ../camel/camel-filter-driver.c:1207 ../camel/camel-filter-driver.c:1298
+#: ../camel/camel-filter-driver.c:1213 ../camel/camel-filter-driver.c:1304
msgid "Syncing folder"
msgstr "Syncing folder"
-#: ../camel/camel-filter-driver.c:1211 ../camel/camel-filter-driver.c:1303
+#: ../camel/camel-filter-driver.c:1217 ../camel/camel-filter-driver.c:1309
msgid "Complete"
msgstr "Complete"
-#: ../camel/camel-filter-driver.c:1268
+#: ../camel/camel-filter-driver.c:1274
#, c-format
msgid "Getting message %d of %d"
msgstr "Getting message %d of %d"
-#: ../camel/camel-filter-driver.c:1283
+#: ../camel/camel-filter-driver.c:1289
#, c-format
msgid "Failed at message %d of %d"
msgstr "Failed at message %d of %d"
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:138
msgid "Failed to retrieve message"
msgstr "Failed to retrieve message"
-#: ../camel/camel-filter-search.c:397
+#: ../camel/camel-filter-search.c:399
msgid "Invalid arguments to (system-flag)"
msgstr "Invalid arguments to (system-flag)"
-#: ../camel/camel-filter-search.c:412
+#: ../camel/camel-filter-search.c:414
msgid "Invalid arguments to (user-tag)"
msgstr "Invalid arguments to (user-tag)"
-#: ../camel/camel-filter-search.c:577
+#: ../camel/camel-filter-search.c:579
#, c-format
msgid "Failed to create create child process '%s': %s"
msgstr "Failed to create create child process '%s': %s"
#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:699 ../camel/camel-filter-search.c:707
+#: ../camel/camel-filter-search.c:703 ../camel/camel-filter-search.c:711
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Error executing filter search: %s: %s"
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:478
+#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
"Cannot parse search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:367 ../camel/camel-folder-search.c:488
+#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490
#, c-format
msgid ""
"Error executing search expression: %s:\n"
"Error executing search expression: %s:\n"
"%s"
-#: ../camel/camel-folder-search.c:674 ../camel/camel-folder-search.c:707
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) requires a single bool result"
+#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712
+#, c-format
+msgid "(%s) requires a single bool result"
+msgstr "(%s) requires a single bool result"
-#: ../camel/camel-folder-search.c:757
-msgid "(match-threads) not allowed inside match-all"
-msgstr "(match-threads) not allowed inside match-all"
+#: ../camel/camel-folder-search.c:765
+#, c-format
+msgid "(%s) not allowed inside match-all"
+msgstr "(%s) not allowed inside match-all"
-#: ../camel/camel-folder-search.c:760 ../camel/camel-folder-search.c:764
-msgid "(match-threads) requires a match type string"
-msgstr "(match-threads) requires a match type string"
+#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778
+#, c-format
+msgid "(%s) requires a match type string"
+msgstr "(%s) requires a match type string"
-#: ../camel/camel-folder-search.c:786
-msgid "(match-threads) expects an array result"
-msgstr "(match-threads) expects an array result"
+#: ../camel/camel-folder-search.c:805
+#, c-format
+msgid "(%s) expects an array result"
+msgstr "(%s) expects an array result"
-#: ../camel/camel-folder-search.c:792
-msgid "(match-threads) requires the folder set"
-msgstr "(match-threads) requires the folder set"
+#: ../camel/camel-folder-search.c:814
+#, c-format
+msgid "(%s) requires the folder set"
+msgstr "(%s) requires the folder set"
-#: ../camel/camel-folder-search.c:881
+#: ../camel/camel-folder-search.c:909
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "Performing query on unknown header: %s"
-#: ../camel/camel-folder.c:615
+#: ../camel/camel-folder.c:619
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "Unsupported operation: append message: for %s"
-#: ../camel/camel-folder.c:1237
+#: ../camel/camel-folder.c:1241
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "Unsupported operation: search by expression: for %s"
-#: ../camel/camel-folder.c:1278
+#: ../camel/camel-folder.c:1282
#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Unsupported operation: search by uids: for %s"
+msgid "Unsupported operation: search by UIDs: for %s"
+msgstr "Unsupported operation: search by UIDs: for %s"
-#: ../camel/camel-folder.c:1394
+#: ../camel/camel-folder.c:1398
msgid "Moving messages"
msgstr "Moving messages"
-#: ../camel/camel-folder.c:1394
+#: ../camel/camel-folder.c:1398
msgid "Copying messages"
msgstr "Copying messages"
-#: ../camel/camel-folder.c:1648
+#: ../camel/camel-folder.c:1652
msgid "Learning junk"
msgstr "Learning junk"
-#: ../camel/camel-folder.c:1665
+#: ../camel/camel-folder.c:1669
msgid "Learning non-junk"
msgstr "Learning non-junk"
-#: ../camel/camel-folder.c:1684
+#: ../camel/camel-folder.c:1688
msgid "Filtering new message(s)"
msgstr "Filtering new message(s)"
-#: ../camel/camel-gpg-context.c:753
+#: ../camel/camel-gpg-context.c:754
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:767
+#: ../camel/camel-gpg-context.c:769
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: ../camel/camel-gpg-context.c:791
+#: ../camel/camel-gpg-context.c:793 ../camel/camel-gpg-context.c:807
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:826
+#, c-format
+msgid ""
+"You need a PIN to unlock the key for your\n"
+"SmartCard: \"%s\""
+msgstr ""
+"You need a PIN to unlock the key for your\n"
+"SmartCard: \"%s\""
+
+#: ../camel/camel-gpg-context.c:829
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:1026
-#: ../camel/providers/nntp/camel-nntp-store.c:1272
-msgid "Cancelled."
+#: ../camel/camel-gpg-context.c:834
+#, c-format
+msgid "Unexpected request from GnuPG for `%s'"
+msgstr "Unexpected request from GnuPG for `%s'"
+
+#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:1064
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
+msgid "Canceled."
msgstr "Cancelled."
-#: ../camel/camel-gpg-context.c:840
+#: ../camel/camel-gpg-context.c:873
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:846
+#: ../camel/camel-gpg-context.c:881
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: ../camel/camel-gpg-context.c:898
+#: ../camel/camel-gpg-context.c:934
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:1164 ../camel/camel-gpg-context.c:1292
-#: ../camel/camel-gpg-context.c:1776 ../camel/camel-gpg-context.c:1821
+#: ../camel/camel-gpg-context.c:1202 ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-gpg-context.c:1822 ../camel/camel-gpg-context.c:1867
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
-#: ../camel/camel-gpg-context.c:1260 ../camel/camel-smime-context.c:387
+#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:392
#, c-format
msgid "Could not generate signing data: %s"
msgstr "Could not generate signing data: %s"
-#: ../camel/camel-gpg-context.c:1307 ../camel/camel-gpg-context.c:1496
-#: ../camel/camel-gpg-context.c:1579 ../camel/camel-gpg-context.c:1594
-#: ../camel/camel-gpg-context.c:1698 ../camel/camel-gpg-context.c:1713
-#: ../camel/camel-gpg-context.c:1792 ../camel/camel-gpg-context.c:1837
+#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1529
+#: ../camel/camel-gpg-context.c:1612 ../camel/camel-gpg-context.c:1627
+#: ../camel/camel-gpg-context.c:1744 ../camel/camel-gpg-context.c:1759
+#: ../camel/camel-gpg-context.c:1838 ../camel/camel-gpg-context.c:1883
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
-#: ../camel/camel-gpg-context.c:1326
+#: ../camel/camel-gpg-context.c:1364
msgid "This is a digitally signed message part"
msgstr "This is a digitally signed message part"
-#: ../camel/camel-gpg-context.c:1414 ../camel/camel-gpg-context.c:1420
-#: ../camel/camel-gpg-context.c:1426 ../camel/camel-gpg-context.c:1443
-#: ../camel/camel-smime-context.c:690 ../camel/camel-smime-context.c:701
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-gpg-context.c:1449 ../camel/camel-gpg-context.c:1455
+#: ../camel/camel-gpg-context.c:1461 ../camel/camel-gpg-context.c:1477
+#: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:713
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1481
+#: ../camel/camel-gpg-context.c:1514
#, 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:1562
+#: ../camel/camel-gpg-context.c:1595
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Could not generate encrypting data: %s"
-#: ../camel/camel-gpg-context.c:1612
+#: ../camel/camel-gpg-context.c:1645
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: ../camel/camel-gpg-context.c:1669
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Failed to decrypt MIME part: protocol error"
-
-#: ../camel/camel-gpg-context.c:1680
+#: ../camel/camel-gpg-context.c:1698 ../camel/camel-gpg-context.c:1706
+#: ../camel/camel-gpg-context.c:1726
msgid "Cannot decrypt message: Incorrect message format"
msgstr "Cannot decrypt message: Incorrect message format"
-#: ../camel/camel-gpg-context.c:1734 ../camel/camel-smime-context.c:964
+#: ../camel/camel-gpg-context.c:1715
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr "Failed to decrypt MIME part: protocol error"
+
+#: ../camel/camel-gpg-context.c:1780 ../camel/camel-smime-context.c:969
msgid "Encrypted content"
msgstr "Encrypted content"
-#: ../camel/camel-gpg-context.c:1753
+#: ../camel/camel-gpg-context.c:1799
msgid "Unable to parse message content"
msgstr "Unable to parse message content"
-#: ../camel/camel-gpg-context.c:1777 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-tcp-stream-openssl.c:631
-#: ../camel/providers/imap4/camel-imap4-engine.c:1550
-#: ../camel/providers/imap4/camel-imap4-engine.c:1589
-#: ../camel/providers/imap4/camel-imap4-engine.c:1634
-#: ../camel/providers/imap4/camel-imap4-engine.c:1690
-#: ../camel/providers/imap4/camel-imap4-store.c:886
-#: ../camel/providers/imap4/camel-imap4-store.c:1559
-#: ../camel/providers/imap4/camel-imap4-utils.c:575
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/camel-gpg-context.c:1823 ../camel/camel-gpg-context.c:1868
+#: ../camel/camel-tcp-stream-openssl.c:633
+#: ../camel/providers/imap4/camel-imap4-engine.c:1548
+#: ../camel/providers/imap4/camel-imap4-engine.c:1587
+#: ../camel/providers/imap4/camel-imap4-engine.c:1632
+#: ../camel/providers/imap4/camel-imap4-engine.c:1688
+#: ../camel/providers/imap4/camel-imap4-store.c:813
+#: ../camel/providers/imap4/camel-imap4-store.c:1488
+#: ../camel/providers/imap4/camel-imap4-utils.c:557
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:219
msgid "Unknown"
msgstr "Unknown"
-#: ../camel/camel-lock-client.c:100
+#: ../camel/camel-lock-client.c:104
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr "Cannot build locking helper pipe: %s"
-#: ../camel/camel-lock-client.c:113
+#: ../camel/camel-lock-client.c:126
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr "Cannot fork locking helper: %s"
-#: ../camel/camel-lock-client.c:191 ../camel/camel-lock-client.c:214
+#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
#, 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:204
+#: ../camel/camel-lock-client.c:217
#, c-format
msgid "Could not lock '%s'"
msgstr "Could not lock '%s'"
-#: ../camel/camel-lock.c:95 ../camel/camel-lock.c:116
+#: ../camel/camel-lock.c:103
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "Could not create lock file for %s: %s"
-#: ../camel/camel-lock.c:157
+#: ../camel/camel-lock.c:144
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr "Timed out trying to get lock file on %s. Try again later."
-#: ../camel/camel-lock.c:212
+#: ../camel/camel-lock.c:199
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "Failed to get lock using fcntl(2): %s"
-#: ../camel/camel-lock.c:275
+#: ../camel/camel-lock.c:262
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "Failed to get lock using flock(2): %s"
-#: ../camel/camel-movemail.c:104
+#: ../camel/camel-movemail.c:106
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "Could not check mail file %s: %s"
-#: ../camel/camel-movemail.c:117
+#: ../camel/camel-movemail.c:119
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "Could not open mail file %s: %s"
-#: ../camel/camel-movemail.c:125
+#: ../camel/camel-movemail.c:127
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "Could not open temporary mail file %s: %s"
-#: ../camel/camel-movemail.c:154
+#: ../camel/camel-movemail.c:156
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "Failed to store mail in temp file %s: %s"
-#: ../camel/camel-movemail.c:184
+#: ../camel/camel-movemail.c:186
#, c-format
msgid "Could not create pipe: %s"
msgstr "Could not create pipe: %s"
-#: ../camel/camel-movemail.c:196
+#: ../camel/camel-movemail.c:198
#, c-format
msgid "Could not fork: %s"
msgstr "Could not fork: %s"
-#: ../camel/camel-movemail.c:234
+#: ../camel/camel-movemail.c:236
#, c-format
msgid "Movemail program failed: %s"
msgstr "Movemail program failed: %s"
-#: ../camel/camel-movemail.c:235
+#: ../camel/camel-movemail.c:237
msgid "(Unknown error)"
msgstr "(Unknown error)"
-#: ../camel/camel-movemail.c:258
+#: ../camel/camel-movemail.c:260
#, c-format
msgid "Error reading mail file: %s"
msgstr "Error reading mail file: %s"
-#: ../camel/camel-movemail.c:269
+#: ../camel/camel-movemail.c:271
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "Error writing mail temp file: %s"
-#: ../camel/camel-movemail.c:462 ../camel/camel-movemail.c:529
+#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "Error copying mail temp file: %s"
-#: ../camel/camel-multipart-signed.c:596
+#: ../camel/camel-multipart-signed.c:595
msgid "parse error"
msgstr "parse error"
-#: ../camel/camel-net-utils.c:495 ../camel/camel-net-utils.c:657
-#: ../camel/camel-net-utils.c:788
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:527
-msgid "Cancelled"
+#: ../camel/camel-net-utils.c:498 ../camel/camel-net-utils.c:660
+#: ../camel/camel-net-utils.c:791
+#: ../camel/providers/pop3/camel-pop3-store.c:447
+#: ../camel/providers/pop3/camel-pop3-store.c:543
+msgid "Canceled"
msgstr "Cancelled"
-#: ../camel/camel-net-utils.c:514
+#: ../camel/camel-net-utils.c:517
msgid "cannot create thread"
msgstr "cannot create thread"
-#: ../camel/camel-net-utils.c:661
+#: ../camel/camel-net-utils.c:664
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: ../camel/camel-net-utils.c:683
+#: ../camel/camel-net-utils.c:686
msgid "Host lookup failed"
msgstr "Host lookup failed"
-#: ../camel/camel-net-utils.c:685
+#: ../camel/camel-net-utils.c:688
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "Host lookup failed: %s: %s"
-#: ../camel/camel-net-utils.c:792
+#: ../camel/camel-net-utils.c:795
msgid "Resolving address"
msgstr "Resolving address"
-#: ../camel/camel-net-utils.c:812
+#: ../camel/camel-net-utils.c:815
msgid "Name lookup failed"
msgstr "Name lookup failed"
-#: ../camel/camel-net-utils.c:815
+#: ../camel/camel-net-utils.c:818
#, c-format
msgid "Name lookup failed: %s"
msgstr "Name lookup failed: %s"
-#: ../camel/camel-offline-folder.c:252
+#: ../camel/camel-offline-folder.c:254
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "Syncing messages in folder '%s' to disk"
-#: ../camel/camel-offline-journal.c:163 ../camel/camel-offline-journal.c:186
+#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
#, c-format
msgid "Cannot write offline journal for folder `%s': %s"
msgstr "Cannot write offline journal for folder `%s': %s"
msgid "For reading mail as a query of another set of folders"
msgstr "For reading mail as a query of another set of folders"
-#: ../camel/camel-provider.c:188
+#: ../camel/camel-provider.c:187
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "Could not load %s: Module loading not supported on this system."
-#: ../camel/camel-provider.c:197
+#: ../camel/camel-provider.c:196
#, c-format
msgid "Could not load %s: %s"
msgstr "Could not load %s: %s"
-#: ../camel/camel-provider.c:205
+#: ../camel/camel-provider.c:204
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "Could not load %s: No initialization code in module."
-#: ../camel/camel-provider.c:377 ../camel/camel-session.c:166
+#: ../camel/camel-provider.c:376 ../camel/camel-session.c:173
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "No provider available for protocol `%s'"
-#: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/camel-sasl-anonymous.c:37
msgid "Anonymous"
msgstr "Anonymous"
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:39
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:122 ../camel/camel-sasl-plain.c:89
+#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
msgid "Authentication failed."
msgstr "Authentication failed."
-#: ../camel/camel-sasl-anonymous.c:131
+#: ../camel/camel-sasl-anonymous.c:133
#, c-format
msgid ""
"Invalid email address trace information:\n"
"Invalid email address trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:143
+#: ../camel/camel-sasl-anonymous.c:145
#, c-format
msgid ""
"Invalid opaque trace information:\n"
"Invalid opaque trace information:\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:155
+#: ../camel/camel-sasl-anonymous.c:157
#, c-format
msgid ""
"Invalid trace information:\n"
"Invalid trace information:\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:40
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:42
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:50
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:52
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
-#: ../camel/camel-sasl-digest-md5.c:818
+#: ../camel/camel-sasl-digest-md5.c:820
msgid "Server challenge too long (>2048 octets)"
msgstr "Server challenge too long (>2048 octets)"
-#: ../camel/camel-sasl-digest-md5.c:827
+#: ../camel/camel-sasl-digest-md5.c:829
msgid "Server challenge invalid\n"
msgstr "Server challenge invalid\n"
-#: ../camel/camel-sasl-digest-md5.c:833
+#: ../camel/camel-sasl-digest-md5.c:835
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "Server challenge contained invalid \"Quality of Protection\" token"
-#: ../camel/camel-sasl-digest-md5.c:863
+#: ../camel/camel-sasl-digest-md5.c:865
msgid "Server response did not contain authorization data"
msgstr "Server response did not contain authorization data"
-#: ../camel/camel-sasl-digest-md5.c:881
+#: ../camel/camel-sasl-digest-md5.c:883
msgid "Server response contained incomplete authorization data"
msgstr "Server response contained incomplete authorization data"
-#: ../camel/camel-sasl-digest-md5.c:891
+#: ../camel/camel-sasl-digest-md5.c:893
msgid "Server response does not match"
msgstr "Server response does not match"
-#: ../camel/camel-sasl-gssapi.c:57
+#: ../camel/camel-sasl-gssapi.c:65
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:59
+#: ../camel/camel-sasl-gssapi.c:67
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:157
+#: ../camel/camel-sasl-gssapi.c:165
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
-#: ../camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:170
msgid "The provided target_name parameter was ill-formed."
msgstr "The provided target_name parameter was ill-formed."
-#: ../camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:173
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:177
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
-#: ../camel/camel-sasl-gssapi.c:174
+#: ../camel/camel-sasl-gssapi.c:182
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
-#: ../camel/camel-sasl-gssapi.c:178
+#: ../camel/camel-sasl-gssapi.c:186
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
-#: ../camel/camel-sasl-gssapi.c:183
+#: ../camel/camel-sasl-gssapi.c:191
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:186
+#: ../camel/camel-sasl-gssapi.c:194
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:189
+#: ../camel/camel-sasl-gssapi.c:197
msgid "The consistency checks performed on the credential failed."
msgstr "The consistency checks performed on the credential failed."
-#: ../camel/camel-sasl-gssapi.c:192
+#: ../camel/camel-sasl-gssapi.c:200
msgid "The referenced credentials have expired."
msgstr "The referenced credentials have expired."
-#: ../camel/camel-sasl-gssapi.c:198 ../camel/camel-sasl-gssapi.c:246
-#: ../camel/camel-sasl-gssapi.c:282 ../camel/camel-sasl-gssapi.c:297
-#: ../camel/camel-sasl-kerberos4.c:229
-#: ../camel/providers/imap/camel-imap-store.c:1285
+#: ../camel/camel-sasl-gssapi.c:206 ../camel/camel-sasl-gssapi.c:254
+#: ../camel/camel-sasl-gssapi.c:290 ../camel/camel-sasl-gssapi.c:305
+#: ../camel/camel-sasl-kerberos4.c:231
+#: ../camel/providers/imap/camel-imap-store.c:1306
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
-#: ../camel/camel-sasl-gssapi.c:307
+#: ../camel/camel-sasl-gssapi.c:315
msgid "Unsupported security layer."
msgstr "Unsupported security layer."
-#: ../camel/camel-sasl-kerberos4.c:45
+#: ../camel/camel-sasl-kerberos4.c:47
msgid "Kerberos 4"
msgstr "Kerberos 4"
-#: ../camel/camel-sasl-kerberos4.c:47
+#: ../camel/camel-sasl-kerberos4.c:49
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:172
+#: ../camel/camel-sasl-kerberos4.c:174
#, c-format
msgid ""
"Could not get Kerberos ticket:\n"
"Could not get Kerberos ticket:\n"
"%s"
-#: ../camel/camel-sasl-login.c:34
+#: ../camel/camel-sasl-login.c:36
msgid "Login"
msgstr "Login"
-#: ../camel/camel-sasl-login.c:36 ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
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:133
+#: ../camel/camel-sasl-login.c:135
msgid "Unknown authentication state."
msgstr "Unknown authentication state."
-#: ../camel/camel-sasl-ntlm.c:32
+#: ../camel/camel-sasl-ntlm.c:34
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:36
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
-#: ../camel/camel-sasl-plain.c:34
+#: ../camel/camel-sasl-plain.c:36
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:37
+#: ../camel/camel-sasl-popb4smtp.c:39
msgid "POP before SMTP"
msgstr "POP before SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:41
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "This option will authorise a POP connection before attempting SMTP"
-#: ../camel/camel-sasl-popb4smtp.c:104
+#: ../camel/camel-sasl-popb4smtp.c:106
msgid "POP Source URI"
msgstr "POP Source URI"
-#: ../camel/camel-sasl-popb4smtp.c:107
+#: ../camel/camel-sasl-popb4smtp.c:109
msgid "POP Before SMTP auth using an unknown transport"
msgstr "POP Before SMTP auth using an unknown transport"
-#: ../camel/camel-sasl-popb4smtp.c:112
+#: ../camel/camel-sasl-popb4smtp.c:114
msgid "POP Before SMTP auth using a non-pop source"
msgstr "POP Before SMTP auth using a non-pop source"
-#: ../camel/camel-search-private.c:152
+#: ../camel/camel-search-private.c:150
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "Regular expression compilation failed: %s: %s"
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:272
#, 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:276
#, 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:280
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' needs a path component"
-#: ../camel/camel-session.c:292
+#: ../camel/camel-session.c:299
#, c-format
msgid ""
"Could not create directory %s:\n"
"Could not create directory %s:\n"
"%s"
-#: ../camel/camel-smime-context.c:229
+#: ../camel/camel-smime-context.c:234
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "Cannot find certificate for '%s'"
-#: ../camel/camel-smime-context.c:235
+#: ../camel/camel-smime-context.c:240
msgid "Cannot create CMS message"
msgstr "Cannot create CMS message"
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:245
msgid "Cannot create CMS signed data"
msgstr "Cannot create CMS signed data"
-#: ../camel/camel-smime-context.c:246
+#: ../camel/camel-smime-context.c:251
msgid "Cannot attach CMS signed data"
msgstr "Cannot attach CMS signed data"
-#: ../camel/camel-smime-context.c:253
+#: ../camel/camel-smime-context.c:258
msgid "Cannot attach CMS data"
msgstr "Cannot attach CMS data"
-#: ../camel/camel-smime-context.c:259
+#: ../camel/camel-smime-context.c:264
msgid "Cannot create CMS Signer information"
msgstr "Cannot create CMS Signer information"
-#: ../camel/camel-smime-context.c:265
+#: ../camel/camel-smime-context.c:270
msgid "Cannot find certificate chain"
msgstr "Cannot find certificate chain"
-#: ../camel/camel-smime-context.c:271
+#: ../camel/camel-smime-context.c:276
msgid "Cannot add CMS Signing time"
msgstr "Cannot add CMS Signing time"
-#: ../camel/camel-smime-context.c:293 ../camel/camel-smime-context.c:305
+#: ../camel/camel-smime-context.c:298 ../camel/camel-smime-context.c:310
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "Encryption certificate for '%s' does not exist"
-#: ../camel/camel-smime-context.c:312
+#: ../camel/camel-smime-context.c:317
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "Cannot add SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:322
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:327
msgid "Cannot add encryption certificate"
msgstr "Cannot add encryption certificate"
-#: ../camel/camel-smime-context.c:328
+#: ../camel/camel-smime-context.c:333
msgid "Cannot add CMS Signer information"
msgstr "Cannot add CMS Signer information"
-#: ../camel/camel-smime-context.c:398 ../camel/camel-smime-context.c:846
+#: ../camel/camel-smime-context.c:403 ../camel/camel-smime-context.c:851
msgid "Cannot create encoder context"
msgstr "Cannot create encoder context"
-#: ../camel/camel-smime-context.c:404
+#: ../camel/camel-smime-context.c:409
msgid "Failed to add data to CMS encoder"
msgstr "Failed to add data to CMS encoder"
-#: ../camel/camel-smime-context.c:409 ../camel/camel-smime-context.c:863
+#: ../camel/camel-smime-context.c:414 ../camel/camel-smime-context.c:868
msgid "Failed to encode data"
msgstr "Failed to encode data"
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:487
msgid "Unverified"
msgstr "Unverified"
-#: ../camel/camel-smime-context.c:484
+#: ../camel/camel-smime-context.c:489
msgid "Good signature"
msgstr "Good signature"
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:491
msgid "Bad signature"
msgstr "Bad signature"
-#: ../camel/camel-smime-context.c:488
+#: ../camel/camel-smime-context.c:493
msgid "Content tampered with or altered in transit"
msgstr "Content tampered with or altered in transit"
-#: ../camel/camel-smime-context.c:490
+#: ../camel/camel-smime-context.c:495
msgid "Signing certificate not found"
msgstr "Signing certificate not found"
-#: ../camel/camel-smime-context.c:492
+#: ../camel/camel-smime-context.c:497
msgid "Signing certificate not trusted"
msgstr "Signing certificate not trusted"
-#: ../camel/camel-smime-context.c:494
+#: ../camel/camel-smime-context.c:499
msgid "Signature algorithm unknown"
msgstr "Signature algorithm unknown"
-#: ../camel/camel-smime-context.c:496
+#: ../camel/camel-smime-context.c:501
msgid "Signature algorithm unsupported"
msgstr "Siganture algorithm unsupported"
-#: ../camel/camel-smime-context.c:498
+#: ../camel/camel-smime-context.c:503
msgid "Malformed signature"
msgstr "Malformed signature"
-#: ../camel/camel-smime-context.c:500
+#: ../camel/camel-smime-context.c:505
msgid "Processing error"
msgstr "Processing error"
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:542
msgid "No signed data in signature"
msgstr "No signed data in signature"
-#: ../camel/camel-smime-context.c:544
+#: ../camel/camel-smime-context.c:549
msgid "Digests missing from enveloped data"
msgstr "Digests missing from enveloped data"
-#: ../camel/camel-smime-context.c:557 ../camel/camel-smime-context.c:567
+#: ../camel/camel-smime-context.c:562 ../camel/camel-smime-context.c:572
msgid "Cannot calculate digests"
msgstr "Cannot calculate digests"
-#: ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:577
msgid "Cannot set message digests"
msgstr "Cannot set message digests"
-#: ../camel/camel-smime-context.c:582 ../camel/camel-smime-context.c:587
+#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:592
msgid "Certificate import failed"
msgstr "Certificate import failed"
-#: ../camel/camel-smime-context.c:597
+#: ../camel/camel-smime-context.c:602
+#, 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:600
+#: ../camel/camel-smime-context.c:605
+#, 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:604
+#: ../camel/camel-smime-context.c:609
msgid "Cannot find signature digests"
msgstr "Cannot find signature digests"
-#: ../camel/camel-smime-context.c:620
+#: ../camel/camel-smime-context.c:625
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "Signer: %s <%s>: %s\n"
-#: ../camel/camel-smime-context.c:721
+#: ../camel/camel-smime-context.c:726
msgid "Decoder failed"
msgstr "Decoder failed"
-#: ../camel/camel-smime-context.c:773
+#: ../camel/camel-smime-context.c:778
#, c-format
msgid "Cannot find certificate for `%s'"
msgstr "Cannot find certificate for `%s'"
-#: ../camel/camel-smime-context.c:780
+#: ../camel/camel-smime-context.c:785
msgid "Cannot find common bulk encryption algorithm"
msgstr "Cannot find common bulk encryption algorithm"
#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:789
+#: ../camel/camel-smime-context.c:794
msgid "Cannot allocate slot for encryption bulk key"
msgstr "Cannot allocate slot for encryption bulk key"
-#: ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:805
msgid "Cannot create CMS Message"
msgstr "Cannot create CMS Message"
-#: ../camel/camel-smime-context.c:806
+#: ../camel/camel-smime-context.c:811
msgid "Cannot create CMS Enveloped data"
msgstr "Cannot create CMS Enveloped data"
-#: ../camel/camel-smime-context.c:812
+#: ../camel/camel-smime-context.c:817
msgid "Cannot attach CMS Enveloped data"
msgstr "Cannot attach CMS Enveloped data"
-#: ../camel/camel-smime-context.c:818
+#: ../camel/camel-smime-context.c:823
msgid "Cannot attach CMS data object"
msgstr "Cannot attach CMS data object"
-#: ../camel/camel-smime-context.c:827
+#: ../camel/camel-smime-context.c:832
msgid "Cannot create CMS Recipient information"
msgstr "Cannot create CMS Recipient information"
-#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:837
msgid "Cannot add CMS Recipient information"
msgstr "Cannot add CMS Recipient information"
-#: ../camel/camel-smime-context.c:857
+#: ../camel/camel-smime-context.c:862
msgid "Failed to add data to encoder"
msgstr "Failed to add data to encoder"
-#: ../camel/camel-smime-context.c:944
+#: ../camel/camel-smime-context.c:949
#, c-format
msgid "Decoder failed, error %d"
msgstr "Decoder failed, error %d"
-#: ../camel/camel-smime-context.c:951
+#: ../camel/camel-smime-context.c:956
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME Decrypt: No encrypted content found"
-#: ../camel/camel-smime-context.c:978
+#: ../camel/camel-smime-context.c:983
msgid "import keys: unimplemented"
msgstr "import keys: unimplemented"
-#: ../camel/camel-smime-context.c:986
+#: ../camel/camel-smime-context.c:991
msgid "export keys: unimplemented"
msgstr "export keys: unimplemented"
-#: ../camel/camel-store.c:214
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:168
+#: ../camel/camel-store.c:216
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:176
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Cannot get folder: Invalid operation on this store"
-#: ../camel/camel-store.c:246
+#: ../camel/camel-store.c:248
#, c-format
msgid "Cannot create folder `%s': folder exists"
msgstr "Cannot create folder `%s': folder exists"
-#: ../camel/camel-store.c:310
+#: ../camel/camel-store.c:312
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Cannot create folder: Invalid operation on this store"
-#: ../camel/camel-store.c:338
+#: ../camel/camel-store.c:340
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Cannot create folder: %s: folder exists"
-#: ../camel/camel-store.c:402 ../camel/camel-vee-store.c:368
-#: ../camel/providers/local/camel-maildir-store.c:217
+#: ../camel/camel-store.c:404 ../camel/camel-vee-store.c:369
+#: ../camel/providers/local/camel-maildir-store.c:218
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: ../camel/camel-store.c:452 ../camel/camel-vee-store.c:405
-#: ../camel/providers/local/camel-maildir-store.c:289
+#: ../camel/camel-store.c:454 ../camel/camel-vee-store.c:406
+#: ../camel/providers/local/camel-maildir-store.c:290
#, 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:793 ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:795 ../camel/camel-vtrash-folder.c:52
msgid "Trash"
msgstr "Trash"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:796 ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:798 ../camel/camel-vtrash-folder.c:54
msgid "Junk"
msgstr "Junk"
-#: ../camel/camel-tcp-stream-openssl.c:568
+#: ../camel/camel-tcp-stream-openssl.c:570
msgid "Unable to get issuer's certificate"
msgstr "Unable to get issuer's certificate"
-#: ../camel/camel-tcp-stream-openssl.c:570
+#: ../camel/camel-tcp-stream-openssl.c:572
msgid "Unable to get Certificate Revocation List"
msgstr "Unable to get Certificate Revocation List"
-#: ../camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:574
msgid "Unable to decrypt certificate signature"
msgstr "Unable to decrypt certificate signature"
-#: ../camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:576
msgid "Unable to decrypt Certificate Revocation List signature"
msgstr "Unable to decrypt Certificate Revocation List signature"
-#: ../camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:578
msgid "Unable to decode issuer's public key"
msgstr "Unable to decode issuer's public key"
-#: ../camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:580
msgid "Certificate signature failure"
msgstr "Certificate signature failure"
-#: ../camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:582
msgid "Certificate Revocation List signature failure"
msgstr "Certificate Revocation List signature failure"
-#: ../camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:584
msgid "Certificate not yet valid"
msgstr "Certificate not yet valid"
-#: ../camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:586
msgid "Certificate has expired"
msgstr "Certificate has expired"
-#: ../camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:588
msgid "CRL not yet valid"
msgstr "CRL not yet valid"
-#: ../camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:590
msgid "CRL has expired"
msgstr "CRL has expired"
-#: ../camel/camel-tcp-stream-openssl.c:593
+#: ../camel/camel-tcp-stream-openssl.c:595
msgid "Error in CRL"
msgstr "Error in CRL"
-#: ../camel/camel-tcp-stream-openssl.c:595
+#: ../camel/camel-tcp-stream-openssl.c:597
msgid "Out of memory"
msgstr "Out of memory"
-#: ../camel/camel-tcp-stream-openssl.c:597
+#: ../camel/camel-tcp-stream-openssl.c:599
msgid "Zero-depth self-signed certificate"
msgstr "Zero-depth self-signed certificate"
-#: ../camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:601
msgid "Self-signed certificate in chain"
msgstr "Self-signed certificate in chain"
-#: ../camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:603
msgid "Unable to get issuer's certificate locally"
msgstr "Unable to get issuer's certificate locally"
-#: ../camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:605
msgid "Unable to verify leaf signature"
msgstr "Unable to verify leaf signature"
-#: ../camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:607
msgid "Certificate chain too long"
msgstr "Certificate chain too long"
-#: ../camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:609
msgid "Certificate Revoked"
msgstr "Certificate Revoked"
-#: ../camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:611
msgid "Invalid Certificate Authority (CA)"
msgstr "Invalid Certificate Authority (CA)"
-#: ../camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:613
msgid "Path length exceeded"
msgstr "Path length exceeded"
-#: ../camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:615
msgid "Invalid purpose"
msgstr "Invalid purpose"
-#: ../camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:617
msgid "Certificate untrusted"
msgstr "Certificate untrusted"
-#: ../camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:619
msgid "Certificate rejected"
msgstr "Certificate rejected"
-#: ../camel/camel-tcp-stream-openssl.c:620
+#: ../camel/camel-tcp-stream-openssl.c:622
msgid "Subject/Issuer mismatch"
msgstr "Subject/Issuer mismatch"
-#: ../camel/camel-tcp-stream-openssl.c:622
+#: ../camel/camel-tcp-stream-openssl.c:624
msgid "AKID/SKID mismatch"
msgstr "AKID/SKID mismatch"
-#: ../camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:626
msgid "AKID/Issuer serial mismatch"
msgstr "AKID/Issuer serial mismatch"
-#: ../camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:628
msgid "Key usage does not support certificate signing"
msgstr "Key usage does not support certificate signing"
-#: ../camel/camel-tcp-stream-openssl.c:629
+#: ../camel/camel-tcp-stream-openssl.c:631
msgid "Error in application verification"
msgstr "Error in application verification"
-#: ../camel/camel-tcp-stream-openssl.c:696 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:868
#, c-format
msgid ""
"Issuer: %s\n"
"Fingerprint: %s\n"
"Signature: %s"
-#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:892
+#: ../camel/camel-tcp-stream-openssl.c:704 ../camel/camel-tcp-stream-ssl.c:874
msgid "GOOD"
msgstr "GOOD"
-#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:892
+#: ../camel/camel-tcp-stream-openssl.c:704 ../camel/camel-tcp-stream-ssl.c:874
msgid "BAD"
msgstr "BAD"
-#: ../camel/camel-tcp-stream-openssl.c:704
+#: ../camel/camel-tcp-stream-openssl.c:706
#, c-format
msgid ""
"Bad certificate from %s:\n"
"Do you wish to accept anyway?"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:896
+#: ../camel/camel-tcp-stream-ssl.c:878
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
"\n"
"Do you wish to accept?"
-#: ../camel/camel-tcp-stream-ssl.c:940
+#: ../camel/camel-tcp-stream-ssl.c:922
#, c-format
msgid ""
"Certificate problem: %s\n"
"Certificate problem: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:992
+#: ../camel/camel-tcp-stream-ssl.c:974
#, c-format
msgid ""
"Bad certificate domain: %s\n"
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1010
+#: ../camel/camel-tcp-stream-ssl.c:992
#, c-format
msgid ""
"Certificate expired: %s\n"
"Certificate expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-tcp-stream-ssl.c:1027
+#: ../camel/camel-tcp-stream-ssl.c:1009
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
"Certificate revocation list expired: %s\n"
"Issuer: %s"
-#: ../camel/camel-url.c:293
+#: ../camel/camel-url.c:310
#, c-format
msgid "Could not parse URL `%s'"
msgstr "Could not parse URL `%s'"
-#: ../camel/camel-vee-folder.c:475
+#: ../camel/camel-vee-folder.c:480
#, c-format
msgid "Error storing `%s': %s"
msgstr "Error storing `%s': %s"
-#: ../camel/camel-vee-folder.c:517
+#: ../camel/camel-vee-folder.c:522
#, c-format
msgid "No such message %s in %s"
msgstr "No such message %s in %s"
-#: ../camel/camel-vee-folder.c:642 ../camel/camel-vee-folder.c:648
+#: ../camel/camel-vee-folder.c:647 ../camel/camel-vee-folder.c:653
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:101 ../camel/camel-vee-store.c:344
+#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345
msgid "Unmatched"
msgstr "Unmatched"
-#: ../camel/camel-vee-store.c:391
+#: ../camel/camel-vee-store.c:392
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Cannot delete folder: %s: No such folder"
-#: ../camel/camel-vee-store.c:413
+#: ../camel/camel-vee-store.c:414
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Cannot rename folder: %s: No such folder"
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:53
msgid "Cannot copy messages to the Trash folder"
msgstr "Cannot copy messages to the Trash folder"
-#: ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-vtrash-folder.c:55
msgid "Cannot copy messages to the Junk folder"
msgstr "Cannot copy messages to the Junk folder"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
-#: ../camel/providers/imap/camel-imap-folder.c:2063
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:120
+#: ../camel/providers/imap/camel-imap-folder.c:2061
#, c-format
msgid ""
"Cannot get message: %s\n"
"Cannot get message: %s\n"
" %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
-#: ../camel/providers/imap/camel-imap-folder.c:2063
-#: ../camel/providers/local/camel-maildir-folder.c:245
-#: ../camel/providers/local/camel-mbox-folder.c:350
-#: ../camel/providers/local/camel-mh-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:120
+#: ../camel/providers/imap/camel-imap-folder.c:2061
+#: ../camel/providers/local/camel-maildir-folder.c:247
+#: ../camel/providers/local/camel-mbox-folder.c:348
+#: ../camel/providers/local/camel-mh-folder.c:204
msgid "No such message"
msgstr "No such message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
-#: ../camel/providers/imap4/camel-imap4-folder.c:788
-#: ../camel/providers/nntp/camel-nntp-folder.c:155
-#: ../camel/providers/nntp/camel-nntp-folder.c:231
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:132
+#: ../camel/providers/imap4/camel-imap4-folder.c:791
+#: ../camel/providers/nntp/camel-nntp-folder.c:156
+#: ../camel/providers/nntp/camel-nntp-folder.c:232
+#: ../camel/providers/nntp/camel-nntp-folder.c:371
#: ../camel/providers/pop3/camel-pop3-folder.c:263
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:492
-#: ../camel/providers/pop3/camel-pop3-folder.c:510
-msgid "User cancelled"
+#: ../camel/providers/pop3/camel-pop3-folder.c:521
+#: ../camel/providers/pop3/camel-pop3-folder.c:582
+#: ../camel/providers/pop3/camel-pop3-folder.c:600
+msgid "User canceled"
msgstr "User cancelled"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:135
-#: ../camel/providers/imap4/camel-imap4-folder.c:793
-#: ../camel/providers/nntp/camel-nntp-folder.c:146
-#: ../camel/providers/nntp/camel-nntp-folder.c:148
-#: ../camel/providers/nntp/camel-nntp-folder.c:157
-#: ../camel/providers/nntp/camel-nntp-folder.c:233
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:495
-#: ../camel/providers/pop3/camel-pop3-folder.c:502
-#: ../camel/providers/pop3/camel-pop3-folder.c:513
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/imap4/camel-imap4-folder.c:796
+#: ../camel/providers/nntp/camel-nntp-folder.c:147
+#: ../camel/providers/nntp/camel-nntp-folder.c:149
+#: ../camel/providers/nntp/camel-nntp-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/pop3/camel-pop3-folder.c:524
+#: ../camel/providers/pop3/camel-pop3-folder.c:585
+#: ../camel/providers/pop3/camel-pop3-folder.c:592
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
#, c-format
msgid "Cannot get message %s: %s"
msgstr "Cannot get message %s: %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:160
-#: ../camel/providers/imap4/camel-imap4-folder.c:811
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:164
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2117
+#: ../camel/providers/imap4/camel-imap4-folder.c:814
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:171
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:178
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1425
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:175
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:182
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1667
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1713
msgid "Could not get message"
msgstr "Could not get message"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:708
-#: ../camel/providers/imap/camel-imap-folder.c:252
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:813
+#: ../camel/providers/imap/camel-imap-folder.c:253
#, c-format
msgid "Could not load summary for %s"
msgstr "Could not load summary for %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1032
-#: ../camel/providers/groupwise/camel-groupwise-store.c:560
-#: ../camel/providers/imap/camel-imap-folder.c:2375
-#: ../camel/providers/imap/camel-imap-folder.c:2445
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1042
+msgid "Trash Folder Full. Please Empty."
+msgstr "Trash Folder Full. Please Empty."
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1219
+#: ../camel/providers/groupwise/camel-groupwise-store.c:630
+#: ../camel/providers/groupwise/camel-groupwise-store.c:744
+#: ../camel/providers/imap/camel-imap-folder.c:2392
+#: ../camel/providers/imap/camel-imap-folder.c:2462
#, 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:1661
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1707
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1984
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2026
#, 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:1695
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2014
#, c-format
msgid "Cannot create message: %s"
msgstr "Cannot create message: %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:283
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:284
#, c-format
msgid "Cannot get folder container %s"
msgstr "Cannot get folder container %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:347
-#: ../camel/providers/imap4/camel-imap4-journal.c:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:348
+#: ../camel/providers/imap4/camel-imap4-journal.c:319
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:363
-#: ../camel/providers/imap4/camel-imap4-journal.c:336
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:364
+#: ../camel/providers/imap4/camel-imap4-journal.c:335
#, 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:51
-#: ../camel/providers/imap4/camel-imap4-provider.c:36
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../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:53
-msgid "Check for new messages in all folders"
-msgstr "Check for new messages in all folders"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
+#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../camel/providers/imap/camel-imap-provider.c:46
+#: ../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:56
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-#: ../camel/providers/local/camel-local-provider.c:45
-#: ../camel/providers/local/camel-local-provider.c:85
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../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:58
-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:60
-msgid "Check new messages for Junk contents"
-msgstr "Check new messages for Junk contents"
-
#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
-msgid "Only check for Junk messages in the INBOX folder"
-msgstr "Only check for Junk messages in the INBOX folder"
+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
-msgid "Automatically synchronize account locally"
-msgstr "Automatically synchronize account locally"
+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/imap/camel-imap-provider.c:72
+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:69
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+msgid "Automatically synchroni_ze account locally"
+msgstr "Automatically synchroni_ze account locally"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
msgid "SOAP Settings"
msgstr "SOAP Settings"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
msgid "Post Office Agent SOAP Port:"
msgstr "Post Office Agent SOAP Port:"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:85
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
msgid "For accessing Novell GroupWise servers"
msgstr "For accessing Novell GroupWise servers"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:102
-#: ../camel/providers/hula/camel-hula-provider.c:92
-#: ../camel/providers/imap/camel-imap-provider.c:96
-#: ../camel/providers/imap4/camel-imap4-provider.c:88
-#: ../camel/providers/imapp/camel-imapp-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../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
msgid "Password"
msgstr "Password"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
msgid ""
"This option will connect to the GroupWise server using a plaintext password."
msgstr ""
msgid "Host or user not available in url"
msgstr "Host or user not available in URL"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:199
+#: ../camel/providers/groupwise/camel-groupwise-store.c:204
#, c-format
msgid "%sPlease enter the GroupWise password for %s@%s"
msgstr "%sPlease enter the GroupWise password for %s@%s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:213
-#: ../camel/providers/imap/camel-imap-store.c:1364
-msgid "You didn't enter a password."
-msgstr "You didn't enter a password."
+#: ../camel/providers/groupwise/camel-groupwise-store.c:218
+#: ../camel/providers/imap/camel-imap-store.c:1384
+msgid "You did not enter a password."
+msgstr "You did not enter a password."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:227
-msgid "Unable to authenticate to GroupWise server."
-msgstr "Unable to authenticate with GroupWise server."
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#, c-format
+msgid "Unable to authenticate to GroupWise server. "
+msgstr "Unable to authenticate to GroupWise server. "
-#: ../camel/providers/groupwise/camel-groupwise-store.c:295
+#: ../camel/providers/groupwise/camel-groupwise-store.c:308
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:467
-#: ../camel/providers/imap/camel-imap-store.c:1873
-#: ../camel/providers/imap/camel-imap-store.c:2064
+#: ../camel/providers/groupwise/camel-groupwise-store.c:538
+#: ../camel/providers/imap/camel-imap-store.c:1893
+#: ../camel/providers/imap/camel-imap-store.c:2084
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1036
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1225
msgid "Cannot create GroupWise folders in offline mode."
msgstr "Cannot create GroupWise folders in offline mode."
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1050
-#: ../camel/providers/imap/camel-imap-store.c:1948
-#: ../camel/providers/imap/camel-imap-store.c:2317
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1239
+#: ../camel/providers/imap/camel-imap-store.c:1968
+#: ../camel/providers/imap/camel-imap-store.c:2337
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:1127
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1148
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1316
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1337
#, 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:1180
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1369
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise server %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1182
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1371
#, 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:125
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "GroupWise mail delivery via %s"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:161
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:169
msgid "Sending Message"
msgstr "Sending Message"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:215
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
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 "
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
"of your mail.\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:217
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:206
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:225
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
#, c-format
msgid "Could not send message: %s"
msgstr "Could not send message: %s"
-#: ../camel/providers/hula/camel-hula-provider.c:46
-#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../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:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
-msgid "C_heck for new messages in all folders"
-msgstr "C_heck for new messages in all folders"
-
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:50
msgid "Connection to Server"
msgstr "Connection to Server"
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../camel/providers/imap/camel-imap-provider.c:52
msgid "_Use custom command to connect to server"
msgstr "_Use custom command to connect to server"
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/hula/camel-hula-provider.c:58
+#: ../camel/providers/imap/camel-imap-provider.c:54
msgid "Command:"
msgstr "Command:"
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../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:60
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
+#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../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:62
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../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:64
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/hula/camel-hula-provider.c:67
msgid "Namespace"
msgstr "Namespace"
-#: ../camel/providers/hula/camel-hula-provider.c:75
+#: ../camel/providers/hula/camel-hula-provider.c:78
msgid "Hula"
msgstr "Hula"
-#: ../camel/providers/hula/camel-hula-provider.c:77
+#: ../camel/providers/hula/camel-hula-provider.c:80
msgid "For accessing Hula servers"
msgstr "For accessing Hula servers"
-#: ../camel/providers/hula/camel-hula-provider.c:94
+#: ../camel/providers/hula/camel-hula-provider.c:97
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:223
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:224
+#: ../camel/providers/imap/camel-imap-command.c:266
#: ../camel/providers/imap/camel-imap-command.c:472
-#: ../camel/providers/imap/camel-imap-store.c:3004
+#: ../camel/providers/imap/camel-imap-store.c:3037
msgid "Operation cancelled"
msgstr "Operation cancelled"
-#: ../camel/providers/imap/camel-imap-command.c:310
-#: ../camel/providers/imap/camel-imap-store.c:3007
+#: ../camel/providers/imap/camel-imap-command.c:311
+#: ../camel/providers/imap/camel-imap-store.c:3040
#, 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:331
+#: ../camel/providers/imap/camel-imap-command.c:332
#, c-format
msgid ""
"Alert from IMAP server %s@%s:\n"
"Alert from IMAP server %s@%s:\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:400
+#: ../camel/providers/imap/camel-imap-command.c:401
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "Unexpected response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-command.c:410
+#: ../camel/providers/imap/camel-imap-command.c:411
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP command failed: %s"
msgid "Unexpected OK response from IMAP server: %s"
msgstr "Unexpected OK response from IMAP server: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:233
+#: ../camel/providers/imap/camel-imap-folder.c:234
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Could not create directory %s: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:337
+#: ../camel/providers/imap/camel-imap-folder.c:336
msgid "Folder was destroyed and recreated on server."
msgstr "Folder was destroyed and recreated on server."
#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:634
+#: ../camel/providers/imap/camel-imap-folder.c:632
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "Scanning for changed messages in %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2023
+#: ../camel/providers/imap/camel-imap-folder.c:2021
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "Unable to retrieve message: %s"
-#: ../camel/providers/imap/camel-imap-folder.c:2102
-#: ../camel/providers/imap/camel-imap-folder.c:2717
-#: ../camel/providers/nntp/camel-nntp-folder.c:219
+#: ../camel/providers/imap/camel-imap-folder.c:2100
+#: ../camel/providers/imap/camel-imap-folder.c:2733
+#: ../camel/providers/nntp/camel-nntp-folder.c:220
msgid "This message is not currently available"
msgstr "This message is not currently available"
-#: ../camel/providers/imap/camel-imap-folder.c:2553
+#: ../camel/providers/imap/camel-imap-folder.c:2571
#, 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:2561
+#: ../camel/providers/imap/camel-imap-folder.c:2579
#, 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:2574
+#: ../camel/providers/imap/camel-imap-folder.c:2592
#, c-format
msgid ""
"Unexpected server response: Identical UIDs provided for messages %d and %d"
msgstr ""
"Unexpected server response: Identical UIDs provided for messages %d and %d"
-#: ../camel/providers/imap/camel-imap-folder.c:2755
+#: ../camel/providers/imap/camel-imap-folder.c:2771
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:160
+#: ../camel/providers/imap/camel-imap-message-cache.c:161
#, c-format
msgid "Could not open cache directory: %s"
msgstr "Could not open cache directory: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:266
-#: ../camel/providers/imap/camel-imap-message-cache.c:323
-#: ../camel/providers/imap/camel-imap-message-cache.c:354
-#: ../camel/providers/imap/camel-imap-message-cache.c:386
+#: ../camel/providers/imap/camel-imap-message-cache.c:267
+#: ../camel/providers/imap/camel-imap-message-cache.c:324
+#: ../camel/providers/imap/camel-imap-message-cache.c:355
+#: ../camel/providers/imap/camel-imap-message-cache.c:387
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "Failed to cache message %s: %s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:436
+#: ../camel/providers/imap/camel-imap-message-cache.c:437
#, c-format
msgid "Failed to cache %s: %s"
msgstr "Failed to cache %s: %s"
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "_Apply filters to new messages in INBOX on this server"
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imap4/camel-imap4-provider.c:49
+msgid "Namespace:"
+msgstr "Namespace:"
#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
-msgid "Check new messages for _Junk contents"
-msgstr "Check new messages for _Junk contents"
+#: ../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"
#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:62
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Only check for Junk messa_ges in the INBOX folder"
+msgid "Check new messages for Jun_k contents"
+msgstr "Check new messages for Jun_k contents"
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imap4/camel-imap4-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imap4/camel-imap4-provider.c:59
msgid "Automatically synchroni_ze remote mail locally"
msgstr "Automatically synchroni_ze remote mail locally"
-#: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imap/camel-imap-provider.c:81
msgid "IMAP"
msgstr "IMAP"
-#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:83
msgid "For reading and storing mail on IMAP servers."
msgstr "For reading and storing mail on IMAP servers."
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/imapp/camel-imapp-provider.c:68
+#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/providers/imapp/camel-imapp-provider.c:69
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"This option will connect to the IMAP server using a plaintext password."
-#: ../camel/providers/imap/camel-imap-store.c:447
-#: ../camel/providers/imap4/camel-imap4-store.c:215
+#: ../camel/providers/imap/camel-imap-store.c:455
+#: ../camel/providers/imap4/camel-imap4-store.c:212
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
-#: ../camel/providers/imap/camel-imap-store.c:449
-#: ../camel/providers/imap4/camel-imap4-store.c:217
+#: ../camel/providers/imap/camel-imap-store.c:457
+#: ../camel/providers/imap4/camel-imap4-store.c:214
#, c-format
msgid "IMAP service for %s on %s"
msgstr "IMAP service for %s on %s"
-#: ../camel/providers/imap/camel-imap-store.c:579
-#: ../camel/providers/imap/camel-imap-store.c:594
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:344
-#: ../camel/providers/nntp/camel-nntp-store.c:185
-#: ../camel/providers/nntp/camel-nntp-store.c:200
-#: ../camel/providers/pop3/camel-pop3-store.c:167
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:254
-#: ../camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/imap/camel-imap-store.c:586
+#: ../camel/providers/imap/camel-imap-store.c:601
+#: ../camel/providers/imap4/camel-imap4-store.c:249
+#: ../camel/providers/imap4/camel-imap4-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/nntp/camel-nntp-store.c:198
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/pop3/camel-pop3-store.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+#: ../camel/providers/smtp/camel-smtp-transport.c:273
#, c-format
msgid "Could not connect to %s: %s"
msgstr "Could not connect to %s: %s"
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/nntp/camel-nntp-store.c:186
-#: ../camel/providers/pop3/camel-pop3-store.c:168
-#: ../camel/providers/smtp/camel-smtp-transport.c:255
+#: ../camel/providers/imap/camel-imap-store.c:587
+#: ../camel/providers/imap4/camel-imap4-store.c:250
+#: ../camel/providers/nntp/camel-nntp-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
msgid "SSL unavailable"
msgstr "SSL unavailable"
-#: ../camel/providers/imap/camel-imap-store.c:591
-#: ../camel/providers/imap/camel-imap-store.c:865
-#: ../camel/providers/imap4/camel-imap4-store.c:272
-#: ../camel/providers/imap4/camel-imap4-store.c:341
-#: ../camel/providers/imapp/camel-imapp-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/nntp/camel-nntp-store.c:216
-#: ../camel/providers/pop3/camel-pop3-store.c:179
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#: ../camel/providers/imap/camel-imap-store.c:598
+#: ../camel/providers/imap/camel-imap-store.c:879
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: ../camel/providers/imap/camel-imap-store.c:699
-#: ../camel/providers/imap/camel-imap-store.c:721
-#: ../camel/providers/imap/camel-imap-store.c:727
-#: ../camel/providers/imap4/camel-imap4-store.c:369
-#: ../camel/providers/imap4/camel-imap4-store.c:382
-#: ../camel/providers/imap4/camel-imap4-store.c:398
+#: ../camel/providers/imap/camel-imap-store.c:706
+#: ../camel/providers/imap/camel-imap-store.c:728
+#: ../camel/providers/imap/camel-imap-store.c:734
+#: ../camel/providers/imap/camel-imap-store.c:760
+#: ../camel/providers/imap4/camel-imap4-store.c:312
+#: ../camel/providers/imap4/camel-imap4-store.c:327
+#: ../camel/providers/imap4/camel-imap4-store.c:335
#, 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:700
-#: ../camel/providers/smtp/camel-smtp-transport.c:323
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/smtp/camel-smtp-transport.c:327
msgid "STARTTLS not supported"
msgstr "STARTTLS not supported"
-#: ../camel/providers/imap/camel-imap-store.c:722
-#: ../camel/providers/imap4/camel-imap4-store.c:370
-#: ../camel/providers/pop3/camel-pop3-store.c:244
+#: ../camel/providers/imap/camel-imap-store.c:729
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: ../camel/providers/imap/camel-imap-store.c:728
-#: ../camel/providers/imap4/camel-imap4-store.c:399
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/smtp/camel-smtp-transport.c:362
+#: ../camel/providers/imap/camel-imap-store.c:735
+#: ../camel/providers/imap4/camel-imap4-store.c:336
+#: ../camel/providers/smtp/camel-smtp-transport.c:366
msgid "SSL is not available in this build"
msgstr "SSL is not available in this build"
-#: ../camel/providers/imap/camel-imap-store.c:868
-#: ../camel/providers/imap4/camel-imap4-store.c:275
+#: ../camel/providers/imap/camel-imap-store.c:882
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not connect with command \"%s\": %s"
#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1057
-#: ../camel/providers/imap/camel-imap-store.c:2413
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1392
-#: ../camel/providers/local/camel-maildir-folder.c:75
-#: ../camel/providers/local/camel-maildir-store.c:217
-#: ../camel/providers/local/camel-maildir-store.c:289
-#: ../camel/providers/local/camel-maildir-store.c:511
-#: ../camel/providers/local/camel-maildir-store.c:524
-#: ../camel/providers/local/camel-spool-store.c:461
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../camel/providers/imap/camel-imap-store.c:1066
+#: ../camel/providers/imap/camel-imap-store.c:2433
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:367
+#: ../camel/providers/imap4/camel-imap4-store.c:1319
+#: ../camel/providers/local/camel-maildir-folder.c:77
+#: ../camel/providers/local/camel-maildir-store.c:218
+#: ../camel/providers/local/camel-maildir-store.c:290
+#: ../camel/providers/local/camel-maildir-store.c:512
+#: ../camel/providers/local/camel-maildir-store.c:525
+#: ../camel/providers/local/camel-spool-store.c:464
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
msgid "Inbox"
msgstr "Inbox"
-#: ../camel/providers/imap/camel-imap-store.c:1317
+#: ../camel/providers/imap/camel-imap-store.c:1337
#, 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:1327
-#: ../camel/providers/smtp/camel-smtp-transport.c:498
+#: ../camel/providers/imap/camel-imap-store.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: ../camel/providers/imap/camel-imap-store.c:1350
-#: ../camel/providers/imapp/camel-imapp-store.c:364
+#: ../camel/providers/imap/camel-imap-store.c:1370
+#: ../camel/providers/imapp/camel-imapp-store.c:365
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%sPlease enter the IMAP password for %s@%s"
-#: ../camel/providers/imap/camel-imap-store.c:1393
+#: ../camel/providers/imap/camel-imap-store.c:1413
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1885
-#: ../camel/providers/imap/camel-imap-store.c:2255
-#: ../camel/providers/imap4/camel-imap4-store.c:1022
+#: ../camel/providers/imap/camel-imap-store.c:1905
+#: ../camel/providers/imap/camel-imap-store.c:2275
+#: ../camel/providers/imap4/camel-imap4-store.c:949
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
msgstr ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
-#: ../camel/providers/imap/camel-imap-store.c:2002
-#: ../camel/providers/local/camel-maildir-store.c:190
-#: ../camel/providers/local/camel-mbox-store.c:202
+#: ../camel/providers/imap/camel-imap-store.c:2022
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-mbox-store.c:204
#: ../camel/providers/local/camel-mh-store.c:249
#, c-format
msgid "Cannot create folder `%s': folder exists."
msgstr "Cannot create folder `%s': folder exists."
-#: ../camel/providers/imap/camel-imap-store.c:2266
+#: ../camel/providers/imap/camel-imap-store.c:2286
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "Unexpected response from IMAP4 server %s: %s"
-#: ../camel/providers/imap4/camel-imap4-engine.c:222
+#: ../camel/providers/imap4/camel-imap4-engine.c:221
#, c-format
msgid "Unexpected greeting from IMAP server %s."
msgstr "Unexpected greeting from IMAP server %s."
-#: ../camel/providers/imap4/camel-imap4-engine.c:432
+#: ../camel/providers/imap4/camel-imap4-engine.c:431
#, 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:438
+#: ../camel/providers/imap4/camel-imap4-engine.c:437
#, c-format
msgid "Cannot select folder `%s': Bad command"
msgstr "Cannot select folder `%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-engine.c:1549
-#: ../camel/providers/imap4/camel-imap4-engine.c:1588
-#: ../camel/providers/imap4/camel-imap4-engine.c:1633
-#: ../camel/providers/imap4/camel-imap4-engine.c:1689
+#: ../camel/providers/imap4/camel-imap4-engine.c:1547
+#: ../camel/providers/imap4/camel-imap4-engine.c:1586
+#: ../camel/providers/imap4/camel-imap4-engine.c:1631
+#: ../camel/providers/imap4/camel-imap4-engine.c:1687
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "IMAP4 server %s unexpectedly disconnected: %s"
-#: ../camel/providers/imap4/camel-imap4-folder.c:86
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
msgid ""
"Enable Mailing-List detection required for some filter and vFolder rules"
msgstr ""
"Enable Mailing-List detection, required for some filter and vFolder rules"
-#: ../camel/providers/imap4/camel-imap4-folder.c:399
+#: ../camel/providers/imap4/camel-imap4-folder.c:402
#, c-format
msgid "Cannot access folder `%s': %s"
msgstr "Cannot access folder `%s': %s"
-#: ../camel/providers/imap4/camel-imap4-folder.c:458
+#: ../camel/providers/imap4/camel-imap4-folder.c:461
#, c-format
msgid "Cannot sync flags to folder `%s': Unknown"
msgstr "Cannot sync flags to folder `%s': Unknown"
-#: ../camel/providers/imap4/camel-imap4-folder.c:464
+#: ../camel/providers/imap4/camel-imap4-folder.c:467
#, c-format
msgid "Cannot sync flags to folder `%s': Bad command"
msgstr "Cannot sync flags to folder `%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-folder.c:604
+#: ../camel/providers/imap4/camel-imap4-folder.c:607
#, c-format
msgid "Cannot expunge folder `%s': Unknown"
msgstr "Cannot expunge folder `%s': Unknown"
-#: ../camel/providers/imap4/camel-imap4-folder.c:609
+#: ../camel/providers/imap4/camel-imap4-folder.c:612
#, c-format
msgid "Cannot expunge folder `%s': Bad command"
msgstr "Cannot expunge folder `%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-folder.c:865
+#: ../camel/providers/imap4/camel-imap4-folder.c:868
#, 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:870
+#: ../camel/providers/imap4/camel-imap4-folder.c:873
#, 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:914
+#: ../camel/providers/imap4/camel-imap4-folder.c:917
#, 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:1007
+#: ../camel/providers/imap4/camel-imap4-folder.c:1010
#, 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:1036
+#: ../camel/providers/imap4/camel-imap4-folder.c:1040
#, 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:1156
+#: ../camel/providers/imap4/camel-imap4-folder.c:1160
#, c-format
msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1160
+#: ../camel/providers/imap4/camel-imap4-folder.c:1164
#, c-format
msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1168
+#: ../camel/providers/imap4/camel-imap4-folder.c:1172
#, 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:1172
+#: ../camel/providers/imap4/camel-imap4-folder.c:1176
#, 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:71
+#: ../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: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:66
msgid "IMAP4rev1"
msgstr "IMAP4rev1"
-#: ../camel/providers/imap4/camel-imap4-provider.c:73
+#: ../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:90
+#: ../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:486
+#: ../camel/providers/imap4/camel-imap4-store.c:261
+#: ../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:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:270
+msgid "Connection canceled"
+msgstr "Connection cancelled"
+
+#: ../camel/providers/imap4/camel-imap4-store.c:298
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+
+#: ../camel/providers/imap4/camel-imap4-store.c:328
+#: ../camel/providers/pop3/camel-pop3-store.c:250
+msgid "TLS negotiations failed"
+msgstr "TLS negotiations failed"
+
+#: ../camel/providers/imap4/camel-imap4-store.c:412
#, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
msgstr ""
"Cannot authenticate with IMAP server %s using the %s authentication mechanism"
-#: ../camel/providers/imap4/camel-imap4-store.c:535
+#: ../camel/providers/imap4/camel-imap4-store.c:461
#, c-format
msgid "%sPlease enter the IMAP password for %s on host %s"
msgstr "%sPlease enter the IMAP password for %s on host %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:602
+#: ../camel/providers/imap4/camel-imap4-store.c:528
#, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "Cannot authenticate with IMAP server %s using %s"
-#: ../camel/providers/imap4/camel-imap4-store.c:764
-#: ../camel/providers/imap4/camel-imap4-store.c:1032
+#: ../camel/providers/imap4/camel-imap4-store.c:691
+#: ../camel/providers/imap4/camel-imap4-store.c:959
msgid "Cannot create IMAP folders in offline mode."
msgstr "Cannot create IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:803
+#: ../camel/providers/imap4/camel-imap4-store.c:730
#, c-format
msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
-#: ../camel/providers/imap4/camel-imap4-store.c:884
+#: ../camel/providers/imap4/camel-imap4-store.c:811
#, 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:886
-#: ../camel/providers/imap4/camel-imap4-store.c:1559
+#: ../camel/providers/imap4/camel-imap4-store.c:813
+#: ../camel/providers/imap4/camel-imap4-store.c:1488
msgid "Bad command"
msgstr "Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:965
+#: ../camel/providers/imap4/camel-imap4-store.c:892
#, 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:970
+#: ../camel/providers/imap4/camel-imap4-store.c:897
#, c-format
msgid "Cannot create folder `%s': Bad command"
msgstr "Cannot create folder `%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1076
+#: ../camel/providers/imap4/camel-imap4-store.c:1003
#, c-format
msgid "Cannot delete folder `%s': Special folder"
msgstr "Cannot delete folder `%s': Special folder"
-#: ../camel/providers/imap4/camel-imap4-store.c:1083
+#: ../camel/providers/imap4/camel-imap4-store.c:1010
msgid "Cannot delete IMAP folders in offline mode."
msgstr "Cannot delete IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imap4/camel-imap4-store.c:1069
#, 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:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1074
#, c-format
msgid "Cannot delete folder `%s': Bad command"
msgstr "Cannot delete folder `%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1167
+#: ../camel/providers/imap4/camel-imap4-store.c:1094
#, 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:1174
+#: ../camel/providers/imap4/camel-imap4-store.c:1101
msgid "Cannot rename IMAP folders in offline mode."
msgstr "Cannot rename IMAP folders in offline mode."
-#: ../camel/providers/imap4/camel-imap4-store.c:1205
+#: ../camel/providers/imap4/camel-imap4-store.c:1132
#, 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:1210
+#: ../camel/providers/imap4/camel-imap4-store.c:1137
#, c-format
msgid "Cannot rename folder `%s' to `%s': Bad command"
msgstr "Cannot rename folder `%s' to `%s': Bad command"
-#: ../camel/providers/imap4/camel-imap4-store.c:1557
+#: ../camel/providers/imap4/camel-imap4-store.c:1486
#, 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:1597
+#: ../camel/providers/imap4/camel-imap4-store.c:1526
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:1642
+#: ../camel/providers/imap4/camel-imap4-store.c:1571
#, 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:1647
+#: ../camel/providers/imap4/camel-imap4-store.c:1576
#, 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:1669
+#: ../camel/providers/imap4/camel-imap4-store.c:1598
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:1714
+#: ../camel/providers/imap4/camel-imap4-store.c:1643
#, 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:1719
+#: ../camel/providers/imap4/camel-imap4-store.c:1648
#, 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:1472
+#: ../camel/providers/imap4/camel-imap4-summary.c:1452
msgid "Scanning for changed messages"
msgstr "Scanning for changed messages"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1497
-msgid "Fetching envelopes for new messages"
-msgstr "Fetching envelopes for new messages"
+#: ../camel/providers/imap4/camel-imap4-summary.c:1473
+#, 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:1500
+msgid "Fetching envelopes of new messages"
+msgstr "Fetching envelopes of new messages"
-#: ../camel/providers/imap4/camel-imap4-utils.c:368
+#: ../camel/providers/imap4/camel-imap4-utils.c:370
#, 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:391
+#: ../camel/providers/imap4/camel-imap4-utils.c:393
msgid "No data"
msgstr "No data"
-#: ../camel/providers/imap4/camel-imap4-utils.c:574
+#: ../camel/providers/imap4/camel-imap4-utils.c:556
#, c-format
msgid "IMAP server %s unexpectedly disconnected: %s"
msgstr "IMAP server %s unexpectedly disconnected: %s"
-#: ../camel/providers/imapp/camel-imapp-provider.c:40
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/imapp/camel-imapp-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
msgid "Message storage"
msgstr "Message storage"
-#: ../camel/providers/imapp/camel-imapp-provider.c:48
+#: ../camel/providers/imapp/camel-imapp-provider.c:49
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapp/camel-imapp-provider.c:50
+#: ../camel/providers/imapp/camel-imapp-provider.c:51
msgid ""
"Experimental IMAP 4(.1) client\n"
"This is untested and unsupported code, you want to use plain imap instead.\n"
"\n"
" !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n"
-#: ../camel/providers/imapp/camel-imapp-store.c:251
+#: ../camel/providers/imapp/camel-imapp-store.c:252
#, c-format
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:348
+#: ../camel/providers/imapp/camel-imapp-store.c:349
#, 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:175
msgid "Index message body data"
msgstr "Index message body data"
#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:384
+#: ../camel/providers/local/camel-local-folder.c:383
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:388
-#: ../camel/providers/local/camel-local-folder.c:391
+#: ../camel/providers/local/camel-local-folder.c:387
+#: ../camel/providers/local/camel-local-folder.c:390
#, c-format
msgid "mailbox:%s (%s)"
msgstr "mailbox:%s (%s)"
#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:394
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-provider.c:47
+#: ../camel/providers/local/camel-local-provider.c:48
msgid "Use the `.folders' folder summary file (exmh)"
msgstr "Use the `.folders' folder summary file (exmh)"
-#: ../camel/providers/local/camel-local-provider.c:54
+#: ../camel/providers/local/camel-local-provider.c:55
msgid "MH-format mail directories"
msgstr "MH-format mail directories"
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:56
msgid "For storing local mail in MH-like mail directories."
msgstr "For storing local mail in MH-like mail directories."
-#: ../camel/providers/local/camel-local-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:73
msgid "Local delivery"
msgstr "Local delivery"
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:74
msgid ""
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
-#: ../camel/providers/local/camel-local-provider.c:87
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/local/camel-local-provider.c:88
+#: ../camel/providers/local/camel-local-provider.c:107
msgid "Apply filters to new messages in INBOX"
msgstr "Apply filters to new messages in INBOX"
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:95
msgid "Maildir-format mail directories"
msgstr "Maildir-format mail directories"
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:96
msgid "For storing local mail in maildir directories."
msgstr "For storing local mail in maildir directories."
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:108
msgid "Store status headers in Elm/Pine/Mutt format"
msgstr "Store status headers in Elm/Pine/Mutt format"
-#: ../camel/providers/local/camel-local-provider.c:114
-msgid "Standard Unix mbox spool or directory"
-msgstr "Standard Unix mbox spool or directory"
-
#: ../camel/providers/local/camel-local-provider.c:115
+msgid "Standard Unix mbox spool file"
+msgstr "Standard Unix mbox spool file"
+
+#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:127
msgid ""
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
-#: ../camel/providers/local/camel-local-store.c:156
-#: ../camel/providers/local/camel-local-store.c:267
-#: ../camel/providers/local/camel-mbox-store.c:345
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-provider.c:126
+msgid "Standard Unix mbox spool directory"
+msgstr "Standard Unix mbox spool directory"
+
+#: ../camel/providers/local/camel-local-store.c:157
+#: ../camel/providers/local/camel-local-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:359
+#: ../camel/providers/local/camel-spool-store.c:129
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "Store root %s is not an absolute path"
-#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:164
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "Store root %s is not a regular directory"
-#: ../camel/providers/local/camel-local-store.c:172
-#: ../camel/providers/local/camel-local-store.c:180
-#: ../camel/providers/local/camel-local-store.c:278
+#: ../camel/providers/local/camel-local-store.c:173
+#: ../camel/providers/local/camel-local-store.c:181
+#: ../camel/providers/local/camel-local-store.c:279
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Cannot get folder: %s: %s"
-#: ../camel/providers/local/camel-local-store.c:192
+#: ../camel/providers/local/camel-local-store.c:193
msgid "Local stores do not have an inbox"
msgstr "Local stores do not have an inbox"
-#: ../camel/providers/local/camel-local-store.c:238
+#: ../camel/providers/local/camel-local-store.c:239
#, c-format
msgid "Local mail file %s"
msgstr "Local mail file %s"
-#: ../camel/providers/local/camel-local-store.c:356
+#: ../camel/providers/local/camel-local-store.c:357
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "Could not rename folder %s to %s: %s"
-#: ../camel/providers/local/camel-local-store.c:421
+#: ../camel/providers/local/camel-local-store.c:425
#, c-format
msgid "Could not rename '%s': %s"
msgstr "Could not rename '%s': %s"
-#: ../camel/providers/local/camel-local-store.c:446
-#: ../camel/providers/local/camel-mbox-store.c:274
+#: ../camel/providers/local/camel-local-store.c:450
+#: ../camel/providers/local/camel-local-store.c:460
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:288
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "Could not delete folder summary file `%s': %s"
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-local-store.c:470
+#: ../camel/providers/local/camel-mbox-store.c:300
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr "Could not delete folder index file `%s': %s"
-#: ../camel/providers/local/camel-local-store.c:479
-#: ../camel/providers/local/camel-mbox-store.c:310
+#: ../camel/providers/local/camel-local-store.c:493
+#: ../camel/providers/local/camel-mbox-store.c:324
#, c-format
msgid "Could not delete folder meta file `%s': %s"
msgstr "Could not delete folder meta file `%s': %s"
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:215
-msgid "Maildir append message cancelled"
+#: ../camel/providers/local/camel-maildir-folder.c:217
+msgid "Maildir append message canceled"
msgstr "Maildir append message cancelled"
-#: ../camel/providers/local/camel-maildir-folder.c:218
+#: ../camel/providers/local/camel-maildir-folder.c:220
#, 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:244
-#: ../camel/providers/local/camel-maildir-folder.c:258
-#: ../camel/providers/local/camel-maildir-folder.c:267
-#: ../camel/providers/local/camel-mbox-folder.c:349
-#: ../camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mbox-folder.c:407
-#: ../camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:260
+#: ../camel/providers/local/camel-maildir-folder.c:269
+#: ../camel/providers/local/camel-mbox-folder.c:347
+#: ../camel/providers/local/camel-mbox-folder.c:366
+#: ../camel/providers/local/camel-mbox-folder.c:397
+#: ../camel/providers/local/camel-mbox-folder.c:405
+#: ../camel/providers/local/camel-mh-folder.c:203
+#: ../camel/providers/local/camel-mh-folder.c:214
+#: ../camel/providers/local/camel-mh-folder.c:223
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
"Cannot get message: %s from folder %s\n"
" %s"
-#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:270
msgid "Invalid message contents"
msgstr "Invalid message contents"
-#: ../camel/providers/local/camel-maildir-store.c:146
-#: ../camel/providers/local/camel-maildir-store.c:171
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:147
+#: ../camel/providers/local/camel-maildir-store.c:172
+#: ../camel/providers/local/camel-mbox-store.c:176
+#: ../camel/providers/local/camel-mbox-store.c:188
#, c-format
msgid "Cannot create folder `%s': %s"
msgstr "Cannot create folder `%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:159
-#: ../camel/providers/local/camel-mbox-store.c:145
+#: ../camel/providers/local/camel-maildir-store.c:160
+#: ../camel/providers/local/camel-mbox-store.c:147
#: ../camel/providers/local/camel-mh-store.c:217
#, c-format
msgid "Cannot get folder `%s': %s"
msgstr "Cannot get folder `%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:163
-#: ../camel/providers/local/camel-mbox-store.c:153
+#: ../camel/providers/local/camel-maildir-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:155
#: ../camel/providers/local/camel-mh-store.c:224
#, c-format
msgid "Cannot get folder `%s': folder does not exist."
msgstr "Cannot get folder `%s': folder does not exist."
-#: ../camel/providers/local/camel-maildir-store.c:187
+#: ../camel/providers/local/camel-maildir-store.c:188
#, c-format
msgid "Cannot get folder `%s': not a maildir directory."
msgstr "Cannot get folder `%s': not a maildir directory."
-#: ../camel/providers/local/camel-maildir-store.c:232
-#: ../camel/providers/local/camel-maildir-store.c:270
+#: ../camel/providers/local/camel-maildir-store.c:233
+#: ../camel/providers/local/camel-maildir-store.c:271
#: ../camel/providers/local/camel-mh-store.c:273
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "Could not delete folder `%s': %s"
-#: ../camel/providers/local/camel-maildir-store.c:234
+#: ../camel/providers/local/camel-maildir-store.c:235
msgid "not a maildir directory"
msgstr "not a maildir directory"
-#: ../camel/providers/local/camel-maildir-store.c:436
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:437
+#: ../camel/providers/local/camel-spool-store.c:331
+#: ../camel/providers/local/camel-spool-store.c:345
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr "Could not scan folder `%s': %s"
msgstr "Checking for new messages"
#: ../camel/providers/local/camel-maildir-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:415
-#: ../camel/providers/local/camel-mbox-summary.c:588
-#: ../camel/providers/local/camel-mbox-summary.c:683
-#: ../camel/providers/local/camel-spool-summary.c:139
+#: ../camel/providers/local/camel-mbox-summary.c:433
+#: ../camel/providers/local/camel-mbox-summary.c:606
+#: ../camel/providers/local/camel-mbox-summary.c:701
+#: ../camel/providers/local/camel-spool-summary.c:140
msgid "Storing folder"
msgstr "Storing folder"
-#: ../camel/providers/local/camel-mbox-folder.c:155
-#: ../camel/providers/local/camel-spool-folder.c:148
+#: ../camel/providers/local/camel-mbox-folder.c:156
+#: ../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:216
+#: ../camel/providers/local/camel-mbox-folder.c:217
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "Cannot open mailbox: %s: %s\n"
-#: ../camel/providers/local/camel-mbox-folder.c:276
-msgid "Mail append cancelled"
+#: ../camel/providers/local/camel-mbox-folder.c:278
+msgid "Mail append canceled"
msgstr "Mail append cancelled"
-#: ../camel/providers/local/camel-mbox-folder.c:279
+#: ../camel/providers/local/camel-mbox-folder.c:281
#, 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:400
+#: ../camel/providers/local/camel-mbox-folder.c:398
msgid "The folder appears to be irrecoverably corrupted."
msgstr "The folder appears to be irrecoverably corrupted."
-#: ../camel/providers/local/camel-mbox-folder.c:408
-#: ../camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-mbox-folder.c:406
+#: ../camel/providers/local/camel-mh-folder.c:224
msgid "Message construction failed."
msgstr "Message construction failed."
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mbox-store.c:166
+#: ../camel/providers/local/camel-mbox-store.c:365
msgid "Cannot create a folder by this name."
msgstr "Cannot create a folder by this name."
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:198
#, c-format
msgid "Cannot get folder `%s': not a regular file."
msgstr "Cannot get folder `%s': not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:228
+#: ../camel/providers/local/camel-mbox-store.c:239
+#: ../camel/providers/local/camel-mbox-store.c:262
#, c-format
msgid ""
"Could not delete folder `%s':\n"
"Could not delete folder `%s':\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:247
#, c-format
msgid "`%s' is not a regular file."
msgstr "`%s' is not a regular file."
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:254
#, c-format
msgid "Folder `%s' is not empty. Not deleted."
msgstr "Folder `%s' is not empty. Not deleted."
-#: ../camel/providers/local/camel-mbox-store.c:364
+#: ../camel/providers/local/camel-mbox-store.c:378
#, c-format
msgid "Cannot create directory `%s': %s."
msgstr "Cannot create directory `%s': %s."
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:392
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Cannot create folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-store.c:380
+#: ../camel/providers/local/camel-mbox-store.c:394
msgid "Folder already exists"
msgstr "Folder already exists"
-#: ../camel/providers/local/camel-mbox-store.c:471
+#: ../camel/providers/local/camel-mbox-store.c:485
msgid "The new folder name is illegal."
msgstr "The new folder name is illegal."
-#: ../camel/providers/local/camel-mbox-store.c:484
+#: ../camel/providers/local/camel-mbox-store.c:498
#, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "Could not rename `%s': `%s': %s"
-#: ../camel/providers/local/camel-mbox-store.c:559
+#: ../camel/providers/local/camel-mbox-store.c:579
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Could not rename '%s' to %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:421
+#: ../camel/providers/local/camel-mbox-summary.c:439
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "Could not open folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:469
+#: ../camel/providers/local/camel-mbox-summary.c:487
#, 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:525
+#: ../camel/providers/local/camel-mbox-summary.c:543
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "Cannot check folder: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:593
-#: ../camel/providers/local/camel-mbox-summary.c:688
-#: ../camel/providers/local/camel-spool-summary.c:144
+#: ../camel/providers/local/camel-mbox-summary.c:611
+#: ../camel/providers/local/camel-mbox-summary.c:706
+#: ../camel/providers/local/camel-spool-summary.c:145
#, c-format
msgid "Could not open file: %s: %s"
msgstr "Could not open file: %s: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:605
-#: ../camel/providers/local/camel-spool-summary.c:164
+#: ../camel/providers/local/camel-mbox-summary.c:623
+#: ../camel/providers/local/camel-spool-summary.c:158
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Cannot open temporary mailbox: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:618
-#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-mbox-summary.c:636
+#: ../camel/providers/local/camel-mbox-summary.c:812
#, 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:627
+#: ../camel/providers/local/camel-mbox-summary.c:645
#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Could not close temp folder: %s"
+msgid "Could not close temporary folder: %s"
+msgstr "Could not close temporary folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:642
+#: ../camel/providers/local/camel-mbox-summary.c:660
#, c-format
msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:699
-#: ../camel/providers/local/camel-mbox-summary.c:905
+#: ../camel/providers/local/camel-mbox-summary.c:717
+#: ../camel/providers/local/camel-mbox-summary.c:923
#, c-format
msgid "Could not store folder: %s"
msgstr "Could not store folder: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:736
-#: ../camel/providers/local/camel-mbox-summary.c:744
-#: ../camel/providers/local/camel-mbox-summary.c:936
-#: ../camel/providers/local/camel-mbox-summary.c:944
+#: ../camel/providers/local/camel-mbox-summary.c:754
+#: ../camel/providers/local/camel-mbox-summary.c:762
+#: ../camel/providers/local/camel-mbox-summary.c:954
+#: ../camel/providers/local/camel-mbox-summary.c:962
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:870
-#: ../camel/providers/local/camel-spool-summary.c:336
+#: ../camel/providers/local/camel-mbox-summary.c:888
+#: ../camel/providers/local/camel-spool-summary.c:326
#, c-format
msgid "Unknown error: %s"
msgstr "Unknown error: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:999
-#: ../camel/providers/local/camel-mbox-summary.c:1025
+#: ../camel/providers/local/camel-mbox-summary.c:1017
+#: ../camel/providers/local/camel-mbox-summary.c:1043
#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Error writing to temp mailbox: %s"
+msgid "Writing to temporary mailbox failed: %s"
+msgstr "Writing to temporary mailbox failed: %s"
-#: ../camel/providers/local/camel-mbox-summary.c:1016
+#: ../camel/providers/local/camel-mbox-summary.c:1034
#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Writing to tmp mailbox failed: %s: %s"
+msgid "Writing to temporary mailbox failed: %s: %s"
+msgstr "Writing to temporary mailbox failed: %s: %s"
-#: ../camel/providers/local/camel-mh-folder.c:175
-msgid "MH append message cancelled"
+#: ../camel/providers/local/camel-mh-folder.c:176
+msgid "MH append message canceled"
msgstr "MH append message cancelled"
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:179
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "Cannot append message to mh folder: %s: %s"
msgid "Cannot open MH directory path: %s: %s"
msgstr "Cannot open MH directory path: %s: %s"
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:135
#, c-format
msgid "Spool `%s' cannot be opened: %s"
msgstr "Spool `%s' cannot be opened: %s"
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:147
#, 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:163
+#: ../camel/providers/local/camel-spool-store.c:166
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr "Folder `%s/%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:176
#, c-format
msgid ""
"Could not open folder `%s':\n"
"Could not open folder `%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:180
#, c-format
msgid "Folder `%s' does not exist."
msgstr "Folder `%s' does not exist."
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:185
#, c-format
msgid ""
"Could not create folder `%s':\n"
"Could not create folder `%s':\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:193
#, c-format
msgid "`%s' is not a mailbox file."
msgstr "`%s' is not a mailbox file."
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:210
msgid "Store does not support an INBOX"
msgstr "Store does not support an INBOX"
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:222
#, c-format
msgid "Spool mail file %s"
msgstr "Spool mail file %s"
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:222
#, c-format
msgid "Spool folder tree %s"
msgstr "Spool folder tree %s"
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:230
msgid "Spool folders cannot be renamed"
msgstr "Spool folders cannot be renamed"
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:238
msgid "Spool folders cannot be deleted"
msgstr "Spool folders cannot be deleted"
-#: ../camel/providers/local/camel-spool-summary.c:177
-#: ../camel/providers/local/camel-spool-summary.c:187
-#: ../camel/providers/local/camel-spool-summary.c:197
+#: ../camel/providers/local/camel-spool-summary.c:171
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:191
#, 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:213
+#: ../camel/providers/local/camel-spool-summary.c:207
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "Could not sync spool folder %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:244
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:238
+#: ../camel/providers/local/camel-spool-summary.c:255
+#: ../camel/providers/local/camel-spool-summary.c:266
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
"Could not sync spool folder %s: %s\n"
"Folder may be corrupt, copy saved in `%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:207
+#: ../camel/providers/nntp/camel-nntp-folder.c:176
+#: ../camel/providers/nntp/camel-nntp-folder.c:208
#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Internal error: uid in invalid format: %s"
+msgid "Internal error: UID in invalid format: %s"
+msgstr "Internal error: UID in invalid format: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:327
-#: ../camel/providers/nntp/camel-nntp-folder.c:330
-#: ../camel/providers/nntp/camel-nntp-folder.c:372
-#: ../camel/providers/nntp/camel-nntp-folder.c:374
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:331
+#: ../camel/providers/nntp/camel-nntp-folder.c:373
+#: ../camel/providers/nntp/camel-nntp-folder.c:375
#, c-format
msgid "Posting failed: %s"
msgstr "Posting failed: %s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:392
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
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:403
+#: ../camel/providers/nntp/camel-nntp-folder.c:404
msgid "You cannot copy messages from a NNTP folder!"
msgstr "You cannot copy messages from a NNTP folder!"
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
msgid ""
"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
msgstr ""
"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
msgid "In the subscription dialog, show relative folder names"
msgstr "In the subscription dialogue, show relative folder names"
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
msgid "USENET news"
msgstr "USENET news"
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
msgid "This is a provider for reading from and posting to USENET newsgroups."
msgstr "This is a provider for reading from and posting to USENET newsgroups."
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:76
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
"This option will authenticate with the NNTP server using a plaintext "
"password."
-#: ../camel/providers/nntp/camel-nntp-store.c:219
+#: ../camel/providers/nntp/camel-nntp-store.c:217
#, 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:231
+#: ../camel/providers/nntp/camel-nntp-store.c:229
#, 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:408
+#: ../camel/providers/nntp/camel-nntp-store.c:406
#, 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:796
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:892
+#: ../camel/providers/nntp/camel-nntp-store.c:890
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
"\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:922
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
"\n"
"newsgroup does not exist!"
-#: ../camel/providers/nntp/camel-nntp-store.c:949
+#: ../camel/providers/nntp/camel-nntp-store.c:947
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:955
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:963
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:1146
+#: ../camel/providers/nntp/camel-nntp-store.c:1144
msgid "Authentication requested but no username provided"
msgstr "Authentication requested but no username provided"
-#: ../camel/providers/nntp/camel-nntp-store.c:1154
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "Please enter the NNTP password for %s@%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1158
+#: ../camel/providers/nntp/camel-nntp-store.c:1156
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "Cannot authenticate with server: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1274
+#: ../camel/providers/nntp/camel-nntp-store.c:1271
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP Command failed: %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1330
+#: ../camel/providers/nntp/camel-nntp-store.c:1325
msgid "Not connected."
msgstr "Not connected."
-#: ../camel/providers/nntp/camel-nntp-store.c:1383
+#: ../camel/providers/nntp/camel-nntp-store.c:1378
#, c-format
msgid "No such folder: %s"
msgstr "No such folder: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:220
-#: ../camel/providers/nntp/camel-nntp-summary.c:316
+#: ../camel/providers/nntp/camel-nntp-summary.c:222
+#: ../camel/providers/nntp/camel-nntp-summary.c:318
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
-#: ../camel/providers/nntp/camel-nntp-summary.c:227
+#: ../camel/providers/nntp/camel-nntp-summary.c:229
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "Unexpected server response from xover: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:330
+#: ../camel/providers/nntp/camel-nntp-summary.c:332
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "Unexpected server response from head: %s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:372
msgid "Use cancel"
msgstr "Use cancel"
-#: ../camel/providers/nntp/camel-nntp-summary.c:372
+#: ../camel/providers/nntp/camel-nntp-summary.c:374
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
msgid "Cannot get POP summary: %s"
msgstr "Cannot get POP summary: %s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:309
+#: ../camel/providers/pop3/camel-pop3-folder.c:310
+msgid "Expunging old messages"
+msgstr "Expunging old messages"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:318
msgid "Expunging deleted messages"
msgstr "Expunging deleted messages"
-#: ../camel/providers/pop3/camel-pop3-folder.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:495
#, c-format
-msgid "No message with uid %s"
-msgstr "No message with uid %s"
+msgid "No message with UID %s"
+msgstr "No message with UID %s"
#. Sigh, most of the crap in this function is so that the cancel button
#. returns the proper exception code. Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:412
+#: ../camel/providers/pop3/camel-pop3-folder.c:502
#, c-format
msgid "Retrieving POP message %d"
msgstr "Retrieving POP message %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:502
+#: ../camel/providers/pop3/camel-pop3-folder.c:592
msgid "Unknown reason"
msgstr "Unknown reason"
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
msgid "Leave messages on server"
msgstr "Leave messages on server"
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
#, c-format
msgid "Delete after %s day(s)"
msgstr "Delete after %s day(s)"
"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:202
+#: ../camel/providers/pop3/camel-pop3-store.c:208
#, 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:216
-#: ../camel/providers/pop3/camel-pop3-store.c:233
-#: ../camel/providers/pop3/camel-pop3-store.c:243
+#: ../camel/providers/pop3/camel-pop3-store.c:222
+#: ../camel/providers/pop3/camel-pop3-store.c:239
#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:255
#, 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:217
-msgid "STLS not supported"
-msgstr "STLS not supported"
+#: ../camel/providers/pop3/camel-pop3-store.c:223
+msgid "STLS not supported by server"
+msgstr "STLS not supported by server"
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:256
+msgid "TLS is not available in this build"
+msgstr "TLS is not available in this build"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:362
#, 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:402
-#: ../camel/providers/pop3/camel-pop3-store.c:516
+#: ../camel/providers/pop3/camel-pop3-store.c:403
+#: ../camel/providers/pop3/camel-pop3-store.c:532
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#: ../camel/providers/pop3/camel-pop3-store.c:419
#, 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:430
+#: ../camel/providers/pop3/camel-pop3-store.c:431
#, 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:449
+#: ../camel/providers/pop3/camel-pop3-store.c:450
#, 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:475
+#: ../camel/providers/pop3/camel-pop3-store.c:476
#, c-format
msgid "%sPlease enter the POP password for %s on host %s"
msgstr "%sPlease enter the POP password for %s on host %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:530
-#: ../camel/providers/pop3/camel-pop3-store.c:543
+#: ../camel/providers/pop3/camel-pop3-store.c:502
+#, c-format
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+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:546
+#: ../camel/providers/pop3/camel-pop3-store.c:559
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:553
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
"Unable to connect to POP server %s.\n"
"Error sending username: %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:643
+#: ../camel/providers/pop3/camel-pop3-store.c:659
#, c-format
msgid "No such folder `%s'."
msgstr "No such folder `%s'."
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:37
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
msgid "Sendmail"
msgstr "Sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:39
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
msgid ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:114
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
msgid "Could not parse recipient list"
msgstr "Could not parse recipient list"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:145
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
#, 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:166
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
#, 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:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
#, 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:241
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
#, 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:246
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
#, 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:260
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
msgid "sendmail"
msgstr "sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:262
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
msgid "Mail delivery via the sendmail program"
msgstr "Mail delivery via the sendmail program"
-#: ../camel/providers/smtp/camel-smtp-provider.c:38
+#: ../camel/providers/smtp/camel-smtp-provider.c:39
msgid "SMTP"
msgstr "SMTP"
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
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:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
msgid "Syntax error, command unrecognized"
msgstr "Syntax error, command unrecognized"
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:168
msgid "Syntax error in parameters or arguments"
msgstr "Syntax error in parameters or arguments"
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
msgid "Command not implemented"
msgstr "Command not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:172
msgid "Command parameter not implemented"
msgstr "Command parameter not implemented"
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:174
msgid "System status, or system help reply"
msgstr "System status, or system help reply"
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:176
msgid "Help message"
msgstr "Help message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
msgid "Service ready"
msgstr "Service ready"
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:180
msgid "Service closing transmission channel"
msgstr "Service closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:182
msgid "Service not available, closing transmission channel"
msgstr "Service not available, closing transmission channel"
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:184
msgid "Requested mail action okay, completed"
msgstr "Requested mail action okay, completed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:186
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:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:188
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Requested mail action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:190
msgid "Requested action not taken: mailbox unavailable"
msgstr "Requested action not taken: mailbox unavailable"
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
msgid "Requested action aborted: error in processing"
msgstr "Requested action aborted: error in processing"
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:194
msgid "User not local; please try <forward-path>"
msgstr "User not local; please try <forward-path>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
msgid "Requested action not taken: insufficient system storage"
msgstr "Requested action not taken: insufficient system storage"
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:198
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "Requested mail action aborted: exceeded storage allocation"
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
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:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Start mail input; end with <CRLF>.<CRLF>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
msgid "Transaction failed"
msgstr "Transaction failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:208
msgid "A password transition is needed"
msgstr "A password transition is needed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
msgid "Authentication mechanism is too weak"
msgstr "Authentication mechanism is too weak"
-#: ../camel/providers/smtp/camel-smtp-transport.c:208
+#: ../camel/providers/smtp/camel-smtp-transport.c:212
msgid "Encryption required for requested authentication mechanism"
msgstr "Encryption required for requested authentication mechanism"
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
msgid "Temporary authentication failure"
msgstr "Temporary authentication failure"
-#: ../camel/providers/smtp/camel-smtp-transport.c:291
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
msgid "Welcome response error"
msgstr "Welcome response error"
-#: ../camel/providers/smtp/camel-smtp-transport.c:322
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:326
+#: ../camel/providers/smtp/camel-smtp-transport.c:359
+#: ../camel/providers/smtp/camel-smtp-transport.c:365
#, 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:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:335
#, c-format
msgid "STARTTLS command failed: %s"
msgstr "STARTTLS command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:346
+#: ../camel/providers/smtp/camel-smtp-transport.c:350
msgid "STARTTLS command failed"
msgstr "STARTTLS command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:487
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP server %s does not support requested authentication type %s."
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
+#: ../camel/providers/smtp/camel-smtp-transport.c:525
#, c-format
msgid "%sPlease enter the SMTP password for %s on host %s"
msgstr "%sPlease enter the SMTP password for %s on host %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:545
+#: ../camel/providers/smtp/camel-smtp-transport.c:544
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
"%s\n"
"\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:669
+#: ../camel/providers/smtp/camel-smtp-transport.c:668
#, c-format
msgid "SMTP server %s"
msgstr "SMTP server %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:671
+#: ../camel/providers/smtp/camel-smtp-transport.c:670
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "SMTP mail delivery via %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:689
+#: ../camel/providers/smtp/camel-smtp-transport.c:688
msgid "Cannot send message: service not connected."
msgstr "Cannot send message: service not connected."
-#: ../camel/providers/smtp/camel-smtp-transport.c:695
+#: ../camel/providers/smtp/camel-smtp-transport.c:694
msgid "Cannot send message: sender address not valid."
msgstr "Cannot send message: sender address not valid."
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
msgid "Sending message"
msgstr "Sending message"
-#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
msgid "Cannot send message: no recipients defined."
msgstr "Cannot send message: no recipients defined."
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
msgid "Cannot send message: one or more invalid recipients"
msgstr "Cannot send message: one or more invalid recipients"
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: ../camel/providers/smtp/camel-smtp-transport.c:920
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
#, c-format
msgid "HELO command failed: %s"
msgstr "HELO command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:937
+#: ../camel/providers/smtp/camel-smtp-transport.c:936
msgid "HELO command failed"
msgstr "HELO command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1003
+#: ../camel/providers/smtp/camel-smtp-transport.c:1002
msgid "SMTP Authentication"
msgstr "SMTP Authentication"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1009
+#: ../camel/providers/smtp/camel-smtp-transport.c:1008
msgid "Error creating SASL authentication object."
msgstr "Error creating SASL authentication object."
-#: ../camel/providers/smtp/camel-smtp-transport.c:1026
-#: ../camel/providers/smtp/camel-smtp-transport.c:1037
+#: ../camel/providers/smtp/camel-smtp-transport.c:1025
+#: ../camel/providers/smtp/camel-smtp-transport.c:1036
#, c-format
msgid "AUTH command failed: %s"
msgstr "AUTH command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1043
+#: ../camel/providers/smtp/camel-smtp-transport.c:1042
msgid "AUTH command failed"
msgstr "AUTH command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1105
+#: ../camel/providers/smtp/camel-smtp-transport.c:1106
msgid "Bad authentication response from server.\n"
msgstr "Bad authentication response from server.\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../camel/providers/smtp/camel-smtp-transport.c:1131
#, c-format
msgid "MAIL FROM command failed: %s: mail not sent"
msgstr "MAIL FROM command failed: %s: mail not sent"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1147
+#: ../camel/providers/smtp/camel-smtp-transport.c:1148
msgid "MAIL FROM command failed"
msgstr "MAIL FROM command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1171
+#: ../camel/providers/smtp/camel-smtp-transport.c:1172
#, c-format
msgid "RCPT TO command failed: %s: mail not sent"
msgstr "RCPT TO command failed: %s: mail not sent"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1190
+#: ../camel/providers/smtp/camel-smtp-transport.c:1191
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1229
-#: ../camel/providers/smtp/camel-smtp-transport.c:1287
-#: ../camel/providers/smtp/camel-smtp-transport.c:1306
+#: ../camel/providers/smtp/camel-smtp-transport.c:1230
+#: ../camel/providers/smtp/camel-smtp-transport.c:1288
+#: ../camel/providers/smtp/camel-smtp-transport.c:1307
#, c-format
msgid "DATA command failed: %s: mail not sent"
msgstr "DATA command failed: %s: mail not sent"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1246
-#: ../camel/providers/smtp/camel-smtp-transport.c:1322
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
+#: ../camel/providers/smtp/camel-smtp-transport.c:1323
msgid "DATA command failed"
msgstr "DATA command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1345
+#: ../camel/providers/smtp/camel-smtp-transport.c:1346
#, c-format
msgid "RSET command failed: %s"
msgstr "RSET command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1362
msgid "RSET command failed"
msgstr "RSET command failed"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
+#: ../camel/providers/smtp/camel-smtp-transport.c:1385
#, c-format
msgid "QUIT command failed: %s"
msgstr "QUIT command failed: %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1398
+#: ../camel/providers/smtp/camel-smtp-transport.c:1399
msgid "QUIT command failed"
msgstr "QUIT command failed"
-#: ../libedataserver/e-categories.c:242
+#: ../libedataserver/e-categories.c:43
msgid "Business"
msgstr "Business"
-#: ../libedataserver/e-categories.c:243
+#: ../libedataserver/e-categories.c:44
msgid "Competition"
msgstr "Competition"
-#: ../libedataserver/e-categories.c:244
+#: ../libedataserver/e-categories.c:45
msgid "Favorites"
msgstr "Favourites"
-#: ../libedataserver/e-categories.c:245
+#: ../libedataserver/e-categories.c:46
msgid "Gifts"
msgstr "Gifts"
-#: ../libedataserver/e-categories.c:246
+#: ../libedataserver/e-categories.c:47
msgid "Goals/Objectives"
msgstr "Goals/Objectives"
-#: ../libedataserver/e-categories.c:247
+#: ../libedataserver/e-categories.c:48
msgid "Holiday"
msgstr "Holiday"
-#: ../libedataserver/e-categories.c:248
+#: ../libedataserver/e-categories.c:49
msgid "Holiday Cards"
msgstr "Holiday Cards"
-#. important people (e.g. new business partners) you should pay attention to/observe
-#: ../libedataserver/e-categories.c:250
+#. important people (e.g. new business partners)
+#: ../libedataserver/e-categories.c:51
msgid "Hot Contacts"
msgstr "Hot Contacts"
-#: ../libedataserver/e-categories.c:251
+#: ../libedataserver/e-categories.c:52
msgid "Ideas"
msgstr "Ideas"
-#: ../libedataserver/e-categories.c:252
+#: ../libedataserver/e-categories.c:53
msgid "International"
msgstr "International"
-#: ../libedataserver/e-categories.c:253
+#: ../libedataserver/e-categories.c:54
msgid "Key Customer"
msgstr "Key Customer"
-#: ../libedataserver/e-categories.c:254
+#: ../libedataserver/e-categories.c:55
msgid "Miscellaneous"
msgstr "Miscellaneous"
-#: ../libedataserver/e-categories.c:255
+#: ../libedataserver/e-categories.c:56
msgid "Personal"
msgstr "Personal"
-#: ../libedataserver/e-categories.c:256
+#: ../libedataserver/e-categories.c:57
msgid "Phone Calls"
msgstr "Phone Calls"
-#: ../libedataserver/e-categories.c:257
+#: ../libedataserver/e-categories.c:58
msgid "Status"
msgstr "Status"
-#: ../libedataserver/e-categories.c:258
+#: ../libedataserver/e-categories.c:59
msgid "Strategies"
msgstr "Strategies"
-#: ../libedataserver/e-categories.c:259
+#: ../libedataserver/e-categories.c:60
msgid "Suppliers"
msgstr "Suppliers"
-#: ../libedataserver/e-categories.c:260
+#: ../libedataserver/e-categories.c:61
msgid "Time & Expenses"
msgstr "Time & Expenses"
-#: ../libedataserver/e-categories.c:261
+#: ../libedataserver/e-categories.c:62
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:262
+#: ../libedataserver/e-categories.c:63
msgid "Waiting"
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:1319 ../libedataserver/e-time-utils.c:1562
+#: ../libedataserver/e-time-utils.c:1605 ../libedataserver/e-time-utils.c:1852
msgid "%a %m/%d/%Y %I:%M:%S %p"
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:1324 ../libedataserver/e-time-utils.c:1553
+#: ../libedataserver/e-time-utils.c:1610 ../libedataserver/e-time-utils.c:1843
msgid "%a %m/%d/%Y %H:%M:%S"
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:1329 ../libedataserver/e-time-utils.c:1558
+#: ../libedataserver/e-time-utils.c:1615 ../libedataserver/e-time-utils.c:1848
msgid "%a %m/%d/%Y %I:%M %p"
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:1334 ../libedataserver/e-time-utils.c:1549
+#: ../libedataserver/e-time-utils.c:1620 ../libedataserver/e-time-utils.c:1839
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:1339
+#: ../libedataserver/e-time-utils.c:1625
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:1344
+#: ../libedataserver/e-time-utils.c:1630
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:1347 ../libedataserver/e-time-utils.c:1440
-#: ../libedataserver/e-time-utils.c:1544
+#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1729
+#: ../libedataserver/e-time-utils.c:1834
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:1355
+#: ../libedataserver/e-time-utils.c:1641
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:1359
+#: ../libedataserver/e-time-utils.c:1645
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:1364
+#: ../libedataserver/e-time-utils.c:1650
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:1369
+#: ../libedataserver/e-time-utils.c:1655
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:1374
+#: ../libedataserver/e-time-utils.c:1660
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:1379
+#: ../libedataserver/e-time-utils.c:1665
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:1382 ../libedataserver/e-time-utils.c:1443
+#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1732
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:1488 ../libedataserver/e-time-utils.c:1607
+#: ../libedataserver/e-time-utils.c:1778 ../libedataserver/e-time-utils.c:1897
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:1492 ../libedataserver/e-time-utils.c:1599
+#: ../libedataserver/e-time-utils.c:1782 ../libedataserver/e-time-utils.c:1889
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. in 12-hour format.
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1497 ../libedataserver/e-time-utils.c:1604
+#: ../libedataserver/e-time-utils.c:1787 ../libedataserver/e-time-utils.c:1894
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:1501 ../libedataserver/e-time-utils.c:1596
+#: ../libedataserver/e-time-utils.c:1791 ../libedataserver/e-time-utils.c:1886
msgid "%H:%M"
msgstr "%H:%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1505
+#: ../libedataserver/e-time-utils.c:1795
msgid "%I %p"
msgstr "%I %p"
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: ../libedataserverui/e-book-auth-util.c:185
+#: ../libedataserverui/e-book-auth-util.c:191
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: ../libedataserverui/e-categories-dialog.c:265
+#: ../libedataserverui/e-categories-dialog.c:276
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"There is already a category '%s' in the configuration. Please use another "
"name"
-#: ../libedataserverui/e-categories-dialog.c:435
+#: ../libedataserverui/e-categories-dialog.c:475
+msgid "Icon"
+msgstr "Icon"
+
+#: ../libedataserverui/e-categories-dialog.c:480
msgid "Category"
msgstr "Category"
msgid "categories"
msgstr "categories"
-#: ../libedataserverui/e-name-selector-dialog.c:260
+#: ../libedataserverui/e-name-selector-dialog.c:122
+#: ../libedataserverui/e-name-selector-dialog.c:782
+msgid "Any Category"
+msgstr "Any Category"
+
+#: ../libedataserverui/e-name-selector-dialog.c:287
msgid "Select Contacts from Address Book"
msgstr "Select Contacts from Address Book"
-#: ../libedataserverui/e-name-selector-dialog.c:554
+#: ../libedataserverui/e-name-selector-dialog.c:589
msgid "_Add"
msgstr "_Add"
-#: ../libedataserverui/e-name-selector-dialog.c:579
+#: ../libedataserverui/e-name-selector-dialog.c:614
msgid "_Remove"
msgstr "_Remove"
#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "\t\t\t\t\t\t"
-msgstr "\t\t\t\t\t\t"
-
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
msgid "*"
msgstr "*"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.glade.h:2
msgid "<b>Show Contacts</b>"
msgstr "<b>Show Contacts</b>"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.glade.h:3
msgid "<b>_Contacts</b>"
msgstr "<b>_Contacts</b>"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.glade.h:4
msgid "Address Book"
msgstr "Address Book"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.glade.h:5
msgid "Address _Book:"
msgstr "Address _Book:"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.glade.h:6
msgid "C_ategory:"
msgstr "C_ategory:"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:258
+#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../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.glade.h:8
msgid "Search"
msgstr "Search"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.glade.h:9
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:1947
+#: ../libedataserverui/e-name-selector-entry.c:2241
#, c-format
msgid "E_xpand %s Inline"
msgstr "E_xpand %s Inline"
+#. Copy Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2256
+#, c-format
+msgid "Cop_y %s"
+msgstr "Cop_y %s"
+
+#. Cut Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2266
+#, c-format
+msgid "C_ut %s"
+msgstr "C_ut %s"
+
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:1963
+#: ../libedataserverui/e-name-selector-entry.c:2283
#, c-format
msgid "_Edit %s"
msgstr "_Edit %s"
-#: ../libedataserverui/e-name-selector-list.c:480
+#: ../libedataserverui/e-name-selector-list.c:479
#, c-format
msgid "_Delete %s"
msgstr "_Delete %s"
-#: ../libedataserverui/e-passwords.c:471
+#: ../libedataserverui/e-passwords.c:819
+msgid "_Remember this passphrase"
+msgstr "_Remember this passphrase"
+
+#: ../libedataserverui/e-passwords.c:820
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "_Remember this passphrase for the remainder of this session"
+
+#: ../libedataserverui/e-passwords.c:823
msgid "_Remember this password"
msgstr "_Remember this password"
-#: ../libedataserverui/e-passwords.c:472
+#: ../libedataserverui/e-passwords.c:824
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
msgid "_Destination"
msgstr "_Destination"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1636
-#: ../servers/exchange/storage/exchange-account.c:936
+#: ../servers/exchange/lib/e2k-autoconfig.c:1655
+#: ../servers/exchange/storage/exchange-account.c:940
#, c-format
msgid "Enter password for %s"
msgstr "Enter password for %s"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1637
-#: ../servers/exchange/storage/exchange-account.c:941
+#: ../servers/exchange/lib/e2k-autoconfig.c:1656
+#: ../servers/exchange/storage/exchange-account.c:945
msgid "Enter password"
msgstr "Enter password"
msgid "Custom"
msgstr "Custom"
-#: ../servers/exchange/lib/e2k-user-dialog.c:144
-msgid "Select User"
-msgstr "Select User"
-
-#: ../servers/exchange/lib/e2k-user-dialog.c:182
-msgid "Addressbook..."
-msgstr "Addressbook..."
-
-#: ../servers/exchange/storage/e-storage.c:556
+#: ../servers/exchange/storage/e-storage.c:555
msgid "Generic error"
msgstr "Generic error"
-#: ../servers/exchange/storage/e-storage.c:558
+#: ../servers/exchange/storage/e-storage.c:557
msgid "A folder with the same name already exists"
msgstr "A folder with the same name already exists"
-#: ../servers/exchange/storage/e-storage.c:560
+#: ../servers/exchange/storage/e-storage.c:559
msgid "The specified folder type is not valid"
msgstr "The specified folder type is not valid"
-#: ../servers/exchange/storage/e-storage.c:562
+#: ../servers/exchange/storage/e-storage.c:561
msgid "I/O error"
msgstr "I/O error"
-#: ../servers/exchange/storage/e-storage.c:564
+#: ../servers/exchange/storage/e-storage.c:563
msgid "Not enough space to create the folder"
msgstr "Not enough space to create the folder"
-#: ../servers/exchange/storage/e-storage.c:566
+#: ../servers/exchange/storage/e-storage.c:565
msgid "The folder is not empty"
msgstr "The folder is not empty"
-#: ../servers/exchange/storage/e-storage.c:568
+#: ../servers/exchange/storage/e-storage.c:567
msgid "The specified folder was not found"
msgstr "The specified folder was not found"
-#: ../servers/exchange/storage/e-storage.c:570
+#: ../servers/exchange/storage/e-storage.c:569
msgid "Function not implemented in this storage"
msgstr "Function not implemented in this storage"
-#: ../servers/exchange/storage/e-storage.c:574
+#: ../servers/exchange/storage/e-storage.c:573
msgid "Operation not supported"
msgstr "Operation not supported"
-#: ../servers/exchange/storage/e-storage.c:576
+#: ../servers/exchange/storage/e-storage.c:575
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:578
+#: ../servers/exchange/storage/e-storage.c:577
msgid "The specified folder cannot be modified or removed"
msgstr "The specified folder cannot be modified or removed"
-#: ../servers/exchange/storage/e-storage.c:580
+#: ../servers/exchange/storage/e-storage.c:579
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:582
+#: ../servers/exchange/storage/e-storage.c:581
msgid "Cannot create a folder with that name"
msgstr "Cannot create a folder with that name"
-#: ../servers/exchange/storage/e-storage.c:584
+#: ../servers/exchange/storage/e-storage.c:583
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:639
+#: ../servers/exchange/storage/exchange-account.c:636
#, c-format
msgid "%s's Folders"
msgstr "%s's Folders"
-#: ../servers/exchange/storage/exchange-account.c:1242
+#: ../servers/exchange/storage/exchange-account.c:1246
msgid "Personal Folders"
msgstr "Personal Folders"
-#: ../servers/exchange/storage/exchange-account.c:1256
+#: ../servers/exchange/storage/exchange-account.c:1261
msgid "Favorite Public Folders"
msgstr "Favourite Public Folders"
#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1273
+#: ../servers/exchange/storage/exchange-account.c:1278
msgid "All Public Folders"
msgstr "All Public Folders"
#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1287
+#: ../servers/exchange/storage/exchange-account.c:1292
msgid "Global Address List"
msgstr "Global Address List"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:259
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
msgid "Deleted Items"
msgstr "Deleted Items"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
msgid "Drafts"
msgstr "Drafts"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
msgid "Journal"
msgstr "Journal"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
msgid "Notes"
msgstr "Notes"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
msgid "Outbox"
msgstr "Outbox"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
msgid "Sent Items"
msgstr "Sent Items"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
msgid "Tasks"
msgstr "Tasks"
-#: ../servers/groupwise/e-gw-connection.c:164
+#: ../servers/groupwise/e-gw-connection.c:168
msgid "Invalid connection"
msgstr "Invalid connection"
-#: ../servers/groupwise/e-gw-connection.c:168
+#: ../servers/groupwise/e-gw-connection.c:172
msgid "Invalid response from server"
msgstr "Invalid response from server"
-#: ../servers/groupwise/e-gw-connection.c:170
+#: ../servers/groupwise/e-gw-connection.c:174
msgid "No response from the server"
msgstr "No response from the server"
-#: ../servers/groupwise/e-gw-connection.c:176
+#: ../servers/groupwise/e-gw-connection.c:180
msgid "Bad parameter"
msgstr "Bad parameter"
msgstr "Evolution Data Server logging service"
#. dialog display isn't working out
-#: ../src/server.c:106
+#: ../src/server.c:110
#, c-format
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
msgstr "Multiple segmentation faults occurred; cannot display error dialogue\n"
projects / platform / upstream / evolution-data-server.git / commitdiff