aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2003-11-07 15:05:28 +0800
committerJP Rosevear <jpr@src.gnome.org>2003-11-07 15:05:28 +0800
commit45d9800e919681b5b2027c66f48e390eda6ed234 (patch)
treec29f0625a9d8fb10dfaf3a7225241d1a93beef91 /po/en_GB.po
parent1b761f0cb765c1516de5e3d0d2a519673582fec8 (diff)
downloadgsoc2013-evolution-45d9800e919681b5b2027c66f48e390eda6ed234.tar.gz
gsoc2013-evolution-45d9800e919681b5b2027c66f48e390eda6ed234.tar.zst
gsoc2013-evolution-45d9800e919681b5b2027c66f48e390eda6ed234.zip
update
2003-11-07 JP Rosevear <jpr@ximian.com> * POTFILES.in: update svn path=/trunk/; revision=23209
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po2086
1 files changed, 841 insertions, 1245 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 24eefb6b32..ac2cd771b5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2003-10-30 16:28-0500\n"
+"POT-Creation-Date: 2003-11-07 01:11-0500\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
"Language-Team: \n"
@@ -13,547 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: addressbook/backend/ebook/e-book.c:214
-msgid "e_book_add_contact called on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:221
-#: addressbook/backend/ebook/e-book.c:330
-#: addressbook/backend/ebook/e-book.c:412
-#: addressbook/backend/ebook/e-book.c:511
-#: addressbook/backend/ebook/e-book.c:620
-#: addressbook/backend/ebook/e-book.c:701
-#: addressbook/backend/ebook/e-book.c:801
-#: addressbook/backend/ebook/e-book.c:853
-#: addressbook/backend/ebook/e-book.c:946
-#: addressbook/backend/ebook/e-book.c:1075
-#: addressbook/backend/ebook/e-book.c:1173
-#: addressbook/backend/ebook/e-book.c:1397
-msgid "book busy"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:248
-msgid "Corba exception making Book::addContact call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:323
-msgid "e_book_commit_contact called on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:357
-msgid "Corba exception making Book::modifyContact call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:405
-msgid "e_book_get_supported_fields on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:434
-msgid "Corba exception making Book::getSupportedFields call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:504
-msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:534
-msgid "Corba exception making Book::getSupportedAuthMethods call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:613
-msgid "e_book_authenticate_user on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:646
-msgid "Corba exception making Book::authenticateUser call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:694
-msgid "e_book_get_contact on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:724
-msgid "Corba exception making Book::getContact call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:794
-msgid "e_book_remove_contact on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:846
-msgid "e_book_remove_contacts on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:885
-msgid "Corba exception making Book::removeContacts call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:939
-msgid "e_book_get_book_view on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:990
-msgid "Corba exception making Book::getBookView call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1068
-msgid "e_book_get_contacts on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1103
-msgid "Corba exception making Book::getContactList call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1166
-msgid "e_book_get_changes on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1197
-msgid "Corba exception making Book::getChanges call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1308
-msgid "e_book_cancel: there is no current operation"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1327
-msgid "Corba exception making Book::cancelOperation call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1342
-msgid "e_book_cancel: couldn't cancel"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1390
-msgid "e_book_remove on book before e_book_load_uri"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1419
-msgid "Corba exception making Book::remove call"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1642
-#: addressbook/backend/ebook/e-book.c:1736
-#, c-format
-msgid "e_book_load_uri: no factories available for uri `%s'"
-msgstr ""
-
-#: addressbook/backend/ebook/e-book.c:1656
-msgid "e_book_load_uri: Could not create EBookListener"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:90
-msgid "Unique ID"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr ""
-
-#. Name fields
-#. FN isn't really a structured field - we use a getter/setter
-#. so we can set the N property (since evo 1.4 works fine with
-#. vcards that don't even have a N attribute. *sigh*)
-#: addressbook/backend/ebook/e-contact.c:97
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:98
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:99
-msgid "Given Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:100
-msgid "Family Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:101
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr ""
-
-#. Address fields
-#: addressbook/backend/ebook/e-contact.c:104
-#, fuzzy
-msgid "Address List"
-msgstr "Colours"
-
-#: addressbook/backend/ebook/e-contact.c:105
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:106
-#: addressbook/gui/widgets/eab-contact-display.c:222
-#, fuzzy
-msgid "Work Address"
-msgstr "Colours"
-
-#: addressbook/backend/ebook/e-contact.c:107
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:109
-msgid "Home Address Label"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:110
-msgid "Work Address Label"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:111
-msgid "Other Address Label"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:113
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Assistant Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:114
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Business Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:115
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Business Phone 2"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:116
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:117
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Callback Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:118
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Car Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:119
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-msgid "Company Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:120
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:121
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Home Phone 2"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:122
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:123
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:124
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Mobile Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:125
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Other Phone"
-msgstr ""
-
-#. XXX
-#: addressbook/backend/ebook/e-contact.c:126
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Other Fax"
-msgstr ""
-
-#. XXX
-#: addressbook/backend/ebook/e-contact.c:127
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Pager"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:128
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-msgid "Primary Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:129
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "Radio"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:130
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Telex"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:131
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr ""
-
-#. Email fields
-#: addressbook/backend/ebook/e-contact.c:134
-msgid "Email List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:135
-msgid "Email 1"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:136
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-#: addressbook/gui/widgets/eab-popup-control.c:460
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:137
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-#: addressbook/gui/widgets/eab-popup-control.c:470
-msgid "Email 3"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:138 mail/em-format-html.c:1381
-msgid "Mailer"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:139
-msgid "Wants HTML Mail"
-msgstr ""
-
-#. Instant messaging fields
-#: addressbook/backend/ebook/e-contact.c:142
-msgid "AIM Screen Name List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:143
-msgid "Jabber Id List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:144
-msgid "Yahoo! Screen Name List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:145
-msgid "MSN Screen Name List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:146
-msgid "ICQ Id List"
-msgstr ""
-
-#. Organizational fields
-#: addressbook/backend/ebook/e-contact.c:149
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-contact.c:150
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-contact.c:151
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:153
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:154
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:155
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:156
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr ""
-
-#. Web fields
-#: addressbook/backend/ebook/e-contact.c:159
-msgid "Homepage URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:160
-msgid "Weblog URL"
-msgstr ""
-
-#. Photo/Logo
-#: addressbook/backend/ebook/e-contact.c:163
-msgid "Photo"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:164
-#, fuzzy
-msgid "Logo"
-msgstr "Colours"
-
-#: addressbook/backend/ebook/e-contact.c:168
-msgid "Category List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:169
-#: addressbook/backend/ebook/e-contact.c:171
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
-#. Collaboration fields
-#: addressbook/backend/ebook/e-contact.c:175
-msgid "Calendar URI"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:176
-msgid "Free/Busy URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:177
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Colours"
-
-#. Misc fields
-#: addressbook/backend/ebook/e-contact.c:180
-msgid "Spouse's Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:181
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:183
-msgid "Birth Date"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:184
-msgid "Anniversary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:186 ui/evolution-calendar.xml.h:21
-msgid "List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-contact.c:187
-msgid "List Show Addresses"
-msgstr ""
-
-#: addressbook/backend/ebook/e-destination.c:709
-#: addressbook/util/eab-destination.c:675
-msgid "Unnamed List"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-#, fuzzy
-msgid "Evolution LDIF importer factory"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:3
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-file.c:399
-#: addressbook/backend/pas/pas-backend-vcf.c:102
-msgid "Loading..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-file.c:401
-#: addressbook/backend/pas/pas-backend-ldap.c:2766
-#: addressbook/backend/pas/pas-backend-vcf.c:104
-msgid "Searching..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:599
-msgid "Using Distinguished Name (DN)"
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:602
-#, fuzzy
-msgid "Using Email Address"
-msgstr "Synchronising \"%s\""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:746
-#, fuzzy
-msgid "Reconnecting to LDAP server..."
-msgstr "Synchronise \"%s\""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:1248
-#, fuzzy
-msgid "Adding contact to LDAP server..."
-msgstr "Synchronise \"%s\""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:1337
-#, fuzzy
-msgid "Removing contact from LDAP server..."
-msgstr "Synchronise \"%s\""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:1537
-#: addressbook/backend/pas/pas-backend-ldap.c:1540
-#, fuzzy
-msgid "Modifying contact from LDAP server..."
-msgstr "Synchronise \"%s\""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:2689
-msgid "Receiving LDAP search results..."
-msgstr ""
-
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
-msgid "Error performing search"
-msgstr ""
-
#: addressbook/conduit/address-conduit.c:272
msgid "Default Sync Address:"
msgstr ""
@@ -846,7 +305,7 @@ msgid "Addressbook Sources"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
msgid "Always"
msgstr ""
@@ -906,7 +365,7 @@ msgid "LDAP Configuration Assistant"
msgstr "Cannot initialise the Evolution shell."
#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
msgid "Never"
msgstr ""
@@ -929,7 +388,7 @@ msgid "S_earch scope: "
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:708
+#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
#: calendar/gui/gnome-cal.c:587
msgid "Searching"
msgstr ""
@@ -1115,7 +574,7 @@ msgid "_Download limit:"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
+#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:45 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:41
@@ -1161,6 +620,12 @@ msgstr ""
msgid "searching-tab"
msgstr ""
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr ""
+
#: addressbook/gui/component/select-names/e-select-names-popup.c:205
msgid "Remove All"
msgstr ""
@@ -1194,7 +659,7 @@ msgstr ""
msgid "Unnamed Contact"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:352
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
msgid "Source"
msgstr ""
@@ -1351,10 +816,10 @@ msgid "_Categories..."
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1290
-#: calendar/gui/e-cal-view.c:1321 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:679
-#: mail/mail-component.c:2094 ui/evolution-addressbook.xml.h:32
+#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
+#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
+#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
+#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
#: ui/evolution-tasks.xml.h:18
@@ -2484,6 +1949,11 @@ msgstr ""
msgid "Esq."
msgstr ""
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr ""
+
#: addressbook/gui/contact-editor/fullname.glade.h:5
msgid "I"
msgstr ""
@@ -2663,7 +2133,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.c:674
#: addressbook/gui/widgets/e-addressbook-view.c:894
-#: addressbook/gui/widgets/e-addressbook-view.c:1654
+#: addressbook/gui/widgets/e-addressbook-view.c:1653
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr ""
@@ -2742,7 +2212,8 @@ msgstr ""
msgid "Paste"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:910 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
@@ -2750,7 +2221,7 @@ msgid "Delete"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1255
+#: calendar/gui/e-cal-view.c:1265
msgid "Current View"
msgstr ""
@@ -2766,10 +2237,42 @@ msgstr ""
msgid "* Click here to add a contact *"
msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr ""
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
msgid "Business Address"
msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr ""
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
msgid "Department"
msgstr ""
@@ -2782,18 +2285,114 @@ msgstr ""
msgid "Email"
msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/eab-popup-control.c:460
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/eab-popup-control.c:470
+msgid "Email 3"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "File As"
+msgstr ""
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
msgid "Free-busy URL"
msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "ISDN"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Other Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Pager"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr ""
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
msgid "Profession"
msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "Radio"
+msgstr ""
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
msgid "Spouse"
msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Telex"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr ""
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
msgid "Web Site"
msgstr ""
@@ -2878,6 +2477,11 @@ msgstr "Synchronising \"%s\""
msgid "Job Title"
msgstr ""
+#: addressbook/gui/widgets/eab-contact-display.c:222
+#, fuzzy
+msgid "Work Address"
+msgstr "Colours"
+
#: addressbook/gui/widgets/eab-contact-display.c:227
#: addressbook/gui/widgets/eab-contact-display.c:375
msgid "Home page"
@@ -2894,7 +2498,6 @@ msgid "Success"
msgstr ""
#: addressbook/gui/widgets/eab-gui-util.c:46
-#: calendar/cal-client/cal-client.c:3817
#: camel/providers/imap/camel-imap-command.c:306
#: camel/providers/imap/camel-imap-command.c:403
#: camel/providers/pop3/camel-pop3-store.c:536
@@ -2907,8 +2510,7 @@ msgstr ""
msgid "Repository offline"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: calendar/cal-client/cal-client.c:3799 shell/e-storage.c:587
+#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
#: shell/evolution-shell-component.c:1213
msgid "Permission denied"
msgstr ""
@@ -2922,7 +2524,6 @@ msgid "Contact ID already exists"
msgstr ""
#: addressbook/gui/widgets/eab-gui-util.c:51
-#: calendar/cal-client/cal-client.c:3805
msgid "Protocol not supported"
msgstr ""
@@ -3240,7 +2841,7 @@ msgstr ""
msgid "Number of columns:"
msgstr ""
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
msgid "Options"
msgstr ""
@@ -3415,224 +3016,8 @@ msgstr ""
msgid "No filename provided."
msgstr ""
-#: calendar/cal-client/cal-client.c:3783
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3785
-msgid "Backend is busy"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3787
-msgid "Repository is offline"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3789
-#, fuzzy
-msgid "No such calendar"
-msgstr "Synchronising \"%s\""
-
-#: calendar/cal-client/cal-client.c:3791 calendar/cal-client/cal-client.c:3801
-msgid "Object not found"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3793
-msgid "Invalid object"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3795
-msgid "URI not loaded"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3797
-msgid "URI already loaded"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3803
-msgid "Object ID already exists"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3807
-msgid "Operation has been cancelled"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3809
-#, fuzzy
-msgid "Could not cancel operation"
-msgstr "Could not initialise Bonobo"
-
-#: calendar/cal-client/cal-client.c:3811
-msgid "Authentication failed"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3813
-#: camel/providers/smtp/camel-smtp-transport.c:224
-msgid "Authentication required"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3815
-msgid "A CORBA esception has occurred"
-msgstr ""
-
-#: calendar/cal-client/cal-client.c:3819 shell/e-storage.c:569
-msgid "No error"
-msgstr ""
-
-#: calendar/cal-util/cal-component.c:1218
-msgid "Untitled appointment"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:477
-msgid "1st"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:477
-msgid "2nd"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:477
-msgid "3rd"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:477
-msgid "4th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:477
-msgid "5th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:478
-msgid "6th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:478
-msgid "7th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:478
-msgid "8th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:478
-msgid "9th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:478
-msgid "10th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:479
-msgid "11th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:479
-msgid "12th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:479
-msgid "13th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:479
-msgid "14th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:479
-msgid "15th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:480
-msgid "16th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:480
-msgid "17th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:480
-msgid "18th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:480
-msgid "19th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:480
-msgid "20th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:481
-msgid "21st"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:481
-msgid "22nd"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:481
-msgid "23rd"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:481
-msgid "24th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:481
-msgid "25th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:482
-msgid "26th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:482
-msgid "27th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4016 calendar/gui/print.c:482
-msgid "28th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4017 calendar/gui/print.c:482
-msgid "29th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4018 calendar/gui/print.c:482
-msgid "30th"
-msgstr ""
-
-#: calendar/cal-util/cal-recur.c:4019 calendar/gui/print.c:483
-msgid "31st"
-msgstr ""
-
-#: calendar/cal-util/cal-util.c:551 calendar/cal-util/cal-util.c:573
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
-msgid "High"
-msgstr ""
-
-#: calendar/cal-util/cal-util.c:553 calendar/cal-util/cal-util.c:575
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
-msgid "Normal"
-msgstr ""
-
-#: calendar/cal-util/cal-util.c:555 calendar/cal-util/cal-util.c:577
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
-msgid "Low"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:571
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
-msgid "Undefined"
+#: addressbook/util/eab-destination.c:675
+msgid "Unnamed List"
msgstr ""
#: calendar/conduits/calendar/calendar-conduit.c:206
@@ -3702,11 +3087,11 @@ msgstr ""
msgid "_Edit appointment"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:875
msgid "No description available."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:892
+#: calendar/gui/alarm-notify/alarm-queue.c:893
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3715,12 +3100,12 @@ msgid ""
"Ending at %s"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:980
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
msgid "Warning"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:984
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3728,7 +3113,7 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:1010
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3739,7 +3124,7 @@ msgid ""
"Are you sure you want to run this program?"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:1024
msgid "Do not ask me about this program again."
msgstr ""
@@ -3803,8 +3188,8 @@ msgstr ""
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-day-view.c:1363 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
msgid "%a %d %b"
msgstr ""
@@ -3827,29 +3212,45 @@ msgstr "%m/%d/%Y"
msgid "%d %B"
msgstr ""
-#: calendar/gui/calendar-component.c:160
+#: calendar/gui/calendar-component.c:177
+#, c-format
+msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:205
#, fuzzy
msgid "New Calendar"
msgstr "Colours"
-#: calendar/gui/calendar-component.c:362
+#: calendar/gui/calendar-component.c:207
+#, fuzzy
+msgid "Rename"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/calendar-component.c:408
msgid "On This Computer"
msgstr ""
#. orange
-#: calendar/gui/calendar-component.c:370 calendar/gui/migration.c:122
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 filter/filter-label.c:123
+#: mail/mail-config.c:67 mail/mail-config.glade.h:83
#: shell/e-config-upgrade.c:1456
msgid "Personal"
msgstr ""
#. red
-#: calendar/gui/calendar-component.c:377 filter/filter-label.c:122
+#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
#: mail/mail-config.c:66 mail/mail-config.glade.h:129
#: shell/e-config-upgrade.c:1455
msgid "Work"
msgstr ""
+#. create the remote source group
+#: calendar/gui/calendar-component.c:432
+msgid "On The Web"
+msgstr ""
+
#: calendar/gui/calendar-offline-handler.c:190
#, c-format
msgid "backend_go_offline(): %s"
@@ -4044,7 +3445,7 @@ msgstr ""
msgid "hour(s)"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:173
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
msgid "minute(s)"
msgstr ""
@@ -4398,8 +3799,8 @@ msgstr ""
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1033
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1171
+#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
+#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
msgid "Save as..."
msgstr ""
@@ -4623,10 +4024,10 @@ msgstr ""
#. an empty string is the same as 'None'
#: calendar/gui/dialogs/meeting-page.c:312
#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2073
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:688
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1680
-#: mail/mail-config.glade.h:76
+#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
+#: mail/mail-config.glade.h:75
#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
@@ -4691,6 +4092,12 @@ msgstr ""
msgid "RSVP"
msgstr ""
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:14
#: calendar/gui/e-meeting-list-view.c:270
@@ -4715,17 +4122,39 @@ msgstr "Organisation:"
msgid "_Invite Others..."
msgstr ""
-#: calendar/gui/dialogs/new-calendar.c:47
+#: calendar/gui/dialogs/new-calendar.c:102
#, c-format
msgid "Source with name '%s' already exists in the selected group"
msgstr ""
-#: calendar/gui/dialogs/new-calendar.c:58
+#: calendar/gui/dialogs/new-calendar.c:116
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/new-calendar.c:125
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/new-calendar.c:138
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/new-calendar.c:155
+#, fuzzy
+msgid "Could not create cache for new calendar"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/dialogs/new-calendar.c:174
#, fuzzy
msgid "Could not create directory for new calendar"
msgstr "Cannot initialise Evolution's mail component."
-#: calendar/gui/dialogs/new-calendar.c:134
+#: calendar/gui/dialogs/new-calendar.c:254
msgid "A group must be selected"
msgstr ""
@@ -4745,31 +4174,40 @@ msgstr "Colours"
#: calendar/gui/dialogs/new-calendar.glade.h:5
#, fuzzy
+msgid "Calendar Location"
+msgstr "Colours"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:6
+#, fuzzy
msgid "Calendar Name"
msgstr "Colours"
-#: calendar/gui/dialogs/recur-comp.c:50
+#: calendar/gui/dialogs/recur-comp.c:51
msgid "You are modifying a recurring event, what would you like to modify?"
msgstr ""
-#: calendar/gui/dialogs/recur-comp.c:54
+#: calendar/gui/dialogs/recur-comp.c:55
msgid "You are modifying a recurring task, what would you like to modify?"
msgstr ""
-#: calendar/gui/dialogs/recur-comp.c:58
+#: calendar/gui/dialogs/recur-comp.c:59
msgid ""
"You are modifying a recurring journal entry, what would you like to modify?"
msgstr ""
-#: calendar/gui/dialogs/recur-comp.c:72
+#: calendar/gui/dialogs/recur-comp.c:73
msgid "This Instance Only"
msgstr ""
-#: calendar/gui/dialogs/recur-comp.c:75
+#: calendar/gui/dialogs/recur-comp.c:77
+msgid "This and Prior Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:83
msgid "This and Future Instances"
msgstr ""
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:88
msgid "All Instances"
msgstr ""
@@ -4893,7 +4331,7 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1579
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
msgid "_Discard Changes"
msgstr ""
@@ -4936,6 +4374,12 @@ msgstr ""
msgid "Completed"
msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
+#: mail/message-list.c:912
+msgid "High"
+msgstr ""
+
#: calendar/gui/dialogs/task-details-page.glade.h:6
#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
@@ -4943,6 +4387,18 @@ msgstr ""
msgid "In Progress"
msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
+#: mail/message-list.c:910
+msgid "Low"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+msgid "Normal"
+msgstr ""
+
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
@@ -4954,6 +4410,11 @@ msgstr ""
msgid "Progress"
msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
+msgid "Undefined"
+msgstr ""
+
#: calendar/gui/dialogs/task-details-page.glade.h:12
msgid "_Date Completed:"
msgstr ""
@@ -4994,7 +4455,7 @@ msgstr ""
#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
msgid "Description:"
msgstr ""
@@ -5114,6 +4575,11 @@ msgstr ""
msgid "Confidential"
msgstr ""
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
#: calendar/gui/e-cal-list-view.etspec.h:3
#: calendar/gui/e-calendar-table.etspec.h:9
#, fuzzy
@@ -5131,7 +4597,7 @@ msgid "Summary"
msgstr ""
#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
#, fuzzy
msgid "color"
msgstr "Colours"
@@ -5196,8 +4662,8 @@ msgstr ""
#: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
#: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
#: 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:1546
-#: camel/camel-gpg-context.c:1597 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
+#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
#: camel/providers/smtp/camel-smtp-transport.c:172
#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
#: widgets/misc/e-charset-picker.c:60
@@ -5212,33 +4678,33 @@ msgstr ""
msgid "Assigned"
msgstr ""
-#: calendar/gui/e-cal-view.c:383 calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
msgid "Updating objects"
msgstr ""
-#: calendar/gui/e-cal-view.c:729 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-cal-view.c:1240 calendar/gui/e-cal-view.c:1329
+#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1241 calendar/gui/e-cal-view.c:1331
+#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
#: ui/evolution-calendar.xml.h:23
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-cal-view.c:1242 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-cal-view.c:1243 calendar/gui/e-cal-view.c:1335
+#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
msgid "New Task"
msgstr ""
-#: calendar/gui/e-cal-view.c:1247 calendar/gui/e-cal-view.c:1274
-#: calendar/gui/e-cal-view.c:1341 calendar/gui/e-calendar-table.c:993
+#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
+#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
@@ -5246,75 +4712,75 @@ msgstr ""
msgid "_Print..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1281
-#: calendar/gui/e-cal-view.c:1339 calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
msgid "_Paste"
msgstr ""
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1325
+#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
#: ui/evolution-calendar.xml.h:18
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-cal-view.c:1258 calendar/gui/e-cal-view.c:1327
+#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1262 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-cal-view.c:1266 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
#: ui/evolution.xml.h:28
#, fuzzy
msgid "_Settings..."
msgstr "Cannot initialise the Evolution shell."
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:656 shell/e-shortcuts-view.c:422
+#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
#: ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr ""
-#: calendar/gui/e-cal-view.c:1273 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:658 mail/em-popup.c:584 mail/em-popup.c:640
+#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
#: ui/evolution-mail-message.xml.h:120
msgid "_Save As..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1279 calendar/gui/e-cal-view.c:1319
+#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr ""
-#: calendar/gui/e-cal-view.c:1280 calendar/gui/e-cal-view.c:1317
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2089 ui/evolution-addressbook.xml.h:30
+#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
msgid "_Copy"
msgstr ""
-#: calendar/gui/e-cal-view.c:1285
+#: calendar/gui/e-cal-view.c:1295
msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1286
+#: calendar/gui/e-cal-view.c:1296
msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1291 calendar/gui/e-cal-view.c:1322
+#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-cal-view.c:1292 calendar/gui/e-cal-view.c:1323
+#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
msgid "Delete _All Occurrences"
msgstr ""
@@ -5456,26 +4922,26 @@ msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1346
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
msgid "%A %d %B"
msgstr ""
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1379
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1375
#: calendar/gui/e-week-view-main-item.c:339
msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:325
+#: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
#: calendar/gui/print.c:819
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:328
+#: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
#: calendar/gui/print.c:821
msgid "pm"
msgstr ""
@@ -6195,7 +5661,7 @@ msgstr ""
#: calendar/gui/e-tasks.c:1032
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:710
+#: calendar/importers/icalendar-importer.c:713
#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
#: shell/e-shortcuts.c:1086
msgid "Tasks"
@@ -6402,6 +5868,130 @@ msgstr ""
msgid "You must be an attendee of the event."
msgstr ""
+#: calendar/gui/print.c:477
+msgid "1st"
+msgstr ""
+
+#: calendar/gui/print.c:477
+msgid "2nd"
+msgstr ""
+
+#: calendar/gui/print.c:477
+msgid "3rd"
+msgstr ""
+
+#: calendar/gui/print.c:477
+msgid "4th"
+msgstr ""
+
+#: calendar/gui/print.c:477
+msgid "5th"
+msgstr ""
+
+#: calendar/gui/print.c:478
+msgid "6th"
+msgstr ""
+
+#: calendar/gui/print.c:478
+msgid "7th"
+msgstr ""
+
+#: calendar/gui/print.c:478
+msgid "8th"
+msgstr ""
+
+#: calendar/gui/print.c:478
+msgid "9th"
+msgstr ""
+
+#: calendar/gui/print.c:478
+msgid "10th"
+msgstr ""
+
+#: calendar/gui/print.c:479
+msgid "11th"
+msgstr ""
+
+#: calendar/gui/print.c:479
+msgid "12th"
+msgstr ""
+
+#: calendar/gui/print.c:479
+msgid "13th"
+msgstr ""
+
+#: calendar/gui/print.c:479
+msgid "14th"
+msgstr ""
+
+#: calendar/gui/print.c:479
+msgid "15th"
+msgstr ""
+
+#: calendar/gui/print.c:480
+msgid "16th"
+msgstr ""
+
+#: calendar/gui/print.c:480
+msgid "17th"
+msgstr ""
+
+#: calendar/gui/print.c:480
+msgid "18th"
+msgstr ""
+
+#: calendar/gui/print.c:480
+msgid "19th"
+msgstr ""
+
+#: calendar/gui/print.c:480
+msgid "20th"
+msgstr ""
+
+#: calendar/gui/print.c:481
+msgid "21st"
+msgstr ""
+
+#: calendar/gui/print.c:481
+msgid "22nd"
+msgstr ""
+
+#: calendar/gui/print.c:481
+msgid "23rd"
+msgstr ""
+
+#: calendar/gui/print.c:481
+msgid "24th"
+msgstr ""
+
+#: calendar/gui/print.c:481
+msgid "25th"
+msgstr ""
+
+#: calendar/gui/print.c:482
+msgid "26th"
+msgstr ""
+
+#: calendar/gui/print.c:482
+msgid "27th"
+msgstr ""
+
+#: calendar/gui/print.c:482
+msgid "28th"
+msgstr ""
+
+#: calendar/gui/print.c:482
+msgid "29th"
+msgstr ""
+
+#: calendar/gui/print.c:482
+msgid "30th"
+msgstr ""
+
+#: calendar/gui/print.c:483
+msgid "31st"
+msgstr ""
+
#: calendar/gui/print.c:557
msgid "Su"
msgstr ""
@@ -6556,136 +6146,24 @@ msgstr ""
msgid "vCalendar files (.vcf)"
msgstr ""
-#: calendar/importers/icalendar-importer.c:463
+#: calendar/importers/icalendar-importer.c:466
msgid "Reminder!!"
msgstr ""
-#: calendar/importers/icalendar-importer.c:703
+#: calendar/importers/icalendar-importer.c:706
msgid "Calendar Events"
msgstr ""
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:731
msgid ""
"Evolution has found Gnome Calendar files.\n"
"Would you like to import them into Evolution?"
msgstr ""
-#: calendar/importers/icalendar-importer.c:735
+#: calendar/importers/icalendar-importer.c:738
msgid "Gnome Calendar"
msgstr ""
-#: calendar/pcs/cal-backend-file.c:175
-msgid "Can't save calendar data: Malformed URI."
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:50
-msgid "time-now expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:74
-msgid "make-time expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:79
-msgid "make-time expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:87
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:116
-msgid "time-add-day expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:121
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:128
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:155
-msgid "time-day-begin expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:160
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:187
-msgid "time-day-end expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:192
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:220
-msgid "get-vtype expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:280
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:285
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:292
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:436
-msgid "contains? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:441
-msgid "contains? expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:448
-msgid "contains? expects argument 2 to be a string"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:465
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:492
-msgid "has-alarms? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:497
-msgid "has-alarms? excepts argument to be a boolean"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:537
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:549
-msgid ""
-"has-categories? expects all arguments to be strings or one and only one "
-"argument to be a boolean false (#f)"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:629
-msgid "is-completed? expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:666
-msgid "completed-before? expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/cal-backend-object-sexp.c:671
-msgid "completed-before? expects argument 1 to be a time_t"
-msgstr ""
-
#.
#. * These are the timezone names from the Olson timezone data.
#. * We only place them here so gettext picks them up for translation.
@@ -8216,27 +7694,27 @@ msgstr ""
msgid "Pacific/Yap"
msgstr ""
-#: camel/camel-cipher-context.c:92
+#: camel/camel-cipher-context.c:99
msgid "Signing is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:131
+#: camel/camel-cipher-context.c:139
msgid "Verifying is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:173
+#: camel/camel-cipher-context.c:181
msgid "Encryption is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:212
+#: camel/camel-cipher-context.c:220
msgid "Decryption is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:248
+#: camel/camel-cipher-context.c:256
msgid "You may not import keys with this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:278
+#: camel/camel-cipher-context.c:286
msgid "You may not export keys with this cipher"
msgstr ""
@@ -8418,7 +7896,7 @@ msgstr ""
msgid "Filtering new message(s)"
msgstr ""
-#: camel/camel-gpg-context.c:686
+#: camel/camel-gpg-context.c:696
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -8426,45 +7904,45 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:701
+#: camel/camel-gpg-context.c:710
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:735
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:743
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
msgstr ""
-#: camel/camel-gpg-context.c:745 camel/camel-gpg-context.c:1223
-#: camel/camel-gpg-context.c:1342 camel/camel-gpg-context.c:1427
-#: camel/camel-gpg-context.c:1497 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
+#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
+#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
msgid "Cancelled."
msgstr ""
-#: camel/camel-gpg-context.c:763
+#: camel/camel-gpg-context.c:781
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
-#: camel/camel-gpg-context.c:769
+#: camel/camel-gpg-context.c:787
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr ""
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:799
msgid "No data provided"
msgstr ""
-#: camel/camel-gpg-context.c:819
+#: camel/camel-gpg-context.c:837
msgid "Failed to encrypt: No valid recipients specified."
msgstr ""
-#: camel/camel-gpg-context.c:1096
+#: camel/camel-gpg-context.c:1114
#, fuzzy, c-format
msgid ""
"Failed to GPG %s: %s\n"
@@ -8472,34 +7950,48 @@ msgid ""
"%s"
msgstr "Synchronising \"%s\""
-#: camel/camel-gpg-context.c:1101
+#: camel/camel-gpg-context.c:1119
#, fuzzy, c-format
msgid "Failed to GPG %s: %s\n"
msgstr "Synchronising \"%s\""
-#: camel/camel-gpg-context.c:1216 camel/camel-gpg-context.c:1545
-#: camel/camel-gpg-context.c:1596
+#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#, fuzzy, c-format
+msgid "Could not generate signing data: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
+#: camel/camel-gpg-context.c:1669
#, fuzzy, c-format
msgid "Failed to execute gpg: %s"
msgstr "Synchronising \"%s\""
-#: camel/camel-gpg-context.c:1240 camel/camel-gpg-context.c:1334
-#: camel/camel-gpg-context.c:1420 camel/camel-gpg-context.c:1443
-#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1514
-#: camel/camel-gpg-context.c:1567 camel/camel-gpg-context.c:1618
+#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
+#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
+#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
+#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
msgid "Failed to execute gpg."
msgstr ""
-#: camel/camel-gpg-context.c:1257
+#: camel/camel-gpg-context.c:1289
msgid "This is a digitally signed message part"
msgstr ""
-#: camel/camel-gpg-context.c:1319
+#: camel/camel-gpg-context.c:1365
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr ""
-#: camel/camel-gpg-context.c:1522
+#: camel/camel-gpg-context.c:1441
+#, fuzzy, c-format
+msgid "Could not generate encrypting data: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-gpg-context.c:1499
+msgid "This is a digitally encrypted message part"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1595
#, fuzzy
msgid "Unable to parse message content"
msgstr "Synchronising \"%s\""
@@ -8598,15 +8090,15 @@ msgstr ""
msgid "Error copying mail temp file: %s"
msgstr ""
-#: camel/camel-multipart-encrypted.c:224 camel/camel-multipart-encrypted.c:239
+#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
msgid "Failed to decrypt MIME part: protocol error"
msgstr ""
-#: camel/camel-multipart-encrypted.c:252
+#: camel/camel-multipart-encrypted.c:256
msgid "Failed to decrypt MIME part: invalid structure"
msgstr ""
-#: camel/camel-multipart-signed.c:685
+#: camel/camel-multipart-signed.c:687
msgid "parse error"
msgstr ""
@@ -8915,52 +8407,52 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-smime-context.c:158
+#: camel/camel-smime-context.c:167
#, c-format
msgid "Enter security pass-phrase for `%s'"
msgstr ""
-#: camel/camel-smime-context.c:431
+#: camel/camel-smime-context.c:446
msgid "Unverified"
msgstr ""
-#: camel/camel-smime-context.c:433
+#: camel/camel-smime-context.c:448
msgid "Good signature"
msgstr ""
-#: camel/camel-smime-context.c:435
+#: camel/camel-smime-context.c:450
msgid "Bad signature"
msgstr ""
-#: camel/camel-smime-context.c:437
+#: camel/camel-smime-context.c:452
msgid "Content tampered with or altered in transit"
msgstr ""
-#: camel/camel-smime-context.c:439
+#: camel/camel-smime-context.c:454
msgid "Signing certificate not found"
msgstr ""
-#: camel/camel-smime-context.c:441
+#: camel/camel-smime-context.c:456
msgid "Signing certificate not trusted"
msgstr ""
-#: camel/camel-smime-context.c:443
+#: camel/camel-smime-context.c:458
msgid "Signature algorithm unknown"
msgstr ""
-#: camel/camel-smime-context.c:445
+#: camel/camel-smime-context.c:460
msgid "Siganture algorithm unsupported"
msgstr ""
-#: camel/camel-smime-context.c:447
+#: camel/camel-smime-context.c:462
msgid "Malformed signature"
msgstr ""
-#: camel/camel-smime-context.c:449
+#: camel/camel-smime-context.c:464
msgid "Processing error"
msgstr ""
-#: camel/camel-smime-context.c:578
+#: camel/camel-smime-context.c:593
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr ""
@@ -9362,7 +8854,7 @@ msgstr ""
#: camel/providers/imap/camel-imap-provider.c:82
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
msgid "Password"
msgstr ""
@@ -9434,7 +8926,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
#: camel/providers/imap/camel-imap-store.c:1257
-#: camel/providers/smtp/camel-smtp-transport.c:495
+#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr ""
@@ -9860,7 +9352,7 @@ msgstr ""
msgid "Could not close temp folder: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1891
+#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
#, c-format
msgid "Could not rename folder: %s"
msgstr ""
@@ -10139,7 +9631,7 @@ msgstr ""
msgid "Disable support for all POP3 extensions"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
msgid "POP"
msgstr ""
@@ -10219,7 +9711,7 @@ msgid "No such folder `%s'."
msgstr ""
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
msgid "Sendmail"
msgstr ""
@@ -10271,7 +9763,7 @@ msgstr ""
msgid "Mail delivery via the sendmail program"
msgstr ""
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
msgid "SMTP"
msgstr ""
@@ -10375,40 +9867,44 @@ msgstr ""
msgid "Temporary authentication failure"
msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:224
+msgid "Authentication required"
+msgstr ""
+
#: camel/providers/smtp/camel-smtp-transport.c:308
msgid "Welcome response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:352
-#: camel/providers/smtp/camel-smtp-transport.c:391
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:353
+#: camel/providers/smtp/camel-smtp-transport.c:344
msgid "server does not appear to support SSL"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:358
#, c-format
msgid "STARTTLS request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:373
msgid "STARTTLS response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/smtp/camel-smtp-transport.c:476
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/smtp/camel-smtp-transport.c:514
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:542
+#: camel/providers/smtp/camel-smtp-transport.c:533
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -10416,87 +9912,87 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:675
+#: camel/providers/smtp/camel-smtp-transport.c:666
#, c-format
msgid "SMTP server %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:668
#, c-format
msgid "SMTP mail delivery via %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:686
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:700 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
msgid "Sending message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:706
msgid "Cannot send message: no recipients defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:715
msgid "Cannot send message: one or more invalid recipients"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:880
msgid "SMTP Greeting"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:938
+#: camel/providers/smtp/camel-smtp-transport.c:929
#, c-format
msgid "HELO request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
msgid "HELO response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
msgid "SMTP Authentication"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
msgid "Error creating SASL authentication object."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1061
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1052
#, c-format
msgid "AUTH request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1061
msgid "AUTH request failed."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1131
+#: camel/providers/smtp/camel-smtp-transport.c:1122
msgid "Bad authentication response from server.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1156
+#: camel/providers/smtp/camel-smtp-transport.c:1147
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1176
+#: camel/providers/smtp/camel-smtp-transport.c:1167
msgid "MAIL FROM response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/smtp/camel-smtp-transport.c:1191
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1222
+#: camel/providers/smtp/camel-smtp-transport.c:1213
#, c-format
msgid "RCPT TO <%s> failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1261
+#: camel/providers/smtp/camel-smtp-transport.c:1252
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr ""
@@ -10504,35 +10000,35 @@ msgstr ""
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1281
+#: camel/providers/smtp/camel-smtp-transport.c:1272
msgid "DATA response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1322
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1365
+#: camel/providers/smtp/camel-smtp-transport.c:1356
msgid "DATA termination response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1388
+#: camel/providers/smtp/camel-smtp-transport.c:1379
#, c-format
msgid "RSET request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1408
+#: camel/providers/smtp/camel-smtp-transport.c:1399
msgid "RSET response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1431
+#: camel/providers/smtp/camel-smtp-transport.c:1422
#, c-format
msgid "QUIT request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1451
+#: camel/providers/smtp/camel-smtp-transport.c:1442
msgid "QUIT response error"
msgstr ""
@@ -10669,71 +10165,82 @@ msgstr ""
msgid "Attach file(s)"
msgstr ""
-#: composer/e-msg-composer.c:821
+#: composer/e-msg-composer.c:651
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for from account"
+msgstr ""
+
+#: composer/e-msg-composer.c:657
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for from "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:788
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1153
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:1197 composer/e-msg-composer.c:1213
+#: composer/e-msg-composer.c:1164 composer/e-msg-composer.c:1180
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1236
+#: composer/e-msg-composer.c:1203
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1274
+#: composer/e-msg-composer.c:1241
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1282
+#: composer/e-msg-composer.c:1249
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1289
+#: composer/e-msg-composer.c:1256
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1263
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1305
+#: composer/e-msg-composer.c:1272
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1314
+#: composer/e-msg-composer.c:1281
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1411
+#: composer/e-msg-composer.c:1378
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1574
+#: composer/e-msg-composer.c:1541
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -10741,34 +10248,34 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1583
+#: composer/e-msg-composer.c:1550
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1615
+#: composer/e-msg-composer.c:1582
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:2034
+#: composer/e-msg-composer.c:2001
msgid "Signature:"
msgstr ""
-#: composer/e-msg-composer.c:2074 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
msgid "Autogenerated"
msgstr ""
-#: composer/e-msg-composer.c:2254 composer/e-msg-composer.c:2950
-#: composer/e-msg-composer.c:2951
+#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
+#: composer/e-msg-composer.c:2919
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:2982
+#: composer/e-msg-composer.c:2950
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:3010
+#: composer/e-msg-composer.c:2980
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -10776,13 +10283,13 @@ msgid ""
"of gtkhtml and libgtkhtml installed.\n"
msgstr ""
-#: composer/e-msg-composer.c:3080
+#: composer/e-msg-composer.c:3050
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
msgstr ""
-#: composer/e-msg-composer.c:4090
+#: composer/e-msg-composer.c:4060
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11185,7 +10692,7 @@ msgid ""
msgstr ""
#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
+#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
msgid "Important"
msgstr ""
@@ -11196,7 +10703,7 @@ msgid "To Do"
msgstr ""
#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
#: shell/e-config-upgrade.c:1458
msgid "Later"
msgstr ""
@@ -11295,7 +10802,7 @@ msgstr ""
msgid "months"
msgstr ""
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:174
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
msgid "seconds"
msgstr ""
@@ -11392,7 +10899,7 @@ msgstr ""
msgid "Follow Up"
msgstr ""
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:687
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
msgid "Label"
msgstr ""
@@ -11745,136 +11252,145 @@ msgid "Folder _name"
msgstr "Synchronising \"%s\""
#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1638 mail/mail-component.c:1649
+#: mail/mail-component.c:1632 mail/mail-component.c:1643
#: shell/e-shell-importer.c:1061
#, fuzzy
msgid "Select folder"
msgstr "Synchronising \"%s\""
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:657 mail/em-popup.c:583
+#: mail/em-folder-view.c:659 mail/em-popup.c:583
msgid "_Edit as New Message..."
msgstr ""
-#: mail/em-folder-view.c:659
+#: mail/em-folder-view.c:661
msgid "_Print"
msgstr ""
-#: mail/em-folder-view.c:662 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
msgid "_Reply to Sender"
msgstr ""
-#: mail/em-folder-view.c:663 mail/em-popup.c:644
+#: mail/em-folder-view.c:665 mail/em-popup.c:644
#: ui/evolution-mail-message.xml.h:80
msgid "Reply to _List"
msgstr ""
-#: mail/em-folder-view.c:664 mail/em-popup.c:645
+#: mail/em-folder-view.c:666 mail/em-popup.c:645
#: ui/evolution-mail-message.xml.h:79
msgid "Reply to _All"
msgstr ""
-#: mail/em-folder-view.c:665 mail/em-popup.c:647
+#: mail/em-folder-view.c:667 mail/em-popup.c:647
msgid "_Forward"
msgstr ""
-#: mail/em-folder-view.c:668
+#: mail/em-folder-view.c:670
msgid "Follo_w Up..."
msgstr ""
-#: mail/em-folder-view.c:669
+#: mail/em-folder-view.c:671
msgid "Fla_g Completed"
msgstr ""
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:672
#, fuzzy
msgid "Cl_ear Flag"
msgstr "Colours"
-#: mail/em-folder-view.c:673 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
msgid "Mar_k as Read"
msgstr ""
-#: mail/em-folder-view.c:674
+#: mail/em-folder-view.c:676
msgid "Mark as _Unread"
msgstr ""
-#: mail/em-folder-view.c:675
+#: mail/em-folder-view.c:677
msgid "Mark as _Important"
msgstr ""
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:678
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/em-folder-view.c:680
+#: mail/em-folder-view.c:682
msgid "U_ndelete"
msgstr ""
-#: mail/em-folder-view.c:683
+#: mail/em-folder-view.c:685
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/em-folder-view.c:684 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr ""
-#: mail/em-folder-view.c:692
+#: mail/em-folder-view.c:694
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/em-folder-view.c:695
+#: mail/em-folder-view.c:697
msgid "Appl_y Filters"
msgstr ""
-#: mail/em-folder-view.c:698
+#: mail/em-folder-view.c:700
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:701
msgid "VFolder on _Subject"
msgstr ""
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:702
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:703
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:704
msgid "VFolder on Mailing _List"
msgstr ""
#: mail/em-folder-view.c:706
+#, fuzzy
+msgid "VFolder on Thread"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-view.c:710
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/em-folder-view.c:707
+#: mail/em-folder-view.c:711
msgid "Filter on Sen_der"
msgstr ""
-#: mail/em-folder-view.c:708
+#: mail/em-folder-view.c:712
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/em-folder-view.c:709
+#: mail/em-folder-view.c:713
msgid "Filter on _Mailing List"
msgstr ""
+#: mail/em-folder-view.c:715
+msgid "Filter on Thread"
+msgstr ""
+
#. default charset used in mail view
-#: mail/em-folder-view.c:1473 mail/em-folder-view.c:1511
-#: mail/mail-config.glade.h:39
+#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
+#: mail/mail-config.glade.h:38
#, fuzzy
msgid "Default"
msgstr "Synchronising \"%s\""
-#: mail/em-folder-view.c:1545
+#: mail/em-folder-view.c:1559
msgid "Print Message"
msgstr ""
-#: mail/em-folder-view.c:1786
+#: mail/em-folder-view.c:1800
#, fuzzy
msgid "_Copy Link Location"
msgstr "Organisation"
@@ -11988,6 +11504,10 @@ msgstr ""
msgid "Bcc"
msgstr ""
+#: mail/em-format-html.c:1381
+msgid "Mailer"
+msgstr ""
+
#. translators: strftime format for local time equivalent in Date header display, with day
#: mail/em-format-html.c:1408
msgid "<I> (%a, %R %Z)</I>"
@@ -12116,7 +11636,7 @@ msgstr "Colours"
msgid "Save Message..."
msgstr ""
-#: mail/em-utils.c:1893 mail/mail-component.c:495
+#: mail/em-utils.c:1893 mail/mail-component.c:501
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
@@ -12185,7 +11705,7 @@ msgstr "Cannot initialise Evolution's mail summary component."
msgid "Mail Accounts"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
msgid "Mail Preferences"
msgstr ""
@@ -12398,39 +11918,44 @@ msgstr ""
msgid "_Path:"
msgstr ""
-#: mail/mail-account-gui.c:1877
+#: mail/mail-account-gui.c:1946
msgid "You may not create two accounts with the same name."
msgstr ""
-#: mail/mail-autofilter.c:73
+#: mail/mail-autofilter.c:74
#, c-format
msgid "Mail to %s"
msgstr ""
-#: mail/mail-autofilter.c:237
+#: mail/mail-autofilter.c:257
#, c-format
msgid "Subject is %s"
msgstr ""
-#: mail/mail-autofilter.c:253
+#: mail/mail-autofilter.c:273
#, c-format
msgid "Mail from %s"
msgstr ""
-#: mail/mail-autofilter.c:270
+#: mail/mail-autofilter.c:290
#, c-format
msgid "%s mailing list"
msgstr ""
-#: mail/mail-autofilter.c:323
+#: mail/mail-autofilter.c:314
+#, c-format
+msgid "Replies to %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:367
msgid "Add Filter Rule"
msgstr ""
-#: mail/mail-autofilter.c:372
+#: mail/mail-autofilter.c:416
msgid "The following filter rule(s):\n"
msgstr ""
-#: mail/mail-autofilter.c:378
+#: mail/mail-autofilter.c:422
#, c-format
msgid ""
"Used the removed folder:\n"
@@ -12438,140 +11963,141 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-component.c:188
+#: mail/mail-component.c:194
msgid "Connecting..."
msgstr ""
-#: mail/mail-component.c:345
+#: mail/mail-component.c:351
msgid "On this Computer"
msgstr ""
-#: mail/mail-component.c:367
+#: mail/mail-component.c:373
msgid "This folder cannot contain messages."
msgstr ""
-#: mail/mail-component.c:481
+#: mail/mail-component.c:487
#, fuzzy, c-format
msgid "Could not open source folder: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:510
+#: mail/mail-component.c:516
#, fuzzy, c-format
msgid "Could not create temporary mbox store: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:526
+#: mail/mail-component.c:532
#, fuzzy, c-format
msgid "Could not create temporary mbox folder: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:547
+#: mail/mail-component.c:553
#, fuzzy, c-format
msgid "Could not copy messages to temporary mbox folder: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:1026
+#: mail/mail-component.c:1014
+#, c-format
msgid ""
-"Some of your mail settings seem corrupt, please check that everything is in "
-"order."
+"The following error occured while migrating your mail data:\n"
+"%s"
msgstr ""
-#: mail/mail-component.c:1638
+#: mail/mail-component.c:1632
msgid "Select destination to copy folder into"
msgstr ""
-#: mail/mail-component.c:1649
+#: mail/mail-component.c:1643
msgid "Select destination to move folder into"
msgstr ""
-#: mail/mail-component.c:1713
+#: mail/mail-component.c:1707
#, fuzzy
msgid "Create folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:1713
+#: mail/mail-component.c:1707
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr ""
-#: mail/mail-component.c:1794
+#: mail/mail-component.c:1788
#, fuzzy, c-format
msgid "Could not delete folder: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:1818
+#: mail/mail-component.c:1812
#, fuzzy, c-format
msgid "Really delete folder \"%s\" and all of its subfolders?"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:1827 shell/e-shell-folder-commands.c:416
+#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
#, c-format
msgid "Delete \"%s\""
msgstr ""
-#: mail/mail-component.c:1848 shell/e-shell-folder-commands.c:534
+#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
-#: mail/mail-component.c:1850 shell/e-shell-folder-commands.c:541
+#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
#, fuzzy
msgid "Rename Folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:1855 shell/e-shell-folder-commands.c:547
+#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
#: shell/e-shell-folder-creation-dialog.c:180
#, c-format
msgid "The specified folder name is not valid: %s"
msgstr ""
-#: mail/mail-component.c:1866
+#: mail/mail-component.c:1860
#, c-format
msgid "A folder named \"%s\" already exists. Please use a different name."
msgstr ""
-#: mail/mail-component.c:1973
+#: mail/mail-component.c:1967
#, fuzzy
msgid "Folder properties"
msgstr "Synchronising \"%s\""
#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1981
+#: mail/mail-component.c:1975
msgid "Properties"
msgstr ""
-#: mail/mail-component.c:1985
+#: mail/mail-component.c:1979
#, fuzzy
msgid "Folder Name"
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:2084 ui/evolution-mail-messagedisplay.xml.h:8
+#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
msgid "_View"
msgstr ""
-#: mail/mail-component.c:2085
+#: mail/mail-component.c:2079
msgid "Open in _New Window"
msgstr ""
-#: mail/mail-component.c:2090
+#: mail/mail-component.c:2084
msgid "_Move"
msgstr ""
-#: mail/mail-component.c:2093
+#: mail/mail-component.c:2087
#, fuzzy
msgid "_New Folder..."
msgstr "Synchronising \"%s\""
-#: mail/mail-component.c:2095 shell/e-shortcuts-view.c:427
+#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
msgid "_Rename"
msgstr ""
-#: mail/mail-component.c:2098 ui/evolution-mail-list.xml.h:27
+#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr ""
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
msgid "Identity"
msgstr ""
@@ -12641,7 +12167,7 @@ msgid "(SSL is not supported in this build of evolution)"
msgstr ""
#: mail/mail-config.glade.h:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
+msgid "A_lso encrypt to self when sending encrypted mail"
msgstr ""
#: mail/mail-config.glade.h:8
@@ -12664,73 +12190,69 @@ msgstr ""
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr ""
-#: mail/mail-config.glade.h:15
-msgid "Alwa_ys sign outgoing messages when using this account"
-msgstr ""
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
msgid "Always _blind carbon-copy (Bcc) to:"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
msgid "Always _carbon-copy (Cc) to:"
msgstr ""
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
msgid "Always _trust keys in my keyring when encrypting"
msgstr ""
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
msgid "Attach original message"
msgstr ""
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr ""
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
msgid "Authentication"
msgstr ""
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
msgid "Baltic (ISO-8859-4)"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
msgid "C_haracter set:"
msgstr ""
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
#, fuzzy
msgid "C_olors"
msgstr "Colours"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
msgid "Check spelling while I _type"
msgstr ""
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
msgid "Checking for New Mail"
msgstr ""
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
#, fuzzy
msgid "Color for _misspelled words:"
msgstr "Colours for display"
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
msgid "Composing Messages"
msgstr ""
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
msgid "Configuration"
msgstr ""
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -12740,59 +12262,63 @@ msgid ""
"Click \"Apply\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
msgid "Default Behavior"
msgstr ""
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
msgid "Default character _encoding:"
msgstr ""
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
msgid "Deleting Mail"
msgstr ""
-#: mail/mail-config.glade.h:44
-msgid "Digital IDs..."
+#: mail/mail-config.glade.h:43
+msgid "Digitally _sign outgoing messages (by default)"
msgstr ""
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
msgid "Do not quote original message"
msgstr ""
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr ""
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr ""
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
#, fuzzy
msgid "Drafts _folder:"
msgstr "Synchronising \"%s\""
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
msgid "E_nable"
msgstr ""
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
msgid "Email Accounts"
msgstr ""
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
msgid "Email _address:"
msgstr ""
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
msgid "Empty _trash folders on exit"
msgstr ""
+#: mail/mail-config.glade.h:52
+msgid "Encry_ption certificate:"
+msgstr ""
+
#: mail/mail-config.glade.h:53
msgid "Evolution Account Assistant"
msgstr ""
@@ -12814,185 +12340,185 @@ msgid "Format messages in _HTML"
msgstr ""
#: mail/mail-config.glade.h:58
-msgid "Get Digital ID..."
-msgstr ""
-
-#: mail/mail-config.glade.h:59
msgid "Highlight _quotations with"
msgstr ""
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
msgid "IMAPv4 "
msgstr ""
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
msgid "Inline"
msgstr ""
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
msgid "Kerberos "
msgstr ""
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
msgid "Labels and Colors"
msgstr ""
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:66
msgid "Loading Images"
msgstr ""
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
msgid "Mail Configuration"
msgstr ""
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
msgid "Mailbox location"
msgstr ""
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
#, fuzzy
msgid "Message Composer"
msgstr "Colours"
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
msgid "Message Display"
msgstr ""
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
#, fuzzy
msgid "Message Fonts"
msgstr "Colours"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:74
msgid "New Mail Notification"
msgstr ""
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr ""
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
msgid "Optional Information"
msgstr ""
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:79
#, fuzzy
msgid "Or_ganization:"
msgstr "Organisation:"
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
msgid "PGP/GPG _Key ID:"
msgstr ""
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
msgid "Pick a color"
msgstr "Pick a colour"
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:85
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr ""
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:86
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr ""
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
msgid "Printed Fonts"
msgstr ""
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
msgid "Qmail maildir "
msgstr ""
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
msgid "Quote original message"
msgstr ""
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:90
msgid "Quoted"
msgstr ""
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
msgid "Re_member this password"
msgstr ""
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:92
msgid "Re_ply-To:"
msgstr ""
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:93
msgid "Receiving Email"
msgstr ""
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
#, fuzzy
msgid "Receiving _Options"
msgstr "Synchronise \"%s\""
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:95
msgid "Remember this _password"
msgstr ""
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
msgid "Required Information"
msgstr ""
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
#, fuzzy
msgid "Restore Defaults"
msgstr "Synchronising \"%s\""
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
msgid "S_ecurity"
msgstr ""
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
msgid "Secure MIME (S/MIME)"
msgstr ""
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
msgid "Select HTML fixed width font"
msgstr ""
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:102
msgid "Select HTML fixed width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
msgid "Select HTML variable width font"
msgstr ""
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
msgid "Select HTML variable width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
msgid "Sending Email"
msgstr ""
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
#, fuzzy
msgid "Sent _messages folder:"
msgstr "Synchronising \"%s\""
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
msgid "Sent and Draft Messages"
msgstr ""
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
msgid "Ser_ver requires authentication"
msgstr ""
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
msgid "Server Configuration"
msgstr ""
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
msgid "Server _Type: "
msgstr ""
+#: mail/mail-config.glade.h:112
+msgid "Si_gning certificate:"
+msgstr ""
+
#: mail/mail-config.glade.h:113
msgid "Specify _filename:"
msgstr ""
@@ -13069,27 +12595,27 @@ msgid "_Beep when new mail arrives"
msgstr ""
#: mail/mail-config.glade.h:138
-msgid "_Certificate ID:"
+msgid "_Confirm when expunging a folder"
msgstr ""
#: mail/mail-config.glade.h:139
-msgid "_Confirm when expunging a folder"
+msgid "_Default signature:"
msgstr ""
#: mail/mail-config.glade.h:140
-msgid "_Default signature:"
+msgid "_Defaults"
msgstr ""
#: mail/mail-config.glade.h:141
-msgid "_Defaults"
+msgid "_Do not notify me when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:142
-msgid "_Do not notify me when new mail arrives"
+#: mail/mail-config.glade.h:143
+msgid "_Enable"
msgstr ""
#: mail/mail-config.glade.h:144
-msgid "_Enable"
+msgid "_Encrypt outgoing messages (by default)"
msgstr ""
#: mail/mail-config.glade.h:145
@@ -13157,34 +12683,39 @@ msgid "_Script:"
msgstr ""
#: mail/mail-config.glade.h:164
+#, fuzzy
+msgid "_Select..."
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-config.glade.h:165
msgid "_Sending Mail"
msgstr ""
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
msgid "_Show animated images"
msgstr ""
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
msgid "_Signatures"
msgstr ""
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
msgid "_Standard Font:"
msgstr ""
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
msgid "_Terminal Font:"
msgstr ""
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
msgid "_Use secure connection (SSL):"
msgstr ""
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:171
msgid "_Use the same fonts as other applications"
msgstr ""
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
msgid "description"
msgstr ""
@@ -14331,6 +13862,10 @@ msgstr ""
msgid "Shortcuts"
msgstr ""
+#: shell/e-storage.c:569
+msgid "No error"
+msgstr ""
+
#: shell/e-storage.c:573
msgid "A folder with the same name already exists"
msgstr ""
@@ -14432,6 +13967,10 @@ msgstr ""
msgid "Interrupted"
msgstr ""
+#: shell/evolution-shell-component.c:1191
+msgid "Invalid argument"
+msgstr ""
+
#: shell/evolution-shell-component.c:1193
msgid "Already has an owner"
msgstr ""
@@ -15093,6 +14632,10 @@ msgstr ""
msgid "Go to today"
msgstr ""
+#: ui/evolution-calendar.xml.h:21
+msgid "List"
+msgstr ""
+
#: ui/evolution-calendar.xml.h:22
msgid "Month"
msgstr ""
@@ -16549,20 +16092,73 @@ msgstr "Colours"
msgid "Find Now"
msgstr ""
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-msgid "Evolution Addressbook local/LDAP backend"
-msgstr ""
+#, fuzzy
+#~ msgid "Address List"
+#~ msgstr "Colours"
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
#, fuzzy
-msgid "Evolution Calendar local file backend"
-msgstr "Cannot initialise Evolution's mail summary component."
+#~ msgid "Organizational Unit"
+#~ msgstr "Organisation"
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
#, fuzzy
-msgid "Evolution Addressbook local backend"
-msgstr "Cannot initialise Evolution's mail component."
+#~ msgid "Logo"
+#~ msgstr "Colours"
+
+#, fuzzy
+#~ msgid "ICS Calendar"
+#~ msgstr "Colours"
+
+#, fuzzy
+#~ msgid "Evolution LDIF importer"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Evolution LDIF importer factory"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Evolution VCard Importer"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Evolution VCard importer"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Using Email Address"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Reconnecting to LDAP server..."
+#~ msgstr "Synchronise \"%s\""
+
+#, fuzzy
+#~ msgid "Adding contact to LDAP server..."
+#~ msgstr "Synchronise \"%s\""
+
+#, fuzzy
+#~ msgid "Removing contact from LDAP server..."
+#~ msgstr "Synchronise \"%s\""
+
+#, fuzzy
+#~ msgid "Modifying contact from LDAP server..."
+#~ msgstr "Synchronise \"%s\""
+
+#, fuzzy
+#~ msgid "No such calendar"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Could not cancel operation"
+#~ msgstr "Could not initialise Bonobo"
+
+#, fuzzy
+#~ msgid "Evolution Calendar local file backend"
+#~ msgstr "Cannot initialise Evolution's mail summary component."
+
+#, fuzzy
+#~ msgid "Evolution Addressbook local backend"
+#~ msgstr "Cannot initialise Evolution's mail component."
#, fuzzy
#~ msgid "Comp"