aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog4
-rw-r--r--po/en_GB.po1961
2 files changed, 983 insertions, 982 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index f60d3efa65..6c38f79444 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-25 Gareth Owen <gowen72@yahoo.com>
+
+ * en_GB.po: Updated British English translation
+
2004-05-25 Marco Ciampa <ciampix@libero.it>
* it.po: Italian translation updated.
diff --git a/po/en_GB.po b/po/en_GB.po
index da3cf7746c..a3a8bb8efd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-19 19:24-0400\n"
-"PO-Revision-Date: 2004-05-19 19:40-0400\n"
+"POT-Creation-Date: 2004-05-25 19:21-0400\n"
+"PO-Revision-Date: 2004-05-25 19:22-0400\n"
"Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -53,13 +53,13 @@ msgstr " card"
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
-#: addressbook/conduit/address-conduit.c:1150
#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
msgid "Could not load addressbook"
msgstr "Could not load addressbook"
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
msgid "Could not read pilot's Address application block"
msgstr "Could not read pilot's Address application block"
@@ -67,12 +67,12 @@ msgstr "Could not read pilot's Address application block"
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: addressbook/gui/component/addressbook.c:165
+#: addressbook/gui/component/addressbook.c:173
#: camel/providers/groupwise/camel-gw-listener.c:369
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: addressbook/gui/component/addressbook.c:171
+#: addressbook/gui/component/addressbook.c:179
#: camel/providers/groupwise/camel-gw-listener.c:358
#, c-format
msgid "%sEnter password for %s (user %s)"
@@ -114,80 +114,52 @@ msgstr "_Contacts Group"
msgid "Create a new contacts group"
msgstr "Create a new contacts group"
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
msgid "Failed upgrading Addressbook settings or folders."
msgstr "Failed upgrading Addressbook settings or folders."
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Failed to connect to LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Failed to authenticate with LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Could not perform query on Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "The server responded with no supported search bases"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "This server does not support LDAPv3 schema information"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Error retrieving schema information"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Server did not respond with valid schema information"
-
#: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
msgid "Migrating..."
msgstr "Migrating..."
#: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
#, c-format
msgid "Migrating `%s':"
msgstr "Migrating `%s':"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:508
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: mail/mail-component.c:247 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "On This Computer"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:516
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
msgid "Personal"
msgstr "Personal"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:524
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:652
msgid "LDAP Servers"
msgstr "LDAP Servers"
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:772
msgid "Autocompletion Settings"
msgstr "Autocompletion Settings"
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1148
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -199,7 +171,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1162
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -209,7 +181,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1171
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -219,7 +191,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1181
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -229,17 +201,25 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your Pilot Sync data..."
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-migrate.c:1194
+msgid ""
+"Some fields are no longer representable in the contact editor. Please wait "
+"while Evolution copies those fields to the 'Notes' field..."
+msgstr ""
+"Some fields are no longer representable in the contact editor. Please wait "
+"while Evolution copies those fields to the 'Notes' field..."
+
+#: addressbook/gui/component/addressbook-view.c:675
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
msgid "New Address Book"
msgstr "New Address Book"
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
@@ -249,18 +229,14 @@ msgstr "New Address Book"
msgid "Delete"
msgstr "Delete"
-#: addressbook/gui/component/addressbook-view.c:763
+#: addressbook/gui/component/addressbook-view.c:756
#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
msgid "Properties..."
msgstr "Properties..."
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
#: calendar/gui/migration.c:373
msgid "Contacts"
msgstr "Contacts"
@@ -356,7 +332,7 @@ msgstr " S_how Supported Bases "
#: calendar/gui/dialogs/new-task-list.glade.h:1
#: calendar/gui/dialogs/task-page.glade.h:1
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -424,7 +400,7 @@ msgid "Address Book Properties"
msgstr "Address Book Properties"
#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
msgid "Always"
msgstr "Always"
@@ -484,12 +460,12 @@ msgstr "Find Possible Search Bases"
#: addressbook/gui/component/ldap-config.glade.h:31
#: calendar/gui/dialogs/calendar-setup.glade.h:6
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "General"
#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
msgid "Never"
msgstr "Never"
@@ -674,7 +650,7 @@ msgid "Using email address"
msgstr "Using email address"
#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr "Whenever Possible"
@@ -700,7 +676,7 @@ msgid "_Log in method:"
msgstr "_Log in method:"
#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
msgid "_Name:"
msgstr "_Name:"
@@ -747,7 +723,7 @@ msgstr "general-tab"
#: addressbook/gui/component/ldap-config.glade.h:89
#: calendar/gui/dialogs/alarm-options.glade.h:14
#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "minutes"
@@ -755,12 +731,12 @@ msgstr "minutes"
msgid "searching-tab"
msgstr "searching-tab"
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:492
#: addressbook/gui/component/select-names/select-names.glade.h:6
msgid "Select Contacts from Address Book"
msgstr "Select Contacts from Address Book"
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:691
#: addressbook/gui/component/select-names/e-select-names-popup.c:215
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
@@ -800,7 +776,7 @@ msgstr "Unnamed Contact"
#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
msgid "Source"
msgstr "Source"
@@ -865,7 +841,7 @@ msgid "<b>Work</b>"
msgstr "<b>Work</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
#: addressbook/gui/widgets/eab-contact-display.c:342
#: addressbook/gui/widgets/eab-contact-display.c:361
msgid "AIM"
@@ -901,7 +877,7 @@ msgid "Company:"
msgstr "Company:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
@@ -909,7 +885,7 @@ msgid "Contact"
msgstr "Contact"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
msgid "Contact Editor"
msgstr "Contact Editor"
@@ -930,7 +906,7 @@ msgid "Full _Name..."
msgstr "Full _Name..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
msgid "Home"
msgstr "Home"
@@ -940,62 +916,62 @@ msgid "Home Page:"
msgstr "Home Page:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "Job title:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:930
msgid "Location:"
msgstr "Location:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "Mailing Address"
msgstr "Mailing Address"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "Manager:"
msgstr "Manager:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "Ni_ckname:"
msgstr "Ni_ckname:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "Notes:"
msgstr "Notes:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
msgid "Other"
msgstr "Other"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "PO Box:"
msgstr "PO Box:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
msgid "Personal Information"
msgstr "Personal Information"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "Profession:"
msgstr "Profession:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
msgid "State/Province:"
msgstr "State/Province:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Title:"
+msgstr "Title:"
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "Wants to receive HTML mail"
msgstr "Wants to receive HTML mail"
@@ -1006,10 +982,10 @@ msgstr "Webcam:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
msgid "Work"
msgstr "Work"
@@ -1060,7 +1036,7 @@ msgid "Address"
msgstr "Address"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
@@ -2041,83 +2017,70 @@ msgstr "Zambia"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
#: addressbook/gui/widgets/eab-contact-display.c:345
#: addressbook/gui/widgets/eab-contact-display.c:364
msgid "Jabber"
msgstr "Jabber"
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
#: addressbook/gui/widgets/eab-contact-display.c:347
#: addressbook/gui/widgets/eab-contact-display.c:366
msgid "Yahoo"
msgstr "Yahoo"
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
#: addressbook/gui/widgets/eab-contact-display.c:346
#: addressbook/gui/widgets/eab-contact-display.c:365
msgid "MSN"
msgstr "MSN"
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
#: addressbook/gui/widgets/eab-contact-display.c:344
#: addressbook/gui/widgets/eab-contact-display.c:363
msgid "ICQ"
msgstr "ICQ"
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
msgid "GroupWise"
msgstr "GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
msgid "Source Book"
msgstr "Source Book"
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Target Book"
msgstr "Target Book"
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
msgid "Is New Contact"
msgstr "Is New Contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Writable Fields"
msgstr "Writable Fields"
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
msgid "Changed"
msgstr "Changed"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2290
-msgid "Category editor not available."
-msgstr "Category editor not available."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2298
+#: addressbook/gui/contact-editor/e-contact-editor.c:2297
msgid "This contact belongs to these categories:"
msgstr "This contact belongs to these categories:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2375
+#: addressbook/gui/contact-editor/e-contact-editor.c:2374
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2378
msgid "No image"
msgstr "No image"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2556
-#: addressbook/gui/contact-editor/e-contact-editor.c:2719
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2603
+#: addressbook/gui/contact-editor/e-contact-editor.c:2581
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2125,7 +2088,11 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2696
+#: addressbook/gui/contact-editor/e-contact-editor.c:2609
+msgid "Invalid contact."
+msgstr "Invalid contact."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2668
msgid ""
"The contact cannot be saved to the selected address book. Do you want to "
"discard changes?"
@@ -2133,12 +2100,19 @@ msgstr ""
"The contact cannot be saved to the selected address book. Do you want to "
"discard changes?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
-#: addressbook/gui/contact-editor/e-contact-editor.c:2724
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2672
+#: addressbook/gui/contact-editor/e-contact-editor.c:2696
msgid "_Discard"
msgstr "_Discard"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2691
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+
#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
msgid "AOL Instant Messenger"
msgstr "AOL Instant Messenger"
@@ -2170,7 +2144,7 @@ msgid "_Edit Full"
msgstr "_Edit Full"
#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
msgid "_Full Name:"
msgstr "_Full Name:"
@@ -2322,7 +2296,7 @@ msgstr "contact-list-editor"
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
#: addressbook/gui/widgets/e-minicard-view.c:460
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
msgid "Book"
@@ -2474,55 +2448,55 @@ msgid "Home page"
msgstr "Home page"
#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
msgid "Success"
msgstr "Success"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
msgid "Backend busy"
msgstr "Backend busy"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
msgid "Repository offline"
msgstr "Repository offline"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Address Book does not exist"
msgstr "Address Book does not exist"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
msgid "No Self Contact defined"
msgstr "No Self Contact defined"
#. E_BOOK_ERROR_URI_NOT_LOADED
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
msgid "Permission denied"
msgstr "Permission denied"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
msgid "Contact not found"
msgstr "Contact not found"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
msgid "Contact ID already exists"
msgstr "Contact ID already exists"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
msgid "Protocol not supported"
msgstr "Protocol not supported"
#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-cal-component-preview.c:233
#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2535,37 +2509,37 @@ msgid "Cancelled"
msgstr "Cancelled"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
msgid "Could not cancel"
msgstr "Could not cancel"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
msgid "Authentication Failed"
msgstr "Authentication Failed"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
msgid "Authentication Required"
msgstr "Authentication Required"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
msgid "TLS not Available"
msgstr "TLS not Available"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
msgid "No such source"
msgstr "No such source"
#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
msgid "Other error"
msgstr "Other error"
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
msgid ""
"We were unable to open this addressbook. Please check that the path exists "
"and that you have permission to access it."
@@ -2573,7 +2547,7 @@ msgstr ""
"We were unable to open this addressbook. Please check that the path exists "
"and that you have permission to access it."
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
@@ -2581,17 +2555,17 @@ msgstr ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
msgstr ""
"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
@@ -2599,11 +2573,7 @@ msgstr ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Unable to open addressbook"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -2615,7 +2585,7 @@ msgstr ""
"Please make your search more specific or raise the result limit in\n"
"the directory server preferences for this addressbook."
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -2627,49 +2597,45 @@ msgstr ""
"more specific or raise the time limit in the directory server\n"
"preferences for this addressbook."
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
msgid "The backend for this addressbook was unable to parse this query."
msgstr "The backend for this addressbook was unable to parse this query."
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
msgid "The backend for this addressbook refused to perform this query."
msgstr "The backend for this addressbook refused to perform this query."
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
msgid "This query did not complete successfully."
msgstr "This query did not complete successfully."
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Do you want to save changes?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
msgid "Error adding list"
msgstr "Error adding list"
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
msgid "Error adding contact"
msgstr "Error adding contact"
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying list"
msgstr "Error modifying list"
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying contact"
msgstr "Error modifying contact"
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
msgid "Error removing list"
msgstr "Error removing list"
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
msgid "Error removing contact"
msgstr "Error removing contact"
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -2678,7 +2644,7 @@ msgstr ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
#, c-format
msgid ""
"%s already exists\n"
@@ -2687,49 +2653,44 @@ msgstr ""
"%s already exists\n"
"Do you want to overwrite it?"
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
msgid "Overwrite"
msgstr "Overwrite"
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Error saving %s: %s"
-
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
msgid "list"
msgstr "list"
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
msgid "Move contact to"
msgstr "Move contact to"
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
msgid "Copy contact to"
msgstr "Copy contact to"
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
msgid "Move contacts to"
msgstr "Move contacts to"
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
msgid "Copy contacts to"
msgstr "Copy contacts to"
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
msgid "Select target addressbook."
msgstr "Select target addressbook."
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
msgid "Multiple VCards"
msgstr "Multiple VCards"
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
#, c-format
msgid "VCard for %s"
msgstr "VCard for %s"
@@ -2816,7 +2777,7 @@ msgstr[1] "%d contacts"
#: addressbook/gui/widgets/e-addressbook-model.c:302
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
#: addressbook/gui/widgets/e-minicard-view.c:467
#: addressbook/gui/widgets/e-minicard-view-widget.c:112
msgid "Query"
@@ -2834,140 +2795,129 @@ msgstr "Model"
msgid "Error modifying card"
msgstr "Error modifying card"
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
msgid "Name begins with"
msgstr "Name begins with"
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
msgid "Email begins with"
msgstr "Email begins with"
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:165
#: calendar/gui/cal-search-bar.c:57
msgid "Category is"
msgstr "Category is"
#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:166
#: calendar/gui/cal-search-bar.c:50
msgid "Any field contains"
msgstr "Any field contains"
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
msgid "Advanced..."
msgstr "Advanced..."
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:250
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "Type"
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
msgid "Address Book"
msgstr "Address Book"
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2078
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard..."
msgstr "Save as VCard..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
msgid "New Contact..."
msgstr "New Contact..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
msgid "New Contact List..."
msgstr "New Contact List..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
msgid "Go to Folder..."
msgstr "Go to Folder..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
msgid "Import..."
msgstr "Import..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
msgid "Search for Contacts..."
msgstr "Search for Contacts..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
msgid "Address Book Sources..."
msgstr "Address Book Sources..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
msgid "Pilot Settings..."
msgstr "Pilot Settings..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "Forward Contact"
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
msgid "Send Message to Contact"
msgstr "Send Message to Contact"
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "Print"
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
msgid "Print Envelope"
msgstr "Print Envelope"
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
msgid "Copy to Address Book..."
msgstr "Copy to Address Book..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
msgid "Move to Address Book..."
msgstr "Move to Address Book..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "Cut"
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "Copy"
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "Paste"
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
#: calendar/gui/e-calendar-view.c:1277
msgid "Current View"
msgstr "Current View"
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
#: calendar/gui/cal-search-bar.c:362
msgid "Any Category"
msgstr "Any Category"
@@ -3074,7 +3024,7 @@ msgstr "Radio"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:257
#: calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "Role"
@@ -3216,12 +3166,12 @@ msgstr "Evolution VCard importer"
msgid "VCard (.vcf, .gcrd)"
msgstr "VCard (.vcf, .gcrd)"
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
msgid "Print contacts"
msgstr "Print contacts"
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
msgid "Print contact"
msgstr "Print contact"
@@ -3470,15 +3420,19 @@ msgstr "In normal mode, there should not need size option."
msgid "Impossible internal error."
msgstr "Impossible internal error."
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
msgid "Can not open file"
msgstr "Can not open file"
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Can not load URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Couldn't get list of addressbooks"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "failed to open book"
#: addressbook/tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
@@ -3496,7 +3450,7 @@ msgstr "No filename provided."
msgid "Unnamed List"
msgstr "Unnamed List"
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
msgstr "Enter password"
@@ -3771,8 +3725,8 @@ msgid "Whether to show week numbers in date navigator"
msgstr "Whether to show week numbers in date navigator"
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1704
#: camel/providers/groupwise/camel-gw-listener.c:304
#: camel/providers/groupwise/camel-gw-listener.c:327
msgid "Calendar"
@@ -3977,23 +3931,23 @@ msgstr "Permission denied to open the calendar"
msgid "open_client(): %s"
msgstr "open_client(): %s"
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
msgid "Audio Alarm Options"
msgstr "Audio Alarm Options"
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
msgid "Message Alarm Options"
msgstr "Message Alarm Options"
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
msgid "Email Alarm Options"
msgstr "Email Alarm Options"
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
msgid "Program Alarm Options"
msgstr "Program Alarm Options"
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
msgid "Unknown Alarm Options"
msgstr "Unknown Alarm Options"
@@ -4084,7 +4038,7 @@ msgstr "Send an email"
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/recurrence-page.glade.h:8
#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "Summary:"
@@ -4122,26 +4076,26 @@ msgstr "minute(s)"
msgid "start of appointment"
msgstr "start of appointment"
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:171
msgid "You must specify a location to get the calendar from."
msgstr "You must specify a location to get the calendar from."
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:179
#, c-format
msgid "The source location '%s' is not well-formed."
msgstr "The source location '%s' is not well-formed."
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:194
#, c-format
msgid "The source location '%s' is not a webcal source."
msgstr "The source location '%s' is not a webcal source."
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:266
#, c-format
msgid "Source with name '%s' already exists in the selected group"
msgstr "Source with name '%s' already exists in the selected group"
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:279
#, c-format
msgid ""
"The group '%s' is remote. You must specify a location to get the calendar "
@@ -4166,7 +4120,7 @@ msgstr "C_olour:"
msgid "Calendar Properties"
msgstr "Calendar Properties"
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
msgid "Pick a color"
msgstr "Pick a colour"
@@ -4308,7 +4262,7 @@ msgid "Display"
msgstr "Display"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
msgid "E_nable"
msgstr "E_nable"
@@ -4318,7 +4272,7 @@ msgstr "Free/Busy Publishing"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:557
msgid "Friday"
msgstr "Friday"
@@ -4332,7 +4286,7 @@ msgstr "Minutes"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:553
msgid "Monday"
msgstr "Monday"
@@ -4342,7 +4296,7 @@ msgstr "S_un"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:558
msgid "Saturday"
msgstr "Saturday"
@@ -4356,7 +4310,7 @@ msgstr "Show week _numbers in date navigator"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:552
msgid "Sunday"
msgstr "Sunday"
@@ -4370,7 +4324,7 @@ msgstr "T_hu"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:556
msgid "Thursday"
msgstr "Thursday"
@@ -4384,7 +4338,7 @@ msgstr "Time format:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:554
msgid "Tuesday"
msgstr "Tuesday"
@@ -4394,7 +4348,7 @@ msgstr "W_eek starts:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:555
msgid "Wednesday"
msgstr "Wednesday"
@@ -4427,7 +4381,7 @@ msgid "_Day begins:"
msgstr "_Day begins:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:43
@@ -4476,82 +4430,46 @@ msgstr "_Wed"
msgid "before every appointment"
msgstr "before every appointment"
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Are you sure you want to cancel and delete this meeting?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Are you sure you want to cancel and delete this task?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Are you sure you want to cancel and delete this journal entry?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "This event has been deleted."
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
msgid "This task has been deleted."
msgstr "This task has been deleted."
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
msgid "This journal entry has been deleted."
msgstr "This journal entry has been deleted."
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s You have made changes. Forget those changes and close the editor?"
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s You have made no changes, close the editor?"
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
msgid "This event has been changed."
msgstr "This event has been changed."
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
msgid "This task has been changed."
msgstr "This task has been changed."
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
msgid "This journal entry has been changed."
msgstr "This journal entry has been changed."
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr "%s You have made changes. Forget those changes and update the editor?"
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr "%s You have made no changes, update the editor?"
@@ -4641,99 +4559,51 @@ msgstr "Could not open destination"
msgid "Destination is read only"
msgstr "Destination is read only"
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Are you sure you want to delete the appointment `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Are you sure you want to delete this untitled appointment?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Are you sure you want to delete the task `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Are you sure you want to delete this untitled task?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Are you sure you want to delete the journal entry `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Are you sure want to delete this untitled journal entry?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Are you sure you want to delete %d appointment?"
-msgstr[1] "Are you sure you want to delete %d appointments?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Are you sure you want to delete %d task?"
-msgstr[1] "Are you sure you want to delete %d tasks?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Are you sure you want to delete %d journal entry?"
-msgstr[1] "Are you sure you want to delete %d journal entries?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
msgid "The event could not be deleted due to a corba error"
msgstr "The event could not be deleted due to a corba error"
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
msgid "The task could not be deleted due to a corba error"
msgstr "The task could not be deleted due to a corba error"
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
msgid "The journal entry could not be deleted due to a corba error"
msgstr "The journal entry could not be deleted due to a corba error"
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
msgid "The item could not be deleted due to a corba error"
msgstr "The item could not be deleted due to a corba error"
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
msgid "The event could not be deleted because permission was denied"
msgstr "The event could not be deleted because permission was denied"
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
msgid "The task could not be deleted because permission was denied"
msgstr "The task could not be deleted because permission was denied"
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
msgid "The journal entry could not be deleted because permission was denied"
msgstr "The journal entry could not be deleted because permission was denied"
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
msgid "The item could not be deleted because permission was denied"
msgstr "The item could not be deleted because permission was denied"
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
msgid "The event could not be deleted due to an error"
msgstr "The event could not be deleted due to an error"
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
msgid "The task could not be deleted due to an error"
msgstr "The task could not be deleted due to an error"
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
msgid "The journal entry could not be deleted due to an error"
msgstr "The journal entry could not be deleted due to an error"
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
msgid "The item could not be deleted due to an error"
msgstr "The item could not be deleted due to an error"
@@ -4869,8 +4739,8 @@ msgstr "_Start time:"
#: calendar/gui/dialogs/meeting-page.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4897,7 +4767,7 @@ msgstr "_Delegate To..."
#: calendar/gui/dialogs/meeting-page.c:655
#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4905,7 +4775,7 @@ msgid "_Delete"
msgstr "_Delete"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:241
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "Attendee"
@@ -4941,14 +4811,14 @@ msgid "Member"
msgstr "Member"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
+#: calendar/gui/e-meeting-list-view.c:271
#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
#: mail/message-list.etspec.h:12
msgid "Status"
@@ -5119,7 +4989,7 @@ msgid "_No recurrence"
msgstr "_No recurrence"
#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
msgid "_Remove"
msgstr "_Remove"
@@ -5151,52 +5021,18 @@ msgstr "week(s)"
msgid "year(s)"
msgstr "year(s)"
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Discard Changes"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Save Event"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
msgid "Select destination"
msgstr "Select destination"
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
msgid "_Destination"
msgstr "_Destination"
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
msgid "Task List"
msgstr "Task List"
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "The meeting information has been created. Send it?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "The meeting information has changed. Send an updated version?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "The task assignment information has been created. Send it?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "The task information has changed. Send an updated version?"
-
#: calendar/gui/dialogs/task-details-page.c:406
msgid "Completed date is wrong"
msgstr "Completed date is wrong"
@@ -5216,7 +5052,7 @@ msgstr "Completed"
#: calendar/gui/dialogs/task-details-page.glade.h:5
#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:959
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
msgid "High"
msgstr "High"
@@ -5230,14 +5066,14 @@ msgstr "In Progress"
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:957
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
msgid "Low"
msgstr "Low"
#: calendar/gui/dialogs/task-details-page.glade.h:8
#: calendar/gui/e-cal-component-preview.c:251
#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:958
+#: mail/message-list.c:959
msgid "Normal"
msgstr "Normal"
@@ -5294,8 +5130,8 @@ msgstr "Con_fidential"
#: calendar/gui/dialogs/task-page.glade.h:6
#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr "Description:"
@@ -5458,7 +5294,7 @@ msgstr "Due Date:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:944
msgid "Status:"
msgstr "Status:"
@@ -5558,7 +5394,7 @@ msgstr "Open _Web Page"
#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "_Save As..."
@@ -5581,8 +5417,8 @@ msgstr "C_ut"
#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1649 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
msgid "_Copy"
@@ -5730,9 +5566,9 @@ msgstr "Start Date"
#. This is the default filename used for temporary file creation
#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-meeting-list-view.c:145
+#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
#: camel/camel-tcp-stream-openssl.c:631
@@ -5758,13 +5594,13 @@ msgid "Assigned"
msgstr "Assigned"
#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "Yes"
#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "No"
@@ -5848,102 +5684,102 @@ msgstr "%d %b"
msgid "%02i minute divisions"
msgstr "%02i minute divisions"
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:586
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:597
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "Every day"
msgstr[1] "Every %d days"
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:602
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "Every week"
msgstr[1] "Every %d weeks"
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:604
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "Every week on "
msgstr[1] "Every %d weeks on "
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:612
msgid " and "
msgstr " and "
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:619
#, c-format
msgid "The %s day of "
msgstr "The %s day of "
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:632
#, c-format
msgid "The %s %s of "
msgstr "The %s %s of "
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:639
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "every %d month"
msgstr[1] "every %d month"
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:643
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "Every %d year"
msgstr[1] "Every %d years"
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:654
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " a total of %d time"
msgstr[1] " a total of %d times"
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:663
msgid ", ending on "
msgstr ", ending on "
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:687
msgid "<b>Starts:</b> "
msgstr "<b>Starts:</b> "
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:697
msgid "<b>Ends:</b> "
msgstr "<b>Ends:</b> "
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:717
msgid "<b>Completed:</b> "
msgstr "<b>Completed:</b> "
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:727
msgid "<b>Due:</b> "
msgstr "<b>Due:</b> "
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
msgid "iCalendar Information"
msgstr "iCalendar Information"
#. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:782
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
msgid "An unknown person"
msgstr "An unknown person"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:904
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -5951,301 +5787,301 @@ msgstr ""
"<br> Please review the following information, and then select an action from "
"the menu below."
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:919
msgid "<i>None</i>"
msgstr "<i>None</i>"
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "Accepted"
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "Declined"
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
msgid "Choose an action:"
msgstr "Choose an action:"
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1017
msgid "Update"
msgstr "Update"
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
+#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "OK"
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1045
msgid "Accept"
msgstr "Accept"
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1046
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1047
msgid "Decline"
msgstr "Decline"
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1071
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1084
msgid "Update respondent status"
msgstr "Update respondent status"
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1097
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Cancel"
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1186
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> has published meeting information."
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1187
msgid "Meeting Information"
msgstr "Meeting Information"
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1192
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> requests the presence of %s at a meeting."
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> requests your presence at a meeting."
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1195
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1199
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> wishes to add to an existing meeting."
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1200
msgid "Meeting Update"
msgstr "Meeting Update"
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1204
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> wishes to receive the latest meeting information."
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1205
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1212
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> has replied to a meeting request."
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1213
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1220
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> has cancelled a meeting."
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1221
msgid "Meeting Cancellation"
msgstr "Meeting Cancellation"
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> has sent an unintelligible message."
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1229
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1254
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> has published task information."
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1255
msgid "Task Information"
msgstr "Task Information"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1260
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> requests %s to perform a task."
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1262
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> requests you perform a task."
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1263
msgid "Task Proposal"
msgstr "Task Proposal"
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1267
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> wishes to add to an existing task."
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1268
msgid "Task Update"
msgstr "Task Update"
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1272
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> wishes to receive the latest task information."
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1273
msgid "Task Update Request"
msgstr "Task Update Request"
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1280
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> has replied to a task assignment."
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1281
msgid "Task Reply"
msgstr "Task Reply"
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1288
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> has cancelled a task."
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1289
msgid "Task Cancellation"
msgstr "Task Cancellation"
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1297
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1316
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> has published free/busy information."
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1317
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1321
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> requests your free/busy information."
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1322
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> has replied to a free/busy request."
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1327
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1332
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1407
msgid "The message does not appear to be properly formed"
msgstr "The message does not appear to be properly formed"
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1466
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1497
msgid "The attachment does not contain a valid calendar message"
msgstr "The attachment does not contain a valid calendar message"
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1529
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1763
msgid "Update complete\n"
msgstr "Update complete\n"
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "Attendee status can not be updated because the item no longer exists"
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1819
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "This response is not from a current attendee. Add as an attendee?"
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1831
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "Attendee status could not be updated because of an invalid status!\n"
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1850
msgid "There was an error on the CORBA system\n"
msgstr "There was an error on the CORBA system\n"
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1853
msgid "Object could not be found\n"
msgstr "Object could not be found\n"
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1856
msgid "You don't have the right permissions to update the calendar\n"
msgstr "You don't have the right permissions to update the calendar\n"
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1859
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1862
msgid "Attendee status could not be updated!\n"
msgstr "Attendee status could not be updated!\n"
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1893
msgid "Removal Complete"
msgstr "Removal Complete"
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
@@ -6291,7 +6127,7 @@ msgid "Chair Persons"
msgstr "Chair Persons"
#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:480
msgid "Required Participants"
msgstr "Required Participants"
@@ -6303,57 +6139,57 @@ msgstr "Optional Participants"
msgid "Resources"
msgstr "Resources"
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
msgid "Individual"
msgstr "Individual"
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
#: calendar/gui/e-meeting-store.c:109
msgid "Group"
msgstr "Group"
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
#: calendar/gui/e-meeting-store.c:111
msgid "Resource"
msgstr "Resource"
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
#: calendar/gui/e-meeting-store.c:113
msgid "Room"
msgstr "Room"
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
#: calendar/gui/e-meeting-store.c:142
msgid "Chair"
msgstr "Chair"
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
msgid "Required Participant"
msgstr "Required Participant"
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
#: calendar/gui/e-meeting-store.c:146
msgid "Optional Participant"
msgstr "Optional Participant"
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
#: calendar/gui/e-meeting-store.c:148
msgid "Non-Participant"
msgstr "Non-Participant"
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
msgid "Needs Action"
msgstr "Needs Action"
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr "Tentative"
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
#: calendar/gui/e-meeting-store.c:208
msgid "Delegated"
msgstr "Delegated"
@@ -6449,7 +6285,7 @@ msgstr "%d/%m/%Y"
msgid "Enter the password for %s"
msgstr "Enter the password for %s"
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2019
#, c-format
msgid ""
"Error on %s:\n"
@@ -6458,19 +6294,14 @@ msgstr ""
"Error on %s:\n"
" %s"
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "The task backend for '%s' has crashed."
-
#. FIXME Loading should be async
#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:680
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:703
#, c-format
msgid ""
"Error opening %s:\n"
@@ -6479,23 +6310,23 @@ msgstr ""
"Error opening %s:\n"
"%s"
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:724
msgid "Loading tasks"
msgstr "Loading tasks"
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:828
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:851
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:878
msgid "Expunging"
msgstr "Expunging"
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:954
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
@@ -6504,27 +6335,22 @@ msgstr "Expunging"
msgid "Tasks"
msgstr "Tasks"
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1877
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1896
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1919
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "The calendar backend for '%s' has crashed."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2890
msgid "Purging"
msgstr "Purging"
@@ -6984,7 +6810,7 @@ msgid_plural "%d tasks"
msgstr[0] "%d task"
msgstr[1] "%d tasks"
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
@@ -8798,12 +8624,12 @@ msgstr "Error executing filter search: %s: %s"
msgid "Unsupported operation: append message: for %s"
msgstr "Unsupported operation: append message: for %s"
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "Unsupported operation: search by expression: for %s"
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "Unsupported operation: search by uids: for %s"
@@ -8816,11 +8642,15 @@ msgstr "Moving messages"
msgid "Copying messages"
msgstr "Copying messages"
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Learning junk"
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Learning non-junk"
+
+#: camel/camel-folder.c:1701
msgid "Filtering new message(s)"
msgstr "Filtering new message(s)"
@@ -8897,7 +8727,7 @@ msgstr ""
#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr "Cancelled."
@@ -9274,7 +9104,7 @@ msgstr "The referenced credentials have expired."
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1243
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
@@ -9634,40 +9464,40 @@ msgstr "import keys: unimplemented"
msgid "export keys: unimplemented"
msgstr "export keys: unimplemented"
-#: camel/camel-store.c:214
+#: camel/camel-store.c:215
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Cannot get folder: Invalid operation on this store"
-#: camel/camel-store.c:244
+#: camel/camel-store.c:245
#, c-format
msgid "Cannot create folder `%s': folder exists"
msgstr "Cannot create folder `%s': folder exists"
-#: camel/camel-store.c:295
+#: camel/camel-store.c:299
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Cannot create folder: Invalid operation on this store"
-#: camel/camel-store.c:323
+#: camel/camel-store.c:327
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Cannot create folder: %s: folder exists"
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:391 camel/camel-vee-store.c:354
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:441 camel/camel-vee-store.c:390
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Cannot rename folder: %s: Invalid operation"
-#: camel/camel-store.c:811
+#: camel/camel-store.c:813
msgid "Trash"
msgstr "Trash"
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Junk"
@@ -9944,24 +9774,24 @@ msgstr "Address Book And Calendar"
msgid "Post Office Agent SOAP Port:"
msgstr "Post Office Agent SOAP Port:"
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
msgid "For accessing Novell Groupwise servers"
msgstr "For accessing Novell Groupwise servers"
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imap/camel-imap-provider.c:93
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
msgid "Password"
msgstr "Password"
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
#: camel/providers/imap/camel-imap-provider.c:95
#: camel/providers/imapp/camel-imapp-provider.c:67
msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10110,8 +9940,8 @@ msgstr "IMAP service for %s on %s"
#: camel/providers/imap4/camel-imap4-store.c:208
#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:572
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:140
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -10122,15 +9952,15 @@ msgid "Could not connect to %s (port %d): %s"
msgstr "Could not connect to %s (port %d): %s"
#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:554
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
msgstr "SSL unavailable"
#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/imap/camel-imap-store.c:846
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:137
#: camel/providers/nntp/camel-nntp-store.c:155
@@ -10148,8 +9978,8 @@ msgstr ""
"STARTTLS"
#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:711
#, 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"
@@ -10158,7 +9988,7 @@ msgstr "Failed to connect to IMAP server %s in secure mode: %s"
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
msgid "Unknown error"
msgstr "Unknown error"
@@ -10185,8 +10015,8 @@ 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:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1890
+#: camel/providers/imap/camel-imap-store.c:2268
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10264,12 +10094,12 @@ msgstr "IMAP server %s unexpectedly disconnected: %s"
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3201
msgid "Operation cancelled"
msgstr "Operation cancelled"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3204
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %s"
@@ -10333,13 +10163,6 @@ msgid "Unable to retrieve message: %s"
msgstr "Unable to retrieve message: %s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -10349,14 +10172,14 @@ msgstr ""
" %s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
msgid "No such message"
msgstr "No such message"
#: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/imap/camel-imap-folder.c:2622
#: camel/providers/nntp/camel-nntp-folder.c:238
msgid "This message is not currently available"
msgstr "This message is not currently available"
@@ -10366,7 +10189,24 @@ msgstr "This message is not currently available"
msgid "Fetching summary information for new messages"
msgstr "Fetching summary information for new messages"
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, 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:2471
+#, 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:2484
+#, 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:2660
msgid "Could not find message body in FETCH response."
msgstr "Could not find message body in FETCH response."
@@ -10424,43 +10264,43 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "For reading and storing mail on IMAP servers."
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr "SSL/TLS extension not supported."
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:712
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:849
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not connect with command \"%s\": %s"
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1275
#, 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:1252
+#: camel/providers/imap/camel-imap-store.c:1285
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1308
#: camel/providers/imapp/camel-imapp-store.c:344
#, 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:1289
+#: camel/providers/imap/camel-imap-store.c:1322
msgid "You didn't enter a password."
msgstr "You didn't enter a password."
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1351
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10471,18 +10311,18 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1872
+#: camel/providers/imap/camel-imap-store.c:2062
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1948
+#: camel/providers/imap/camel-imap-store.c:2329
msgid "The parent folder is not allowed to contain subfolders"
msgstr "The parent folder is not allowed to contain subfolders"
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:2003
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
@@ -10490,7 +10330,7 @@ msgstr "The parent folder is not allowed to contain subfolders"
msgid "Cannot create folder `%s': folder exists."
msgstr "Cannot create folder `%s': folder exists."
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2279
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
@@ -10672,8 +10512,25 @@ msgstr "Maildir append message cancelled"
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:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+" %s"
+msgstr ""
+"Cannot get message: %s from folder %s\n"
+" %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
msgid "Invalid message contents"
msgstr "Invalid message contents"
@@ -10763,24 +10620,14 @@ msgstr "Mail append cancelled"
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:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
msgid "The folder appears to be irrecoverably corrupted."
msgstr "The folder appears to be irrecoverably corrupted."
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
+msgstr "Message construction failed."
#: camel/providers/local/camel-mbox-store.c:176
#: camel/providers/local/camel-mbox-store.c:362
@@ -11297,7 +11144,7 @@ msgstr "Delete after %s day(s)"
msgid "Disable support for all POP3 extensions"
msgstr "Disable support for all POP3 extensions"
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
msgid "POP"
msgstr "POP"
@@ -11386,7 +11233,7 @@ msgid "No such folder `%s'."
msgstr "No such folder `%s'."
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
msgid "Sendmail"
msgstr "Sendmail"
@@ -11440,7 +11287,7 @@ msgstr "sendmail"
msgid "Mail delivery via the sendmail program"
msgstr "Mail delivery via the sendmail program"
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
msgid "SMTP"
msgstr "SMTP"
@@ -11724,19 +11571,19 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
msgid "attachment"
msgstr "attachment"
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
msgid "Remove selected items from the attachment list"
msgstr "Remove selected items from the attachment list"
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
msgid "Add attachment..."
msgstr "Add attachment..."
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
msgid "Attach a file to the message"
msgstr "Attach a file to the message"
@@ -11798,7 +11645,7 @@ msgstr "Untitled Message"
msgid "Open file"
msgstr "Open file"
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
msgid "Autogenerated"
msgstr "Autogenerated"
@@ -12472,11 +12319,11 @@ msgid "<b>Then</b>"
msgstr "<b>Then</b>"
#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
msgid "Select Folder"
msgstr "Select Folder"
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
msgid " "
msgstr " "
@@ -12532,7 +12379,7 @@ msgstr "ago"
msgid "months"
msgstr "months"
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
msgid "seconds"
msgstr "seconds"
@@ -12564,20 +12411,20 @@ msgstr "with all local folders"
msgid "years"
msgstr "years"
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
msgid "Important"
msgstr "Important"
#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
msgid "To Do"
msgstr "To Do"
#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
msgid "Later"
msgstr "Later"
@@ -13014,7 +12861,7 @@ msgid "Create New Folder"
msgstr "Create New Folder"
#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/mail-component.c:706
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
@@ -13038,12 +12885,12 @@ msgstr "Moving folder %s"
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: mail/em-folder-tree.c:848 mail/message-list.c:1560
+#: mail/em-folder-tree.c:848 mail/message-list.c:1561
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: mail/em-folder-tree.c:850 mail/message-list.c:1562
+#: mail/em-folder-tree.c:850 mail/message-list.c:1563
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
@@ -13061,12 +12908,12 @@ msgid "_Move to Folder"
msgstr "_Move to Folder"
#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1650
+#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
msgid "_Move"
msgstr "_Move"
-#: mail/em-folder-tree.c:961 mail/message-list.c:1652
+#: mail/em-folder-tree.c:961 mail/message-list.c:1653
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
@@ -13085,44 +12932,44 @@ msgstr "C_opy"
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
msgid "Create folder"
msgstr "Create folder"
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2477
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Rename the \"%s\" folder to:"
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2479
msgid "Rename Folder"
msgstr "Rename Folder"
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr "_View"
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2551
msgid "Open in _New Window"
msgstr "Open in _New Window"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2560
msgid "_New Folder..."
msgstr "_New Folder..."
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2563
msgid "_Rename"
msgstr "_Rename"
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "_Properties..."
#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
msgid "VFolders"
msgstr "VFolders"
@@ -13142,13 +12989,13 @@ msgstr "Loading..."
#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
+#: mail/mail-component.c:556
msgid "Mail"
msgstr "Mail"
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
#: ui/evolution-mail-message.xml.h:113
msgid "_Edit as New Message..."
msgstr "_Edit as New Message..."
@@ -13161,17 +13008,17 @@ msgstr "_Print"
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "Reply to _List"
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "Reply to _All"
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
#: ui/evolution-mail-message.xml.h:114
msgid "_Forward"
msgstr "_Forward"
@@ -13273,12 +13120,12 @@ msgid "Filter on _Mailing List"
msgstr "Filter on _Mailing List"
#. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "Default"
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
msgid "Print Message"
msgstr "Print Message"
@@ -13322,7 +13169,7 @@ msgstr "Bcc"
msgid "Date"
msgstr "Date"
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
msgid "Newsgroups"
msgstr "Newsgroups"
@@ -13572,7 +13419,7 @@ msgstr "Once per week"
msgid "Once per month"
msgstr "Once per month"
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -13584,47 +13431,47 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "Unable to create new folder `%s': %s"
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "Unable to copy folder `%s' to `%s': %s"
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "Unable to scan for existing mailboxes at `%s': %s"
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "Unable to open old POP keep-on-server data `%s': %s"
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Failed to create local mail storage `%s': %s"
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "Unable to create local mail folders at `%s': %s"
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -13632,36 +13479,36 @@ msgstr ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
msgid "Save As..."
msgstr "Save As..."
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
#, c-format
msgid "untitled_image.%s"
msgstr "untitled_image.%s"
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
msgid "Set as _Background"
msgstr "Set as _Background"
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
msgid "_Reply to sender"
msgstr "_Reply to sender"
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
msgid "_Open Link in Browser"
msgstr "_Open Link in Browser"
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
msgid "Se_nd message to..."
msgstr "Se_nd message to..."
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
msgid "_Add to Addressbook"
msgstr "_Add to Addressbook"
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
#, c-format
msgid "Open in %s..."
msgstr "Open in %s..."
@@ -14233,7 +14080,7 @@ msgstr "Evolution Mail preferences control"
msgid "Mail Accounts"
msgstr "Mail Accounts"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
msgid "Mail Preferences"
msgstr "Mail Preferences"
@@ -14456,15 +14303,15 @@ msgstr ""
msgid "%s License Agreement"
msgstr "%s Licence Agreement"
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
msgid "_Host:"
msgstr "_Host:"
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
msgid "User_name:"
msgstr "User_name:"
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
msgid "_Path:"
msgstr "_Path:"
@@ -14492,66 +14339,66 @@ msgstr "%s mailing list"
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: mail/mail-component.c:461
+#: mail/mail-component.c:463
#, c-format
msgid "%d deleted"
msgstr "%d deleted"
-#: mail/mail-component.c:463
+#: mail/mail-component.c:465
#, c-format
msgid "%d junk"
msgstr "%d junk"
-#: mail/mail-component.c:486
+#: mail/mail-component.c:488
#, c-format
msgid "%d drafts"
msgstr "%d drafts"
-#: mail/mail-component.c:488
+#: mail/mail-component.c:490
#, c-format
msgid "%d sent"
msgstr "%d sent"
-#: mail/mail-component.c:490
+#: mail/mail-component.c:492
#, c-format
msgid "%d unsent"
msgstr "%d unsent"
-#: mail/mail-component.c:494
+#: mail/mail-component.c:496
#, c-format
msgid "%d total"
msgstr "%d total"
-#: mail/mail-component.c:496
+#: mail/mail-component.c:498
#, c-format
msgid ", %d unread"
msgstr ", %d unread"
-#: mail/mail-component.c:653
+#: mail/mail-component.c:658
msgid "New Mail Message"
msgstr "New Mail Message"
-#: mail/mail-component.c:654
+#: mail/mail-component.c:659
msgid "_Mail Message"
msgstr "_Mail Message"
-#: mail/mail-component.c:655
+#: mail/mail-component.c:660
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: mail/mail-component.c:661
+#: mail/mail-component.c:666
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: mail/mail-component.c:662
+#: mail/mail-component.c:667
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: mail/mail-component.c:663
+#: mail/mail-component.c:668
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: mail/mail-component.c:795
+#: mail/mail-component.c:800
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
@@ -14563,7 +14410,7 @@ msgstr "Checking Service"
msgid "Connecting to server..."
msgstr "Connecting to server..."
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
msgid "Identity"
msgstr "Identity"
@@ -14578,7 +14425,7 @@ msgstr ""
"information in email you send."
#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
msgid "Receiving Mail"
msgstr "Receiving Mail"
@@ -14594,7 +14441,7 @@ msgstr ""
msgid "Please select among the following options"
msgstr "Please select among the following options"
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
msgid "Sending Mail"
msgstr "Sending Mail"
@@ -14606,7 +14453,7 @@ msgstr ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
msgid "Account Management"
msgstr "Account Management"
@@ -14624,227 +14471,231 @@ msgstr ""
"name for this account in the space below. This name will be used for display "
"purposes only."
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
msgid " Ch_eck for Supported Types "
msgstr " Ch_eck for Supported Types "
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
msgid "<b>Preview</b>"
msgstr "<b>Preview</b>"
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
msgid "<b>SSL is not supported in this build of evolution</b>"
msgstr "<b>SSL is not supported in this build of evolution</b>"
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
msgid "<b>S_ignatures</b>"
msgstr "<b>S_ignatures</b>"
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
msgid "<b>_Languages</b>"
msgstr "<b>_Languages</b>"
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr "<small>This will make the the filter more reliable, but slower</small>"
+
+#: mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">Account Information</span>"
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Alerts</span>"
msgstr "<span weight=\"bold\">Alerts</span>"
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr "<span weight=\"bold\">Authentication Type</span>"
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Authentication</span>"
msgstr "<span weight=\"bold\">Authentication</span>"
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
msgid "<span weight=\"bold\">Checking for New Mail</span>"
msgstr "<span weight=\"bold\">Checking for New Mail</span>"
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr "<span weight=\"bold\">Composing Messages</span>"
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
msgid "<span weight=\"bold\">Configuration</span>"
msgstr "<span weight=\"bold\">Configuration</span>"
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr "<span weight=\"bold\">Default Behavior</span>"
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr "<span weight=\"bold\">Delete Mail</span>"
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Filter Options</span>"
msgstr "<span weight=\"bold\">Filter Options</span>"
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">General</span>"
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr "<span weight=\"bold\">Labels and Colours</span>"
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr "<span weight=\"bold\">Loading Images</span>"
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
msgid "<span weight=\"bold\">Message Display</span>"
msgstr "<span weight=\"bold\">Message Display</span>"
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr "<span weight=\"bold\">Message Fonts</span>"
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "<span weight=\"bold\">New Mail Notification</span>"
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr "<span weight=\"bold\">Optional Information</span>"
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Options</span>"
msgstr "<span weight=\"bold\">Options</span>"
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">Printed Fonts</span>"
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">Required Information</span>"
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">Security</span>"
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">Server Configuration</span>"
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
msgid "A_lso encrypt to self when sending encrypted mail"
msgstr "A_lso encrypt to self when sending encrypted mail"
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
msgid "Account Editor"
msgstr "Account Editor"
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
msgid "Add Ne_w Signature..."
msgstr "Add Ne_w Signature..."
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
msgid "Add _Script"
msgstr "Add _Script"
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr "Al_ways encrypt to myself when sending encrypted mail"
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
msgid "Alway_s carbon-copy (cc) to:"
msgstr "Alway_s carbon-copy (cc) to:"
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "Always _blind carbon-copy (bcc) to:"
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
msgid "Always _sign outgoing messages when using this account"
msgstr "Always _sign outgoing messages when using this account"
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
msgid "Always _trust keys in my keyring when encrypting"
msgstr "Always _trust keys in my keyring when encrypting"
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
msgid "Attach original message"
msgstr "Attach original message"
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "Attachment"
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
msgid "Automatically _insert smiley images"
msgstr "Automatically _insert smiley images"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
msgid "Automatically check for _new mail every"
msgstr "Automatically check for _new mail every"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
msgid "Baltic (ISO-8859-13)"
msgstr "Baltic (ISO-8859-13)"
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
msgid "Baltic (ISO-8859-4)"
msgstr "Baltic (ISO-8859-4)"
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
msgid "Beep w_hen new mail arrives"
msgstr "Beep w_hen new mail arrives"
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
msgid "C_haracter set:"
msgstr "C_haracter set:"
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
msgid "Ch_eck for Supported Types "
msgstr "Ch_eck for Supported Types "
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
+msgstr "Check _incoming mail for junk"
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
msgid "Check spelling while I _type"
msgstr "Check spelling while I _type"
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
msgid "Checks incoming mail messages to be Junk"
msgstr "Checks incoming mail messages to be Junk"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
msgid "Color for _misspelled words:"
msgstr "Colour for _misspelled words:"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
msgid "Colors"
msgstr "Colours"
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
msgid "Confirm _when expunging a folder"
msgstr "Confirm _when expunging a folder"
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -14860,107 +14711,111 @@ msgstr ""
"\n"
"Click \"Apply\" to save your settings."
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
msgid "De_fault"
msgstr "De_fault"
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
msgid "Default character e_ncoding:"
msgstr "Default character e_ncoding:"
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
msgid "Defaults"
msgstr "Defaults"
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
msgid "Do not quote original message"
msgstr "Do not quote original message"
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "Don't sign _meeting requests (for Outlook compatibility)"
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "Done"
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
msgid "Drafts _Folder:"
msgstr "Drafts _Folder:"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
msgid "Email Accounts"
msgstr "Email Accounts"
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
msgid "Email _Address:"
msgstr "Email _Address:"
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
msgid "Empty trash folders on e_xit"
msgstr "Empty trash folders on e_xit"
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
msgid "Encry_ption certificate:"
msgstr "Encry_ption certificate:"
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
msgid "Evolution Account Assistant"
msgstr "Evolution Account Assistant"
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
msgid "Execute Command..."
msgstr "Execute Command..."
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
msgid "Fi_xed-width:"
msgstr "Fi_xed-width:"
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
msgid "Font Properties"
msgstr "Font Properties"
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
msgid "Format messages in _HTML"
msgstr "Format messages in _HTML"
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
msgid "HTML Mail"
msgstr "HTML Mail"
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
msgid "Headers"
msgstr "Headers"
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
msgid "Highlight _quotations with"
msgstr "Highlight _quotations with"
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
msgid "IMAPv4 "
msgstr "IMAPv4 "
#: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr "I_nclude remote tests"
+
+#: mail/mail-config.glade.h:94
msgid "Inline"
msgstr "Inline"
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
msgid "Kerberos "
msgstr "Kerberos "
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
msgid "Mail Configuration"
msgstr "Mail Configuration"
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
msgid "Mailbox location"
msgstr "Mailbox location"
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
msgid "Message Composer"
msgstr "Message Composer"
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
@@ -14968,131 +14823,131 @@ msgstr ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
msgid "Or_ganization:"
msgstr "Or_ganisation:"
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG _Key ID:"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
msgid "Play sound file when new mail arri_ves"
msgstr "Play sound file when new mail arri_ves"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
msgid "Qmail maildir "
msgstr "Qmail maildir "
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
msgid "Quote original message"
msgstr "Quote original message"
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
msgid "Quoted"
msgstr "Quoted"
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
msgid "Re_member password"
msgstr "Re_member password"
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
msgid "Re_ply-To:"
msgstr "Re_ply-To:"
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
msgid "Receiving Email"
msgstr "Receiving Email"
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
msgid "Receiving Options"
msgstr "Receiving Options"
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
msgid "Remember _password"
msgstr "Remember _password"
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
msgid "S_tandard Font:"
msgstr "S_tandard Font:"
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
msgid "Security"
msgstr "Security"
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
msgid "Select HTML fixed width font for printing"
msgstr "Select HTML fixed width font for printing"
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
msgid "Select HTML variable width font for printing"
msgstr "Select HTML variable width font for printing"
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
msgid "Select..."
msgstr "Select..."
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
msgid "Sending Email"
msgstr "Sending Email"
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
msgid "Sent _Messages Folder:"
msgstr "Sent _Messages Folder:"
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
msgid "Server _Type: "
msgstr "Server _Type: "
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
msgid "Si_gning certificate:"
msgstr "Si_gning certificate:"
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
msgid "Signat_ure:"
msgstr "Signat_ure:"
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
msgid "Signatures"
msgstr "Signatures"
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
msgid "Specify _filename:"
msgstr "Specify _filename:"
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
msgid "Spell Checking"
msgstr "Spell Checking"
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
msgid "Standard Unix mbox"
msgstr "Standard Unix mbox"
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
msgid "T_erminal Font:"
msgstr "T_erminal Font:"
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
msgid "T_ype: "
msgstr "T_ype: "
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -15102,7 +14957,7 @@ msgstr ""
"signature. The name you specify will be used\n"
"for display purposes only. "
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
msgid ""
"This page allows you to configure spell checking behavior and language. The "
"list of languages here reflects only the languages for which you have a "
@@ -15112,7 +14967,7 @@ msgstr ""
"list of languages here reflects only the languages for which you have a "
"dictionary installed."
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -15120,15 +14975,11 @@ msgstr ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Use _Daemon"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
msgid "V_ariable-width:"
msgstr "V_ariable-width:"
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -15138,87 +14989,83 @@ msgstr ""
"\n"
"Click \"Forward\" to begin. "
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
msgid "_Add Signature"
msgstr "_Add Signature"
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
msgid "_Always load images from the Internet"
msgstr "_Always load images from the Internet"
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
msgid "_Digitally sign outgoing messages (by default)"
msgstr "_Digitally sign outgoing messages (by default)"
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
msgid "_Do not notify me when new mail arrives"
msgstr "_Do not notify me when new mail arrives"
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
msgid "_Enable"
msgstr "_Enable"
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
msgid "_Encrypt outgoing messages (by default)"
msgstr "_Encrypt outgoing messages (by default)"
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
msgid "_Forward style:"
msgstr "_Forward style:"
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
msgid "_Load images if sender is in address book"
msgstr "_Load images if sender is in address book"
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "_Local Tests Only"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
msgid "_Make this my default account"
msgstr "_Make this my default account"
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
msgid "_Mark messages as read after"
msgstr "_Mark messages as read after"
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
msgid "_Never load images from the Internet"
msgstr "_Never load images from the Internet"
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "_Prompt when sending HTML messages to contacts that don't want them"
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
msgid "_Prompt when sending messages with an empty subject line"
msgstr "_Prompt when sending messages with an empty subject line"
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
msgid "_Reply style:"
msgstr "_Reply style:"
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
msgid "_Script:"
msgstr "_Script:"
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
msgid "_Show animated images"
msgstr "_Show animated images"
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
msgid "_Use Secure Connection (SSL):"
msgstr "_Use Secure Connection (SSL):"
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
msgid "color"
msgstr "colour"
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
msgid "description"
msgstr "description"
@@ -15403,8 +15250,8 @@ msgstr ""
#. mail:camel-exception primary
#: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
-msgstr "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
+msgstr "Your message with the subject \"{0}\" was not delivered."
#. mail:camel-exception secondary
#: mail/mail-errors.xml.h:59
@@ -15749,29 +15596,25 @@ msgstr "_Overwrite"
msgid "_Append"
msgstr "_Append"
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:791
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Working"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
msgid "Filtering Folder"
msgstr "Filtering Folder"
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
msgid "Fetching Mail"
msgstr "Fetching Mail"
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Failed to apply outgoing filters: %s"
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -15780,115 +15623,115 @@ msgstr ""
"Failed to append to %s: %s\n"
"Appending to local `Sent' folder instead."
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "Failed to append to local `Sent' folder: %s"
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
#, c-format
msgid "Sending message %d of %d"
msgstr "Sending message %d of %d"
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "Failed to send %d of %d messages"
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
msgid "Complete."
msgstr "Complete."
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
msgid "Saving message to folder"
msgstr "Saving message to folder"
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
#, c-format
msgid "Moving messages to %s"
msgstr "Moving messages to %s"
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
#, c-format
msgid "Copying messages to %s"
msgstr "Copying messages to %s"
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
msgid "Forwarded messages"
msgstr "Forwarded messages"
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
#, c-format
msgid "Opening folder %s"
msgstr "Opening folder %s"
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
#, c-format
msgid "Opening store %s"
msgstr "Opening store %s"
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
#, c-format
msgid "Removing folder %s"
msgstr "Removing folder %s"
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
#, c-format
msgid "Storing folder '%s'"
msgstr "Storing folder '%s'"
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Expunging and storing account '%s'"
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
#, c-format
msgid "Storing account '%s'"
msgstr "Storing account '%s'"
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
msgid "Refreshing folder"
msgstr "Refreshing folder"
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
msgid "Expunging folder"
msgstr "Expunging folder"
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Emptying trash in '%s'"
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
msgid "Local Folders"
msgstr "Local Folders"
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
#, c-format
msgid "Retrieving message %s"
msgstr "Retrieving message %s"
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "Retrieving %d message"
msgstr[1] "Retreiving %d messages"
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "Saving %d message"
msgstr[1] "Saving %d messages"
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -15897,7 +15740,7 @@ msgstr ""
"Unable to create output file: %s\n"
" %s"
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -15906,11 +15749,11 @@ msgstr ""
"Error saving messages to: %s:\n"
" %s"
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
msgid "Saving attachment"
msgstr "Saving attachment"
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -15919,17 +15762,17 @@ msgstr ""
"Cannot create output file: %s:\n"
" %s"
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
#, c-format
msgid "Could not write data: %s"
msgstr "Could not write data: %s"
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
#, c-format
msgid "Disconnecting from %s"
msgstr "Disconnecting from %s"
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
#, c-format
msgid "Reconnecting to %s"
msgstr "Reconnecting to %s"
@@ -15993,24 +15836,24 @@ msgstr "Updating..."
msgid "Waiting..."
msgstr "Waiting..."
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
msgid "User canceled operation."
msgstr "User cancelled operation."
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
#, c-format
msgid "Enter Password for %s"
msgstr "Enter Password for %s"
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
msgid "Enter Password"
msgstr "Enter Password"
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
msgid "_Remember this password"
msgstr "_Remember this password"
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
@@ -16065,79 +15908,79 @@ msgstr "Updating vFolders for '%s:%s'"
msgid "Updating vFolders for '%s'"
msgstr "Updating vFolders for '%s'"
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
msgid "vFolders"
msgstr "vFolders"
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
msgid "Edit VFolder"
msgstr "Edit VFolder"
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
msgid "New VFolder"
msgstr "New VFolder"
-#: mail/message-list.c:947
+#: mail/message-list.c:948
msgid "Unseen"
msgstr "Unseen"
-#: mail/message-list.c:948
+#: mail/message-list.c:949
msgid "Seen"
msgstr "Seen"
-#: mail/message-list.c:949
+#: mail/message-list.c:950
msgid "Answered"
msgstr "Answered"
-#: mail/message-list.c:950
+#: mail/message-list.c:951
msgid "Multiple Unseen Messages"
msgstr "Multiple Unseen Messages"
-#: mail/message-list.c:951
+#: mail/message-list.c:952
msgid "Multiple Messages"
msgstr "Multiple Messages"
-#: mail/message-list.c:955
+#: mail/message-list.c:956
msgid "Lowest"
msgstr "Lowest"
-#: mail/message-list.c:956
+#: mail/message-list.c:957
msgid "Lower"
msgstr "Lower"
-#: mail/message-list.c:960
+#: mail/message-list.c:961
msgid "Higher"
msgstr "Higher"
-#: mail/message-list.c:961
+#: mail/message-list.c:962
msgid "Highest"
msgstr "Highest"
-#: mail/message-list.c:1284
+#: mail/message-list.c:1285
msgid "?"
msgstr "?"
-#: mail/message-list.c:1291
+#: mail/message-list.c:1292
msgid "Today %l:%M %p"
msgstr "Today %l:%M %p"
-#: mail/message-list.c:1300
+#: mail/message-list.c:1301
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: mail/message-list.c:1312
+#: mail/message-list.c:1313
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:1320
+#: mail/message-list.c:1321
msgid "%b %d %l:%M %p"
msgstr "%d %b %l:%M %p"
-#: mail/message-list.c:1322
+#: mail/message-list.c:1323
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: mail/message-list.c:3305
+#: mail/message-list.c:3321
msgid "Generating message list"
msgstr "Generating message list"
@@ -16316,23 +16159,23 @@ msgstr "Brought to you by"
msgid "%ld KB"
msgstr "%ld KB"
-#: shell/e-shell.c:744
+#: shell/e-shell.c:743
msgid "Uknown system error."
msgstr "Uknown system error."
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1100
msgid "Invalid arguments"
msgstr "Invalid arguments"
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1102
msgid "Cannot register on OAF"
msgstr "Cannot register on OAF"
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1104
msgid "Configuration Database not found"
msgstr "Configuration Database not found"
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1106
msgid "Generic error"
msgstr "Generic error"
@@ -16577,43 +16420,6 @@ msgstr "Checkbox"
msgid "New"
msgstr "New"
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Unknown error."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-
#: shell/evolution-test-component.c:140
msgid "New Test"
msgstr "New Test"
@@ -17018,6 +16824,10 @@ msgstr ""
"Issued by:\n"
" Subject: %s\n"
+#: smime/gui/e-cert-selector.c:169
+msgid "Select certificate"
+msgstr "Select certificate"
+
#: smime/gui/smime-ui.glade.h:1
msgid "<Not Part of Certificate>"
msgstr "<Not Part of Certificate>"
@@ -17380,7 +17190,7 @@ msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
msgid "Certificate already exists"
msgstr "Certificate already exists"
@@ -18865,7 +18675,7 @@ msgid "With _Status"
msgstr "With _Status"
#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
msgid "UTC"
msgstr "UTC"
@@ -19019,26 +18829,26 @@ msgstr "Other..."
msgid "..."
msgstr "..."
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
msgid "Evolution Error"
msgstr "Evolution Error"
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
msgid "Evolution Warning"
msgstr "Evolution Warning"
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
msgid "Evolution Information"
msgstr "Evolution Information"
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
msgid "Evolution Query"
msgstr "Evolution Query"
#. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
#, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19178,16 +18988,203 @@ msgstr "Cannot save file \"{0}\"."
msgid "Cannot open file \"{0}\"."
msgstr "Cannot open file \"{0}\"."
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Failed to connect to LDAP server"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Failed to authenticate with LDAP server"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Could not perform query on Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "The server responded with no supported search bases"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "This server does not support LDAPv3 schema information"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Error retrieving schema information"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Server did not respond with valid schema information"
+
+#~ msgid "Job title:"
+#~ msgstr "Job title:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Category editor not available."
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Do you want to save changes?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Error saving %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Can not load URI"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Are you sure you want to cancel and delete this meeting?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Are you sure you want to cancel and delete this task?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Are you sure you want to cancel and delete this journal entry?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Are you sure you want to delete the appointment `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Are you sure you want to delete this untitled appointment?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Are you sure you want to delete the task `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Are you sure you want to delete this untitled task?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Are you sure you want to delete the journal entry `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Are you sure want to delete this untitled journal entry?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Are you sure you want to delete %d appointment?"
+#~ msgstr[1] "Are you sure you want to delete %d appointments?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Are you sure you want to delete %d task?"
+#~ msgstr[1] "Are you sure you want to delete %d tasks?"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Are you sure you want to delete %d journal entry?"
+#~ msgstr[1] "Are you sure you want to delete %d journal entries?"
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Discard Changes"
+
+#~ msgid "Save Event"
+#~ msgstr "Save Event"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "The meeting information has been created. Send it?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "The meeting information has changed. Send an updated version?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "The task assignment information has been created. Send it?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "The task information has changed. Send an updated version?"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "The task backend for '%s' has crashed."
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "The calendar backend for '%s' has crashed."
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "Learning junk and/or non junk message(s)"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Check _Incoming Mail"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Use _Daemon"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "_Local Tests Only"
+
+#~ msgid "Working"
+#~ msgstr "Working"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+
#, fuzzy
#~ msgid ""
#~ "The following entries are invalid:\n"