aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po6027
1 files changed, 3132 insertions, 2895 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 6972c0d61a..3e2c149b2a 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-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
"Language-Team: \n"
@@ -13,196 +13,67 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: addressbook/backend/ebook/e-card.c:1306
+#: 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
+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/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
msgid "File As"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:1313
-#: 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-card.c:1320
#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
#: my-evolution/e-summary-table.c:59
msgid "Name"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "Colours"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1347
#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
msgid "Email"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Organisation:"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Organisation"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+msgid "Primary"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
+#: addressbook/backend/ebook/e-card-simple.c:63
+msgid "Prim"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:1409
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
#: addressbook/gui/contact-editor/e-contact-editor.c:1737
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1436
-msgid "Mailer"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Colours"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
-msgid "Related Contacts"
-msgstr "Organisation:"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-msgid "List"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr ""
-
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
#: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -238,6 +109,12 @@ msgid "Home"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
msgid "Org"
msgstr ""
@@ -356,9 +233,21 @@ msgid "Dep"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:90
msgid "Off"
msgstr ""
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr ""
+
#: addressbook/backend/ebook/e-card-simple.c:92
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
msgid "Profession"
@@ -369,6 +258,12 @@ msgid "Prof"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:93
msgid "Man"
msgstr ""
@@ -377,9 +272,32 @@ msgid "Ass"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:95
msgid "Nick"
msgstr ""
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr ""
+
#: addressbook/backend/ebook/e-card-simple.c:98
msgid "CALUri"
msgstr ""
@@ -403,6 +321,11 @@ msgid "icsCalendar"
msgstr "Colours"
#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:101
msgid "Anniv"
msgstr ""
@@ -410,6 +333,12 @@ msgstr ""
msgid "Birth Date"
msgstr ""
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
#: addressbook/backend/ebook/e-card-simple.c:106
msgid "Family Name"
msgstr ""
@@ -425,33 +354,111 @@ msgid "%x"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
msgid "Unnamed List"
msgstr ""
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1313
+#: 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-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
#, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Address"
+msgstr "Colours"
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
+#: addressbook/backend/ebook/e-card.c:1333
+msgid "Address Label"
msgstr ""
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1340
+msgid "Phone"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1354
#, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Birth date"
+msgstr "Organisation:"
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1374
#, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Organizational Unit"
+msgstr "Organisation"
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+msgid "Mailer"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1450
+msgid "Free/Busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Colours"
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Organisation:"
+
+#: addressbook/backend/ebook/e-card.c:1485
+msgid "Category List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506
+msgid "List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1513
+msgid "List Show Addresses"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1520
+msgid "Arbitrary"
msgstr ""
+#: addressbook/backend/ebook/e-card.c:1527
+msgid "ID"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1534
+msgid "Last Use"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1545
+msgid "Use Score"
+msgstr ""
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Could not initialise Bonobo"
+
#: addressbook/backend/pas/pas-backend-file.c:464
#: addressbook/backend/pas/pas-backend-ldap.c:3050
msgid "Searching..."
@@ -509,14 +516,14 @@ msgid "EBook not loaded\n"
msgstr ""
#: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
msgid "Could not start wombat server"
msgstr ""
#: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
msgid "Could not start wombat"
msgstr ""
@@ -525,6 +532,142 @@ msgstr ""
msgid "Could not read pilot's Address application block"
msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise the Evolution shell."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook folder viewer"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Organisation:"
+
+#: addressbook/gui/component/addressbook-component.c:80
+msgid "Public folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:575
+msgid "Create a new contact"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:579
+msgid "Create a new contact list"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:206
+msgid "Failed to connect to LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:231
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1215
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1223
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1676
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:178
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Organisation:"
+
#: addressbook/gui/component/addressbook.c:502
msgid ""
"We were unable to open this addressbook. Please check that the\n"
@@ -633,103 +776,6 @@ msgstr ""
msgid "The URI that the Folder Browser will display"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "Organisation:"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:583
-msgid "Create a new contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-component.c:587
-msgid "Create a new contact list"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-storage.c:178
-#, fuzzy
-msgid "Other Contacts"
-msgstr "Organisation:"
-
#.
#. * This is the code for the UI thingie that lets you manipulate the e-mail
#. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -758,72 +804,33 @@ msgstr ""
msgid "Add address to existing contact \"%s\""
msgstr ""
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
msgid "Querying Addressbook..."
msgstr ""
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
msgid "Edit Contact Info"
msgstr ""
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
#: addressbook/gui/component/select-names/e-select-names-popup.c:324
msgid "Add to Contacts"
msgstr ""
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
msgid "Merge E-Mail Address"
msgstr ""
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
msgid "Disable Queries"
msgstr ""
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
msgid "Enable Queries (Dangerous!)"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise the Evolution shell."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
#: addressbook/gui/component/ldap-config.glade.h:1
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
#: mail/mail-config.glade.h:1
@@ -965,9 +972,10 @@ msgstr ""
msgid "S_earch scope: "
msgstr ""
+#. No time range is set, so don't start a query
#: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
msgid "Searching"
msgstr ""
@@ -1153,11 +1161,11 @@ 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
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
msgid "_Edit"
msgstr ""
@@ -1198,24 +1206,20 @@ msgstr ""
msgid "searching-tab"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+msgid "Remove All"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:694
#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
msgid "Remove"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
-msgid "Remove All"
-msgstr ""
-
#: addressbook/gui/component/select-names/e-select-names-popup.c:218
#, fuzzy
msgid "View Contact List"
@@ -1239,8 +1243,12 @@ msgstr ""
msgid "Source"
msgstr ""
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
+msgid "Find contact in"
msgstr ""
#: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -1313,7 +1321,7 @@ msgid "D_epartment:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
msgid "Details"
msgstr ""
@@ -1378,13 +1386,11 @@ msgid "_Categories..."
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: 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
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
msgid "_Delete"
msgstr ""
@@ -1426,15 +1432,15 @@ msgid "_Web page address:"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
#: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
#: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
#, fuzzy
msgid "Editable"
msgstr "Synchronising \"%s\""
@@ -2466,17 +2472,17 @@ msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor.c:156
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
#: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
#: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
msgid "Book"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor.c:163
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
#, fuzzy
msgid "Card"
msgstr "Colours"
@@ -2696,7 +2702,7 @@ msgstr ""
msgid "Contact List Editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
msgid "Save List as VCard"
msgstr ""
@@ -2739,7 +2745,7 @@ msgid ""
msgstr ""
#. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
#: widgets/misc/e-filter-bar.c:148
msgid "Advanced Search"
msgstr ""
@@ -2758,10 +2764,10 @@ msgid "%d cards"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
#: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
#: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
msgid "Query"
msgstr ""
@@ -2769,246 +2775,247 @@ msgstr ""
msgid "Error getting book view"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
msgid "Model"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
#: addressbook/gui/widgets/e-minicard.c:531
msgid "Error modifying card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
msgid "Success"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
#: camel/providers/imap/camel-imap-command.c:306
#: camel/providers/imap/camel-imap-command.c:403
#: camel/providers/pop3/camel-pop3-store.c:526
#: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
msgid "Unknown error"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
msgid "Repository offline"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
msgid "Permission denied"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
msgid "Card not found"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
msgid "Card ID already exists"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
msgid "Protocol not supported"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
#: camel/providers/pop3/camel-pop3-store.c:520
msgid "Cancelled"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
msgid "Authentication Failed"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
msgid "Authentication Required"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
msgid "TLS not Available"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
msgid "Addressbook does not exist"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
msgid "Other error"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
msgid "Do you want to save changes?"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
msgid "_Discard"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
msgid "Error adding list"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
msgid "Error adding card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
msgid "Error modifying list"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
msgid "Error removing list"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
msgid "Error removing card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
#, c-format
msgid ""
"Opening %d cards will open %d new windows as well.\n"
"Do you really want to display all of these cards?"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
msgid "Move card to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
msgid "Copy card to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
msgid "Move cards to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
msgid "Copy cards to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
msgid "Multiple VCards"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
#, c-format
msgid "VCard for %s"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
#: mail/importers/pine-importer.c:577
msgid "Addressbook"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
msgid "New Contact..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
msgid "New Contact List..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
msgid "Go to Folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
msgid "Import..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
msgid "Search for Contacts..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
msgid "Addressbook Sources..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
msgid "Pilot Settings..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
msgid "Send Message to Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
#: ui/my-evolution.xml.h:1
msgid "Print"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
msgid "Print Envelope"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
#, fuzzy
msgid "Copy to folder..."
msgstr "Synchronising \"%s\""
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
#, fuzzy
msgid "Move to folder..."
msgstr "Synchronising \"%s\""
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
#: mail/mail-accounts.c:234 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
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
msgid "Delete"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
msgid "Current View"
msgstr ""
@@ -3016,7 +3023,7 @@ msgstr ""
#. Translators: put here a list of labels you want to see on buttons in
#. addressbook. You may use any character to separate labels but it must
#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ""
@@ -3024,11 +3031,11 @@ msgstr ""
#. in addressbook. You may use any character to separate labels but it
#. must also be placed at the begining ot the string.
#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -3096,30 +3103,6 @@ msgstr ""
msgid "Primary Phone"
msgstr ""
-#: addressbook/gui/widgets/e-minicard.c:146
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:153
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:161
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Synchronising \"%s\""
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr ""
-
#: addressbook/gui/widgets/e-minicard-control.c:204
#, c-format
msgid "and %d other cards."
@@ -3133,6 +3116,21 @@ msgstr ""
msgid "Save in addressbook"
msgstr ""
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
+msgid "Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
+msgid "Height"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
+msgid "Has Focus"
+msgstr ""
+
#: addressbook/gui/widgets/e-minicard-label.c:136
msgid "Field"
msgstr ""
@@ -3149,6 +3147,10 @@ msgstr ""
msgid "Max field name length"
msgstr ""
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+msgid "Column Width"
+msgstr ""
+
#: addressbook/gui/widgets/e-minicard-view.c:141
msgid ""
"\n"
@@ -3169,8 +3171,13 @@ msgstr ""
msgid "Adapter"
msgstr ""
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:169
+#, fuzzy
+msgid "Selected"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/widgets/e-minicard.c:176
+msgid "Has Cursor"
msgstr ""
#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3181,18 +3188,18 @@ msgstr ""
msgid "GTK Tree View"
msgstr ""
-#: addressbook/printing/e-contact-print.c:1158
-msgid "Print cards"
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
msgstr ""
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
-msgid "Print card"
+#: addressbook/printing/e-contact-print.c:1139
+msgid "Print cards"
msgstr ""
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
+msgid "Print card"
msgstr ""
#: addressbook/printing/e-contact-print.glade.h:1
@@ -3365,60 +3372,6 @@ msgstr ""
msgid "_Font..."
msgstr ""
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local addressbook folders"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "[vcard|csv]"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-msgid "Impossible internal error."
-msgstr ""
-
#: calendar/cal-util/cal-component.c:1218
msgid "Untitled appointment"
msgstr ""
@@ -3548,30 +3501,28 @@ msgid "31st"
msgstr ""
#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
msgid "High"
msgstr ""
#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
msgid "Normal"
msgstr ""
#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
msgid "Low"
msgstr ""
#. An empty string is the same as 'None'.
#: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
msgid "Undefined"
msgstr ""
@@ -3579,13 +3530,13 @@ msgstr ""
msgid "Split Multi-Day Events:"
msgstr ""
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
msgid "Error while communicating with calendar server"
msgstr ""
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
msgid "Could not read pilot's Calendar application block"
msgstr ""
@@ -3593,34 +3544,82 @@ msgstr ""
msgid "Default Priority:"
msgstr ""
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
msgid "Could not read pilot's ToDo application block"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Cannot initialise the Evolution shell."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
#, fuzzy
msgid "Starting:"
msgstr "Synchronise \"%s\""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
msgid "Ending:"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
#, fuzzy
msgid "Evolution Alarm"
msgstr "Cannot initialise the Evolution shell."
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
#, c-format
msgid "Alarm on %s"
msgstr ""
#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
#, fuzzy
msgid "C_lose"
msgstr "Colours"
@@ -3637,25 +3636,16 @@ msgstr ""
msgid "_Edit appointment"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
msgid "No description available."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"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:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
msgid "Warning"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3663,7 +3653,7 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3674,63 +3664,53 @@ 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:887
msgid "Do not ask me about this program again."
msgstr ""
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Could not initialise Bonobo"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
#, fuzzy
msgid "Could not initialize gnome-vfs"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
msgid "Could not create the alarm notify service factory"
msgstr ""
-#: calendar/gui/calendar-commands.c:376
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
msgstr ""
-#: calendar/gui/calendar-commands.c:382
-msgid "Purge events older than"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
msgstr ""
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
msgstr ""
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:419
msgid "%A %d %B %Y"
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:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
msgid "%a %d %b"
msgstr ""
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
msgid "%a %d %b %Y"
msgstr ""
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
#, fuzzy
msgid "%d %B %Y"
msgstr "%m/%d/%Y"
@@ -3738,17 +3718,17 @@ msgstr "%m/%d/%Y"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
msgid "%d %B"
msgstr ""
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
#: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
#: shell/e-shortcuts.c:1085
@@ -3768,11 +3748,11 @@ msgstr "Colours"
msgid "Public folder containing appointments and events"
msgstr ""
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
#: calendar/importers/icalendar-importer.c:644
#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
msgid "Tasks"
msgstr ""
@@ -3838,86 +3818,163 @@ msgstr ""
msgid "Create a new all-day appointment"
msgstr ""
-#: calendar/gui/calendar-view-factory.c:118
-msgid "Day View"
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
msgstr ""
-#: calendar/gui/calendar-view-factory.c:121
-msgid "Work Week View"
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
msgstr ""
-#: calendar/gui/calendar-view-factory.c:124
-msgid "Week View"
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
msgstr ""
-#: calendar/gui/calendar-view-factory.c:127
-msgid "Month View"
+#: calendar/gui/calendar-model.c:523
+msgid "N"
msgstr ""
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Synchronising \"%s\""
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr ""
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
+#: calendar/gui/calendar-model.c:525
+msgid "E"
msgstr ""
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
+#: calendar/gui/calendar-model.c:525
+msgid "W"
msgstr ""
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
msgstr ""
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1120
-msgid "Unmatched"
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+msgid "Completed"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1036
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr ""
+
+#: calendar/gui/calendar-view-factory.c:118
+msgid "Day View"
+msgstr ""
+
+#: calendar/gui/calendar-view-factory.c:121
+msgid "Work Week View"
+msgstr ""
+
+#: calendar/gui/calendar-view-factory.c:124
+msgid "Week View"
msgstr ""
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/calendar-view-factory.c:127
+msgid "Month View"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:456
msgid "Error while opening the calendar"
msgstr ""
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
msgid "Method not supported when opening the calendar"
msgstr ""
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
msgid "Permission denied to open the calendar"
msgstr ""
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
#, fuzzy, c-format
msgid "Could not open the folder in '%s'"
msgstr "Synchronising \"%s\""
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
msgid "The URI that the calendar will display"
msgstr ""
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
msgid "The type of view to show"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
msgid "Audio Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
msgid "Message Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
#, fuzzy
msgid "Email Alarm Options"
msgstr "Synchronising \"%s\""
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
msgid "Program Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
msgid "Unknown Alarm Options"
msgstr ""
@@ -3955,6 +4012,10 @@ msgstr ""
msgid "With these arguments:"
msgstr ""
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr ""
+
#: calendar/gui/dialogs/alarm-options.glade.h:11
msgid "dialog1"
msgstr ""
@@ -3967,8 +4028,7 @@ msgstr ""
msgid "hours"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
msgid "minutes"
msgstr ""
@@ -3982,11 +4042,11 @@ msgstr ""
msgid "Date/Time:"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
msgid "Display a message"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
msgid "Play a sound"
msgstr ""
@@ -3994,7 +4054,7 @@ msgstr ""
msgid "Reminders"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
msgid "Run a program"
msgstr ""
@@ -4004,8 +4064,7 @@ msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:8
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr ""
@@ -4089,7 +4148,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
msgid "Friday"
msgstr ""
@@ -4103,7 +4162,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
msgid "Monday"
msgstr ""
@@ -4113,7 +4172,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
msgid "Saturday"
msgstr ""
@@ -4127,7 +4186,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
msgid "Sunday"
msgstr ""
@@ -4146,7 +4205,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
msgid "Thursday"
msgstr ""
@@ -4164,7 +4223,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
msgid "Tuesday"
msgstr ""
@@ -4174,12 +4233,12 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
msgid "Wednesday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
msgid "Work Week"
msgstr ""
@@ -4286,50 +4345,75 @@ msgstr ""
msgid "Are you sure you want to cancel and delete this journal entry?"
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
msgid "This event has been deleted."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
msgid "This task has been deleted."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
msgid "This journal entry has been deleted."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
msgid "This event has been changed."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
msgid "This task has been changed."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
msgid "This journal entry has been changed."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr ""
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr ""
+
#: calendar/gui/dialogs/comp-editor.c:334
#, fuzzy
msgid "Could not update invalid object"
@@ -4377,47 +4461,21 @@ msgid "No summary"
msgstr ""
#: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
msgid "Save as..."
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
msgid "Unable to obtain current version!"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr ""
-
#: calendar/gui/dialogs/delete-comp.c:96
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4520,31 +4578,31 @@ msgstr ""
msgid "Enter Delegate"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
msgid "Appointment"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
msgid "Reminder"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
msgid "Recurrence"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
msgid "Scheduling"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr ""
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
msgid "Start date is wrong"
msgstr ""
@@ -4580,7 +4638,8 @@ msgid "Classification"
msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:6
-msgid "Co_nfidential"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:7
@@ -4607,6 +4666,7 @@ msgid "Pu_blic"
msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
msgid "Show Time As"
msgstr ""
@@ -4623,34 +4683,74 @@ msgstr ""
msgid "_Start time:"
msgstr ""
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: 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
-msgid "None"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
msgid "The organizer selected no longer has an account."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
msgid "An organizer is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
msgid "At least one attendee is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:713
msgid "_Delegate To..."
msgstr ""
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr ""
+
#: calendar/gui/dialogs/meeting-page.glade.h:3
#: calendar/gui/e-itip-control.glade.h:9
#, fuzzy
@@ -4663,7 +4763,7 @@ msgid "_Change Organizer"
msgstr "Organisation:"
#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
msgid "_Invite Others..."
msgstr ""
@@ -4812,7 +4912,7 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
msgid "_Discard Changes"
msgstr ""
@@ -4837,80 +4937,52 @@ msgstr ""
msgid "The task information has changed. Send an updated version?"
msgstr ""
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
msgid "Completed date is wrong"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/e-calendar-table.etspec.h:2
#, no-c-format
-msgid "% _Complete"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 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-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
+msgid "% Complete"
msgstr ""
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
msgstr ""
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
msgid "Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-msgid "_Priority:"
+msgid "URL:"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
+msgid "_Priority:"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:15
-msgid "_Web Page:"
+msgid "_Status:"
msgstr ""
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
msgid "Basic"
msgstr ""
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
msgid "Assignment"
msgstr ""
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
msgid "Due date is wrong"
msgstr ""
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
msgid "Description:"
msgstr ""
@@ -4923,258 +4995,223 @@ msgstr ""
msgid "_Due Date:"
msgstr ""
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
#, c-format
msgid "%d days"
msgstr ""
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
msgid "1 day"
msgstr ""
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
#, c-format
msgid "%d weeks"
msgstr ""
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
msgid "1 week"
msgstr ""
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
#, c-format
msgid "%d hours"
msgstr ""
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
msgid "1 hour"
msgstr ""
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
#, c-format
msgid "%d minutes"
msgstr ""
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
msgid "1 minute"
msgstr ""
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
#, c-format
msgid "%d seconds"
msgstr ""
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
msgid "1 second"
msgstr ""
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
msgid "Send an email"
msgstr ""
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
msgid "Unknown action to be performed"
msgstr ""
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
#, c-format
msgid "%s %s before the start of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
#, c-format
msgid "%s %s after the start of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
#, c-format
msgid "%s at the start of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
#, c-format
msgid "%s %s before the end of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
#, c-format
msgid "%s %s after the end of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
#, c-format
msgid "%s at the end of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
#, c-format
msgid "%s at %s"
msgstr ""
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
#, c-format
msgid "%s for an unknown trigger type"
msgstr ""
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
msgid "0%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
msgid "10%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
msgid "20%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
msgid "30%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
msgid "40%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
msgid "50%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
msgid "60%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
msgid "70%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
msgid "80%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
msgid "90%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
msgid "100%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr ""
-#: calendar/gui/e-calendar-table.c:989
-msgid "Open _Web Page"
+#: calendar/gui/e-calendar-table.c:959
+msgid "_Save as..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
msgid "_Print..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 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-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
msgid "_Copy"
msgstr ""
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
msgid "_Paste"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
msgid "_Assign Task"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
msgid "_Forward as iCalendar"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
msgid "_Mark as Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
msgid "_Mark Selected Tasks as Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
msgid "_Delete Selected Tasks"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
msgid "Updating objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr ""
-
#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Alarms"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
msgid "Complete"
msgstr ""
@@ -5183,12 +5220,11 @@ msgid "Completion Date"
msgstr ""
#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Synchronising \"%s\""
+msgid "Due Date"
+msgstr ""
#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+msgid "End Date"
msgstr ""
#: calendar/gui/e-calendar-table.etspec.h:11
@@ -5199,627 +5235,579 @@ msgstr ""
msgid "Priority"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:13
-msgid "Start Date"
-msgstr ""
-
#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
+msgid "Start Date"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
#: my-evolution/component-factory.c:56 shell/e-shell.c:750
#: shell/e-shortcuts.c:1082
msgid "Summary"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
msgid "Task sort"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr "Colours"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-msgid "component"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr ""
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr ""
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
+#. 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:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:550
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
msgstr ""
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
+#: calendar/gui/e-day-view.c:3694
+msgid "New _Appointment"
msgstr ""
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
msgid "New Task"
msgstr ""
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
#: ui/evolution-calendar.xml.h:13
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
#: ui/evolution.xml.h:60
#, fuzzy
msgid "_Settings..."
msgstr "Cannot initialise the Evolution shell."
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
msgid "Make this Occurrence _Movable"
msgstr ""
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
msgid "Delete _All Occurrences"
msgstr ""
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-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:326
-#: calendar/gui/print.c:809
-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:329
-#: calendar/gui/print.c:811
-msgid "pm"
-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.c:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-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.c:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr ""
-
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
msgid "Yes. (Complex Recurrence)"
msgstr ""
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
msgid "Every day"
msgstr ""
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
#, c-format
msgid "Every %d days"
msgstr ""
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
msgid "Every week"
msgstr ""
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
#, c-format
msgid "Every %d weeks"
msgstr ""
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
msgid "Every week on "
msgstr ""
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
#, c-format
msgid "Every %d weeks on "
msgstr ""
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
msgid " and "
msgstr ""
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
#, c-format
msgid "The %s day of "
msgstr ""
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
#, c-format
msgid "The %s %s of "
msgstr ""
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
msgid "every month"
msgstr ""
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
#, c-format
msgid "every %d months"
msgstr ""
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
msgid "Every year"
msgstr ""
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
#, c-format
msgid "Every %d years"
msgstr ""
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
#, c-format
msgid " a total of %d times"
msgstr ""
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
msgid ", ending on "
msgstr ""
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
msgid "<b>Starts:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
msgid "<b>Ends:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
msgid "<b>Completed:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
msgid "<b>Due:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
msgid "iCalendar Information"
msgstr ""
#. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
msgid "iCalendar Error"
msgstr ""
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
msgid "An unknown person"
msgstr ""
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1050
msgid "<i>None</i>"
msgstr ""
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
#, fuzzy
msgid "Location:"
msgstr "Organisation"
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
msgid "Status:"
msgstr ""
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
msgid "Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
msgid "Tentatively Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
msgid "Declined"
msgstr ""
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
msgid "Choose an action:"
msgstr ""
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
msgid "Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr ""
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
msgid "Accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
msgid "Tentatively accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
msgid "Decline"
msgstr ""
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
msgid "Send Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
msgid "Update respondent status"
msgstr ""
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
msgid "Send Latest Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr ""
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1323
msgid "Meeting Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1331
msgid "Meeting Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1336
msgid "Meeting Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1341
msgid "Meeting Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1349
msgid "Meeting Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1357
msgid "Meeting Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1365
msgid "Bad Meeting Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1390
msgid "Task Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1376
+#: calendar/gui/e-itip-control.c:1398
msgid "Task Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1381
+#: calendar/gui/e-itip-control.c:1403
msgid "Task Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1408
msgid "Task Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr ""
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1416
msgid "Task Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1424
msgid "Task Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
msgid "Bad Task Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1430
+#: calendar/gui/e-itip-control.c:1452
msgid "Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1457
msgid "Free/Busy Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1440
+#: calendar/gui/e-itip-control.c:1462
msgid "Free/Busy Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
msgid "Bad Free/Busy Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
msgid "The message does not appear to be properly formed"
msgstr ""
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
msgid "The message contains only unsupported requests."
msgstr ""
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
msgid "The attachment has no viewable calendar items"
msgstr ""
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
msgid "There was an error on the CORBA system\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
msgid "Object could not be found\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
#, fuzzy
msgid "You do not have the right permissions to update the calendar\n"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
msgid "Calendar file could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1958
+#: calendar/gui/e-itip-control.c:1974
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
#, fuzzy
msgid "You don't have the right permissions to update the calendar\n"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
msgid "Attendee status could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
msgid "The item could not be sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
#, fuzzy
msgid "Select Calendar Folder"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
#, fuzzy
msgid "Select Tasks Folder"
msgstr "Synchronising \"%s\""
@@ -5861,274 +5849,248 @@ msgstr ""
msgid "date-start"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:392
-msgid "Tentative"
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
-msgid "Out of Office"
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:395
-msgid "No Information"
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:434
-msgid "_Options"
+#: calendar/gui/e-meeting-model.c:82
+msgid "Resources"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:451
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:461
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:476
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:491
-msgid "_<<"
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:509
-msgid "_Autopick"
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:524
-msgid ">_>"
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:541
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:550
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:559
-msgid "_Required People"
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:568
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+msgid "Tentative"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:587
-msgid "Meeting _start time:"
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.c:607
-msgid "Meeting _end time:"
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+msgid "In Process"
msgstr ""
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel-item.c:458
+#: calendar/gui/e-meeting-time-sel.c:2098
msgid "%A, %B %d, %Y"
msgstr ""
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2087
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
msgid "%a %m/%d/%Y"
msgstr "%a %d/%m/%Y"
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+msgid "Out of Office"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
+#: calendar/gui/e-meeting-time-sel.c:408
+msgid "No Information"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
+#: calendar/gui/e-meeting-time-sel.c:447
+msgid "_Options"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
+#: calendar/gui/e-meeting-time-sel.c:464
+msgid "Show _Only Working Hours"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
+#: calendar/gui/e-meeting-time-sel.c:474
+msgid "Show _Zoomed Out"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
+#: calendar/gui/e-meeting-time-sel.c:489
+msgid "_Update Free/Busy"
msgstr ""
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
+#: calendar/gui/e-meeting-time-sel.c:504
+msgid "_<<"
msgstr ""
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
+#: calendar/gui/e-meeting-time-sel.c:522
+msgid "_Autopick"
+msgstr ""
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
+#: calendar/gui/e-meeting-time-sel.c:537
+msgid ">_>"
msgstr ""
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "Organisation:"
+#: calendar/gui/e-meeting-time-sel.c:554
+msgid "_All People and Resources"
+msgstr ""
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "Organisation:"
+#: calendar/gui/e-meeting-time-sel.c:563
+msgid "All _People and One Resource"
+msgstr ""
-#. write priority
-#: calendar/gui/e-tasks.c:265
-msgid "Priority:"
+#: calendar/gui/e-meeting-time-sel.c:572
+msgid "_Required People"
msgstr ""
-#. URL
-#: calendar/gui/e-tasks.c:321
-msgid "Web Page:"
+#: calendar/gui/e-meeting-time-sel.c:581
+msgid "Required People and _One Resource"
msgstr ""
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-meeting-time-sel.c:600
+msgid "Meeting _start time:"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:620
+msgid "Meeting _end time:"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
#, c-format
msgid "Opening tasks at %s"
msgstr ""
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr ""
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr ""
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
#, fuzzy, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
#, c-format
msgid ""
"Error on %s:\n"
" %s"
msgstr ""
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
msgid "Expunging"
msgstr ""
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1481
#, c-format
msgid "Could not open the folder in `%s'"
msgstr ""
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr ""
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
#, fuzzy, c-format
msgid "Adding alarms for %s"
msgstr "Synchronising \"%s\""
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
#, c-format
msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
"%s\n"
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
#, c-format
msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
"%s\n"
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
#, c-format
msgid "Opening calendar at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
#, fuzzy
msgid "Opening default tasks folder"
msgstr "Synchronising \"%s\""
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "Synchronise \"%s\""
-
-#: calendar/gui/gnome-cal.c:3178
-msgid "Purging"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Cannot initialise the Evolution shell."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Cannot initialise the Evolution shell."
-
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr ""
@@ -6235,7 +6197,7 @@ msgstr ""
msgid "iCalendar information"
msgstr ""
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
msgid "You must be an attendee of the event."
msgstr ""
@@ -6268,81 +6230,82 @@ msgid "Sa"
msgstr ""
#. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
msgid "Selected day (%a %b %d %Y)"
msgstr ""
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
msgid "%a %b %d"
msgstr ""
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
msgid "%a %d %Y"
msgstr ""
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
msgid "%a %b %d %Y"
msgstr ""
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
#, c-format
msgid "Selected week (%s - %s)"
msgstr ""
#. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
msgid "Selected month (%b %Y)"
msgstr ""
#. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
msgid "Selected year (%Y)"
msgstr ""
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
msgid "Task"
msgstr ""
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
#, c-format
msgid "Status: %s"
msgstr ""
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
#, c-format
msgid "Priority: %s"
msgstr ""
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
#, c-format
msgid "Percent Complete: %i"
msgstr ""
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
#, c-format
msgid "URL: %s"
msgstr ""
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
#, c-format
msgid "Categories: %s"
msgstr ""
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
msgid "Contacts: "
msgstr ""
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
msgid "Print Preview"
msgstr ""
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
msgid "Print Item"
msgstr ""
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
msgid "Print Setup"
msgstr ""
@@ -6350,7 +6313,7 @@ msgstr ""
msgid "The URI of the tasks folder to display"
msgstr ""
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -6358,11 +6321,11 @@ msgid ""
"Really erase these tasks?"
msgstr ""
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
msgid "Do not ask me again."
msgstr ""
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
msgid "Print Tasks"
msgstr ""
@@ -8053,27 +8016,27 @@ msgstr ""
msgid "Pacific/Yap"
msgstr ""
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
msgid "Signing is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
msgid "Verifying is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
msgid "Encryption is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
msgid "Decryption is not supported by this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
msgid "You may not import keys with this cipher"
msgstr ""
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
msgid "You may not export keys with this cipher"
msgstr ""
@@ -8106,11 +8069,7 @@ msgstr ""
msgid "Resynchronizing with server"
msgstr ""
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
#, fuzzy, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Synchronising \"%s\""
@@ -8131,59 +8090,59 @@ msgstr "Synchronising \"%s\""
msgid "Failed to create create child process '%s': %s"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
#, fuzzy, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
#, fuzzy
msgid "Syncing folders"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
#, c-format
msgid "Error executing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
msgid "Unable to open spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
msgid "Unable to process spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
#, c-format
msgid "Getting message %d (%d%%)"
msgstr ""
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
msgid "Cannot open message"
msgstr ""
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
#, c-format
msgid "Failed on message %d"
msgstr ""
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
#, fuzzy
msgid "Syncing folder"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
#, c-format
msgid "Getting message %d of %d"
msgstr ""
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
#, c-format
msgid "Failed at message %d of %d"
msgstr ""
@@ -8205,54 +8164,50 @@ msgstr ""
msgid "Error executing filter search: %s: %s"
msgstr ""
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1163
+#: camel/camel-folder-search.c:346
#, c-format
-msgid "Unsupported operation: search by expression: for %s"
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
msgstr ""
-#: camel/camel-folder.c:1203
+#: camel/camel-folder-search.c:356
#, c-format
-msgid "Unsupported operation: search by uids: for %s"
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
msgstr ""
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+msgid "(match-all) requires a single bool result"
msgstr ""
-#: camel/camel-folder.c:1321
-msgid "Copying messages"
+#: camel/camel-folder-search.c:653
+#, c-format
+msgid "Performing query on unknown header: %s"
msgstr ""
-#: camel/camel-folder.c:1571
-msgid "Filtering new message(s)"
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder.c:1161
#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by expression: for %s"
msgstr ""
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder.c:1201
#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
+msgid "Unsupported operation: search by uids: for %s"
msgstr ""
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
msgstr ""
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
+#: camel/camel-folder.c:1319
+msgid "Copying messages"
msgstr ""
#: camel/camel-gpg-context.c:762
@@ -8280,7 +8235,7 @@ msgstr ""
#: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
#: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
msgid "Cancelled."
msgstr ""
@@ -8332,44 +8287,44 @@ msgstr ""
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr ""
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:111
#, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
msgstr ""
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:124
#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
msgstr ""
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
msgstr ""
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:215
#, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
msgstr ""
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
#, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
msgstr ""
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
#, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
msgstr ""
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
msgstr ""
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
#, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
msgstr ""
#: camel/camel-movemail.c:107
@@ -8438,11 +8393,11 @@ msgstr ""
msgid "Failed to decrypt MIME part: parse error"
msgstr ""
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
msgid "This is a digitally signed message part"
msgstr ""
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
msgid "parse error"
msgstr ""
@@ -8504,11 +8459,11 @@ msgid ""
"the server supports it."
msgstr ""
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
msgid "DIGEST-MD5"
msgstr ""
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -8599,7 +8554,7 @@ msgstr ""
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1052
msgid "Bad authentication response from server."
msgstr ""
@@ -8653,23 +8608,23 @@ msgstr ""
msgid "PLAIN"
msgstr ""
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
msgid "POP before SMTP"
msgstr ""
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr ""
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
msgid "POP Source URI"
msgstr ""
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
msgid "POP Before SMTP auth using an unknown transport"
msgstr ""
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
msgid "POP Before SMTP auth using a non-pop source"
msgstr ""
@@ -8678,56 +8633,56 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr ""
-#: camel/camel-service.c:277
+#: camel/camel-service.c:282
#, c-format
msgid "URL '%s' needs a username component"
msgstr ""
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
#, c-format
msgid "URL '%s' needs a host component"
msgstr ""
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
#, c-format
msgid "URL '%s' needs a path component"
msgstr ""
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
#, c-format
msgid "Resolving: %s"
msgstr ""
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
#, c-format
msgid "Failure in name lookup: %s"
msgstr ""
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
#, c-format
msgid "Host lookup failed: cannot create thread: %s"
msgstr ""
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr ""
-#: camel/camel-service.c:806
+#: camel/camel-service.c:821
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr ""
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
#, fuzzy
msgid "Resolving address"
msgstr "Synchronising \"%s\""
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
msgid "Host lookup failed: host not found"
msgstr ""
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
msgid "Host lookup failed: unknown reason"
msgstr ""
@@ -8739,12 +8694,12 @@ msgstr ""
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
#, c-format
msgid "No provider available for protocol `%s'"
msgstr ""
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -8788,132 +8743,132 @@ msgstr ""
msgid "Failed to verify certificates."
msgstr ""
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
#, fuzzy
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Synchronising \"%s\""
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
msgid "Cannot create folder: Invalid operation on this store"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
msgid "Unable to get issuer's certificate"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
msgid "Unable to get Certificate Revocation List"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
msgid "Unable to decrypt certificate signature"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
msgid "Unable to decrypt Certificate Revocation List signature"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
msgid "Unable to decode issuer's public key"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
msgid "Certificate signature failure"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
msgid "Certificate Revocation List signature failure"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
msgid "Certificate not yet valid"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
msgid "Certificate has expired"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
msgid "CRL not yet valid"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
msgid "CRL has expired"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
msgid "Error in CRL"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
msgid "Out of memory"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
msgid "Zero-depth self-signed certificate"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
msgid "Self-signed certificate in chain"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
msgid "Unable to get issuer's certificate locally"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
msgid "Unable to verify leaf signature"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
msgid "Certificate chain too long"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
msgid "Certificate Revoked"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
msgid "Invalid Certificate Authority (CA)"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
msgid "Path length exceeded"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
msgid "Invalid purpose"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
msgid "Certificate untrusted"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
msgid "Certificate rejected"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
msgid "Subject/Issuer mismatch"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
msgid "AKID/SKID mismatch"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
msgid "AKID/Issuer serial mismatch"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
msgid "Key usage does not support certificate signing"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
msgid "Error in application verification"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
#, c-format
msgid ""
"Issuer: %s\n"
@@ -8922,15 +8877,15 @@ msgid ""
"Signature: %s"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
msgid "GOOD"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
msgid "BAD"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -8943,7 +8898,7 @@ msgid ""
msgstr ""
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -8953,28 +8908,28 @@ msgid ""
"Do you wish to accept?"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
#, c-format
msgid ""
"Certificate problem: %s\n"
"Issuer: %s"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
#, c-format
msgid ""
"Bad certificate domain: %s\n"
"Issuer: %s"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
#, c-format
msgid ""
"Certificate expired: %s\n"
"Issuer: %s"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -8986,17 +8941,17 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr ""
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
#, c-format
msgid "Error storing `%s': %s"
msgstr ""
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
#, c-format
msgid "No such message %s in %s"
msgstr ""
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr ""
@@ -9023,12 +8978,12 @@ msgstr "Synchronising \"%s\""
#: camel/providers/imap/camel-imap-command.c:221
#: camel/providers/imap/camel-imap-command.c:260
#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
msgid "Operation cancelled"
msgstr ""
#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr ""
@@ -9065,62 +9020,62 @@ msgstr ""
msgid "Unexpected OK response from IMAP server: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
#, c-format
msgid "Could not create directory %s: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
msgid "Folder was destroyed and recreated on server."
msgstr ""
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
msgid "Scanning for changed messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
#, fuzzy, c-format
msgid "Unable to retrieve message: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
#, c-format
msgid ""
"Cannot get message: %s\n"
" %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
msgid "No such message"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -9170,100 +9125,85 @@ msgstr ""
msgid "Apply filters to new messages in INBOX on this server"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Automatically synchronize remote mail locally"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
msgid "IMAP"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
msgid "For reading and storing mail on IMAP servers."
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/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
msgid "Password"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
#, c-format
msgid "IMAP server %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
#, c-format
msgid "IMAP service for %s on %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
#: camel/providers/pop3/camel-pop3-store.c:184
msgid "Connection cancelled"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
#, fuzzy, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
#: camel/providers/pop3/camel-pop3-store.c:220
msgid "SSL/TLS extension not supported."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
#: camel/providers/pop3/camel-pop3-store.c:261
msgid "SSL negotiations failed"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:824
-#, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1075
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1122
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -9271,68 +9211,42 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-msgid "IMAP+"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/local/camel-local-folder.c:179
-msgid "Index message body data"
-msgstr ""
-
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
#, c-format
msgid "~%s (%s)"
msgstr ""
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
#, c-format
msgid "mailbox:%s (%s)"
msgstr ""
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
#, c-format
msgid "%s (%s)"
msgstr ""
@@ -9386,54 +9300,50 @@ msgid ""
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
msgstr ""
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
#, c-format
msgid "Store root %s is not a regular directory"
msgstr ""
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
msgid "Local stores do not have an inbox"
msgstr ""
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
#, c-format
msgid "Local mail file %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
#, fuzzy, c-format
msgid "Could not rename '%s': %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
@@ -9447,17 +9357,17 @@ msgstr ""
msgid "Unable to add message to summary: unknown reason"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:184
msgid "Maildir append message cancelled"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:187
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
msgid "Invalid message contents"
msgstr ""
@@ -9471,7 +9381,7 @@ msgid ""
msgstr ""
#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
#: camel/providers/local/camel-mh-store.c:209
#: camel/providers/local/camel-spool-store.c:167
#, c-format
@@ -9533,108 +9443,76 @@ msgstr ""
msgid "Storing folder"
msgstr "Synchronising \"%s\""
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
msgid "Mail append cancelled"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
" %s"
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
msgid "The folder appears to be irrecoverably corrupted."
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
msgid "Message construction failed: Corrupt mailbox?"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
#, c-format
msgid ""
"Could not open file `%s':\n"
"%s"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
#, c-format
msgid ""
"Could not create file `%s':\n"
"%s"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
#, c-format
msgid "`%s' is not a regular file."
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
#, c-format
msgid ""
"Could not delete folder `%s':\n"
"%s"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
#, c-format
msgid "Folder `%s' is not empty. Not deleted."
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/local/camel-mbox-store.c:427
-msgid "The new folder name is illegal."
-msgstr ""
-
#: camel/providers/local/camel-mbox-summary.c:343
#, c-format
msgid "Could not open folder: %s: %s"
@@ -9664,7 +9542,7 @@ msgid "Cannot open temporary mailbox: %s"
msgstr ""
#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
#, c-format
msgid "Could not close source folder %s: %s"
msgstr ""
@@ -9681,38 +9559,38 @@ msgstr ""
#: camel/providers/local/camel-mbox-summary.c:644
#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
msgid "Summary and folder mismatch, even after a sync"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
#: camel/providers/local/camel-spool-summary.c:334
#, c-format
msgid "Unknown error: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
#, fuzzy, c-format
msgid "Could not store folder: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr ""
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr ""
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
msgid "MH append message cancelled"
msgstr ""
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr ""
@@ -9790,63 +9668,6 @@ msgid ""
"Folder may be corrupt, copy saved in `%s'"
msgstr ""
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
-msgid "Failed to send username to server"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, fuzzy, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
-msgid "Could not get group list from server."
-msgstr "Synchronising \"%s\""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Synchronising \"%s\""
-
#: camel/providers/nntp/camel-nntp-provider.c:41
msgid "USENET news"
msgstr ""
@@ -9855,58 +9676,58 @@ msgstr ""
msgid "This is a provider for reading from and posting toUSENET newsgroups."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
#, fuzzy, c-format
msgid "Could not read greeting from %s: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
#, c-format
msgid "USENET News via %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
#, fuzzy, c-format
msgid "No such folder: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
#, c-format
msgid "Could not get group: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
#, c-format
msgid "NNTP Command failed: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
#, c-format
msgid "%s: Scanning new messages"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
#, c-format
msgid "Unknown server response: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
msgid "Use cancel"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
#, c-format
msgid "Operation failed: %s"
msgstr ""
@@ -9915,6 +9736,13 @@ msgstr ""
msgid "Retrieving POP summary"
msgstr ""
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr ""
+
#: camel/providers/pop3/camel-pop3-folder.c:265
#, fuzzy, c-format
msgid "Cannot get POP summary: %s"
@@ -9924,22 +9752,34 @@ msgstr "Synchronising \"%s\""
msgid "Expunging deleted messages"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
#, c-format
msgid "No message with uid %s"
msgstr ""
#. Sigh, most of the crap in this function is so that the cancel button
#. returns the proper exception code. Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
#, c-format
msgid "Retrieving POP message %d"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
msgid "Unknown reason"
msgstr ""
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr ""
+
#: camel/providers/pop3/camel-pop3-provider.c:40
msgid "Leave messages on server"
msgstr ""
@@ -10093,140 +9933,140 @@ msgstr ""
msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
msgid "Syntax error, command unrecognized"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
msgid "Syntax error in parameters or arguments"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
msgid "Command not implemented"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
msgid "Command parameter not implemented"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
msgid "System status, or system help reply"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
msgid "Help message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
msgid "Service ready"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
msgid "Service closing transmission channel"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
msgid "Service not available, closing transmission channel"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
msgid "Requested mail action okay, completed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
msgid "User not local; will forward to <forward-path>"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
msgid "Requested mail action not taken: mailbox unavailable"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
msgid "Requested action not taken: mailbox unavailable"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
msgid "Requested action aborted: error in processing"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
msgid "User not local; please try <forward-path>"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
msgid "Requested action not taken: insufficient system storage"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
msgid "Requested action not taken: mailbox name not allowed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
msgid "Transaction failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
msgid "A password transition is needed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
msgid "Authentication mechanism is too weak"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
msgid "Encryption required for requested authentication mechanism"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
msgid "Temporary authentication failure"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
msgid "Authentication required"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
msgid "Welcome response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: 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:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
msgid "server does not appear to support SSL"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
#, c-format
msgid "STARTTLS request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
msgid "STARTTLS response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: 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:513
+#: 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:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -10234,87 +10074,87 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
#, c-format
msgid "SMTP server %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
#, c-format
msgid "SMTP mail delivery via %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
msgid "Sending message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
msgid "Cannot send message: no recipients defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: 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:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
msgid "SMTP Greeting"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
#, c-format
msgid "HELO request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
msgid "HELO response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
msgid "SMTP Authentication"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
msgid "Error creating SASL authentication object."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
#, c-format
msgid "AUTH request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
msgid "AUTH request failed."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
msgid "Bad authentication response from server.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
msgid "MAIL FROM response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
#, c-format
msgid "RCPT TO <%s> failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr ""
@@ -10322,66 +10162,67 @@ 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:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
msgid "DATA response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
msgid "DATA termination response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
#, c-format
msgid "RSET request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
msgid "RSET response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
#, c-format
msgid "QUIT request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
msgid "QUIT response error"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
#, c-format
msgid "%.0fK"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
#, c-format
msgid "%.0fM"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
#, c-format
msgid "%.0fG"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
msgid "attachment"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
msgid "Remove selected items from the attachment list"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
msgid "Add attachment..."
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
msgid "Attach a file to the message"
msgstr ""
@@ -10413,76 +10254,151 @@ msgstr ""
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr ""
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr ""
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr ""
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+msgid "Post To:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:553
+msgid "Posting destination"
+msgstr ""
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr ""
+
+#: composer/e-msg-composer.c:535
#, fuzzy
msgid "Could not create a PGP signature context"
msgstr "Synchronising \"%s\""
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
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:1594
+#: composer/e-msg-composer.c:1552
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -10490,34 +10406,34 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
msgid "Signature:"
msgstr ""
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
msgid "Autogenerated"
msgstr ""
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -10525,92 +10441,18 @@ msgid ""
"of gtkhtml and libgtkhtml installed.\n"
msgstr ""
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
msgstr ""
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:290
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr ""
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr ""
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr ""
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-msgid "Post To:"
-msgstr ""
-
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr ""
-
-#: composer/e-msg-composer-select-file.c:119
-msgid "Attach file(s)"
-msgstr ""
-
#: data/evolution.desktop.in.h:1
msgid "The Evolution groupware suite"
msgstr ""
@@ -10767,7 +10609,7 @@ msgid ""
"Overwrite it?"
msgstr ""
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
msgid "Overwrite file?"
msgstr ""
@@ -10789,214 +10631,98 @@ msgstr ""
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
#, fuzzy
msgid "%a %m/%d/%Y %I %p"
msgstr "%a %d/%m/%Y %I:%M %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
#, fuzzy
msgid "%a %m/%d/%Y %H"
msgstr "%a %d/%m/%Y %H:%M"
#. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
#, fuzzy
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%a %d/%m/%Y %I:%M:%S %p"
#. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
#, fuzzy
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strptime format of a date and a time, in 12-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
#, fuzzy
msgid "%m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
#. strptime format of a date and a time, in 24-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
#, fuzzy
msgid "%m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
#. strptime format of a date and a time, in 12-hour format,
#. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
#, fuzzy
msgid "%m/%d/%Y %I %p"
msgstr "%a %d/%m/%Y %I:%M %p"
#. strptime format of a date and a time, in 24-hour format,
#. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
#, fuzzy
msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y"
#. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
msgid "%I:%M:%S %p"
msgstr ""
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
msgid "%H:%M:%S"
msgstr ""
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
msgid "%I:%M %p"
msgstr ""
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
msgid "%H:%M"
msgstr ""
#. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
msgid "%I %p"
msgstr ""
-#: executive-summary/component/component-factory.c:151
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/component/e-summary.c:925
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "Synchronising \"%s\""
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Synchronising \"%s\""
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Colours"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Synchronising \"%s\""
-
-#: executive-summary/component/e-summary-url.c:553
-#, fuzzy
-msgid "page"
-msgstr "Organisation:"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr ""
-
#: filter/filter-datespec.c:65
msgid "1 second ago"
msgstr ""
@@ -11116,6 +10842,82 @@ msgstr "Synchronising \"%s\""
msgid "Select Folder"
msgstr ""
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+msgid "Work"
+msgstr ""
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr ""
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr ""
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr ""
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr ""
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:800
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr ""
+
#: filter/filter.glade.h:1
msgid "Compare against"
msgstr ""
@@ -11210,82 +11012,6 @@ msgstr ""
msgid "years"
msgstr ""
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-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
-msgid "Important"
-msgstr ""
-
-#. red
-#: 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 ""
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr ""
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr ""
-
#. Automatically generated. Do not edit.
#: filter/libfilter-i18n.h:2
msgid "Adjust Score"
@@ -11308,218 +11034,218 @@ msgid "Beep"
msgstr ""
#: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "contains"
msgstr ""
#: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Copy to Folder"
msgstr ""
#: filter/libfilter-i18n.h:9
-msgid "Date sent"
+msgid "Date received"
msgstr ""
-#: filter/libfilter-i18n.h:11
-msgid "Deleted"
+#: filter/libfilter-i18n.h:10
+msgid "Date sent"
msgstr ""
#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
+msgid "Deleted"
msgstr ""
#: filter/libfilter-i18n.h:13
-msgid "Draft"
+msgid "does not contain"
msgstr ""
#: filter/libfilter-i18n.h:14
-msgid "Exist"
+msgid "does not end with"
msgstr ""
#: filter/libfilter-i18n.h:15
-msgid "Expression"
+msgid "does not exist"
msgstr ""
#: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+msgid "does not return"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
msgstr ""
#: filter/libfilter-i18n.h:18
-msgid "Label"
+msgid "does not start with"
msgstr ""
#: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
msgstr ""
#: filter/libfilter-i18n.h:20
-msgid "Message Body"
+msgid "Draft"
msgstr ""
#: filter/libfilter-i18n.h:21
-msgid "Message Header"
+msgid "ends with"
msgstr ""
#: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
+msgid "Exist"
msgstr ""
#: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
+msgid "exists"
msgstr ""
#: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
+msgid "Expression"
msgstr ""
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
msgstr ""
#: filter/libfilter-i18n.h:27
-msgid "Regex Match"
+msgid "is"
msgstr ""
#: filter/libfilter-i18n.h:28
-msgid "Replied to"
+msgid "is after"
msgstr ""
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:29
+msgid "is before"
msgstr ""
#: filter/libfilter-i18n.h:30
-msgid "Sender"
+msgid "is Flagged"
msgstr ""
#: filter/libfilter-i18n.h:31
-msgid "Set Status"
+msgid "is greater than"
msgstr ""
#: filter/libfilter-i18n.h:32
-#, fuzzy
-msgid "Shell Command"
-msgstr "Colours"
+msgid "is less than"
+msgstr ""
#: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
+msgid "is not"
msgstr ""
#: filter/libfilter-i18n.h:34
-msgid "Source Account"
+msgid "is not Flagged"
msgstr ""
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "Mailing list"
msgstr ""
#: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
+msgid "Message Body"
msgstr ""
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
-msgid "Subject"
+#: filter/libfilter-i18n.h:38
+msgid "Message Header"
msgstr ""
#: filter/libfilter-i18n.h:39
-msgid "Unset Status"
+msgid "Move to Folder"
msgstr ""
#: filter/libfilter-i18n.h:40
-msgid "contains"
+msgid "Pipe Message to Shell Command"
msgstr ""
#: filter/libfilter-i18n.h:41
-msgid "does not contain"
+msgid "Play Sound"
msgstr ""
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
+msgid "Read"
msgstr ""
#: filter/libfilter-i18n.h:43
-msgid "does not exist"
+msgid "Recipients"
msgstr ""
#: filter/libfilter-i18n.h:44
-msgid "does not return"
+msgid "Regex Match"
msgstr ""
#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
+msgid "Replied to"
msgstr ""
#: filter/libfilter-i18n.h:46
-msgid "does not start with"
+msgid "returns"
msgstr ""
#: filter/libfilter-i18n.h:47
-msgid "ends with"
+msgid "returns greater than"
msgstr ""
#: filter/libfilter-i18n.h:48
-msgid "exists"
+msgid "returns less than"
msgstr ""
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:50
-msgid "is after"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+msgid "Sender"
msgstr ""
#: filter/libfilter-i18n.h:51
-msgid "is before"
+msgid "Set Status"
msgstr ""
#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr ""
+#, fuzzy
+msgid "Shell Command"
+msgstr "Colours"
#: filter/libfilter-i18n.h:53
-msgid "is less than"
+msgid "Size (kB)"
msgstr ""
#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
+msgid "sounds like"
msgstr ""
#: filter/libfilter-i18n.h:55
-msgid "is not"
+msgid "Source Account"
msgstr ""
#: filter/libfilter-i18n.h:56
-msgid "is"
+msgid "Specific header"
msgstr ""
#: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
+msgid "starts with"
msgstr ""
#: filter/libfilter-i18n.h:59
-msgid "returns"
+msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+msgid "Subject"
msgstr ""
#: filter/libfilter-i18n.h:61
-msgid "starts with"
+msgid "Unset Status"
msgstr ""
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
#, c-format
msgid "Rule name '%s' is not unique, choose another."
msgstr ""
@@ -11589,9 +11315,10 @@ msgid "Scanning %s"
msgstr "Synchronise \"%s\""
#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
msgid "Mail"
msgstr ""
@@ -11654,7 +11381,7 @@ msgstr ""
#. Fill in the new fields
#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
msgid "Trash"
msgstr ""
@@ -11670,7 +11397,7 @@ msgid "Scanning directory"
msgstr "Synchronising \"%s\""
#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
msgid "Starting import"
msgstr ""
@@ -11702,152 +11429,339 @@ msgstr ""
msgid "Pine"
msgstr ""
-#: mail/component-factory.c:116
-msgid "Folder containing mail"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Cannot initialise the Evolution shell."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+msgid "Mail Preferences"
msgstr ""
#: mail/component-factory.c:117
+msgid "Folder containing mail"
+msgstr ""
+
+#: mail/component-factory.c:118
msgid "Public Mail"
msgstr ""
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
msgid "Public folder containing mail"
msgstr ""
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
msgid "Virtual Trash"
msgstr ""
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
msgid "Virtual Trash folder"
msgstr ""
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
msgid "This folder cannot contain messages."
msgstr ""
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
msgid "Properties..."
msgstr ""
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
msgid "Change this folder's properties"
msgstr ""
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
msgstr ""
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
msgid "You have not set a mail transport method"
msgstr ""
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
msgid "New Mail Message"
msgstr ""
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
msgid "_Mail Message"
msgstr ""
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
msgid "Compose a new mail message"
msgstr ""
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
#, fuzzy
msgid "New Message Post"
msgstr "Colours"
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
msgid "_Post Message"
msgstr ""
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
msgid "Post a new mail message"
msgstr ""
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
msgid "Connecting..."
msgstr ""
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
msgid "Cannot register storage with shell"
msgstr ""
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Cannot initialise the Evolution shell."
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1182
+msgid "Create _Virtual Folder From Search..."
+msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
+msgstr ""
+
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
+msgstr ""
+
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
+msgstr ""
+
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
+msgstr ""
+
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
+msgstr ""
+
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
+msgstr ""
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr ""
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr ""
+
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr ""
+
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr ""
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr ""
+
+#: mail/folder-browser.c:1777
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1778
+msgid "Fla_g Completed"
+msgstr ""
+
+#: mail/folder-browser.c:1779
#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Cannot initialise Evolution's mail summary component."
+msgid "Cl_ear Flag"
+msgstr "Colours"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
+#: mail/folder-browser.c:1784
+msgid "Mark as _Unread"
+msgstr ""
+
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr ""
+
+#: mail/folder-browser.c:1786
+msgid "_Mark as Unimportant"
+msgstr ""
+
+#: mail/folder-browser.c:1791
+msgid "U_ndelete"
+msgstr ""
+
+#: mail/folder-browser.c:1795
+msgid "Mo_ve to Folder..."
+msgstr ""
+
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: mail/folder-browser.c:1804
+msgid "Add Sender to Address_book"
+msgstr ""
+
+#: mail/folder-browser.c:1808
+msgid "Appl_y Filters"
+msgstr ""
+
+#: mail/folder-browser.c:1812
+msgid "Crea_te Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:2071
+msgid "VFolder on M_ailing List"
+msgstr ""
+
+#: mail/folder-browser.c:2073
+#, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr ""
+
+#: mail/folder-browser.c:2074
+#, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr ""
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Synchronising \"%s\""
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
msgstr ""
#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
@@ -11934,7 +11848,7 @@ msgstr ""
msgid "_Path:"
msgstr ""
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
msgid "You may not create two accounts with the same name."
msgstr ""
@@ -11966,16 +11880,16 @@ msgstr "Synchronising \"%s\""
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
msgid "Enabled"
msgstr ""
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
msgid "Account name"
msgstr ""
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
msgid "Protocol"
msgstr ""
@@ -12015,6 +11929,182 @@ msgid ""
"And have been updated."
msgstr ""
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr ""
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+
+#: mail/mail-callbacks.c:212
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr ""
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr ""
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr ""
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr ""
+
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:2686
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr ""
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr ""
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr ""
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
#: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
#: mail/mail-config.c:1376
msgid "Unnamed"
@@ -12041,55 +12131,47 @@ msgstr ""
msgid "Signature(s)"
msgstr ""
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr ""
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
msgid "Identity"
msgstr ""
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
"information in email you send."
msgstr ""
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
#, fuzzy
msgid "Receiving Mail"
msgstr "Synchronise \"%s\""
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
msgid ""
"Please enter information about your incoming mail server below. If you are "
"not sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
msgid "Please select among the following options"
msgstr ""
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
msgid "Sending Mail"
msgstr ""
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
msgid "Account Management"
msgstr ""
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
msgid ""
"You are almost done with the mail configuration process. The identity, "
"incoming mail server and outgoing mail transport method which you provided "
@@ -12098,6 +12180,14 @@ msgid ""
"purposes only."
msgstr ""
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr ""
+
#: mail/mail-config.glade.h:3
msgid " _Check for supported types "
msgstr ""
@@ -12214,11 +12304,6 @@ msgstr ""
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Default"
-msgstr "Synchronising \"%s\""
-
#: mail/mail-config.glade.h:40
msgid "Default Behavior"
msgstr ""
@@ -12659,295 +12744,500 @@ msgstr ""
msgid "_Use the same fonts as other applications"
msgstr ""
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr "Colours"
+
#: mail/mail-config.glade.h:172
msgid "description"
msgstr ""
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:197
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr ""
+
+#: mail/mail-display.c:409
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-display.c:457
+msgid "Save Attachment..."
+msgstr ""
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr ""
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr ""
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1368
+msgid "Downloading images"
+msgstr ""
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr ""
+
+#: mail/mail-display.c:1887
+msgid "Overdue:"
+msgstr ""
+
+#: mail/mail-display.c:1891
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr ""
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr ""
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr ""
+
+#: mail/mail-folder-cache.c:745
#, fuzzy, c-format
msgid "Pinging %s"
msgstr "Synchronise \"%s\""
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr ""
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr ""
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr ""
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr ""
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr ""
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr ""
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr ""
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr ""
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1510
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr ""
+
#: mail/mail-local.c:541 mail/mail-local.c:543
#, fuzzy, c-format
msgid "Local folders/%s"
msgstr "Synchronising \"%s\""
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
#, fuzzy
msgid "Reconfiguring folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
#, c-format
msgid ""
"Cannot save folder metainfo; you may find you can't\n"
"open this folder anymore: %s: %s"
msgstr ""
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr ""
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr ""
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr ""
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
#, fuzzy, c-format
msgid "Reconfigure /%s"
msgstr "Synchronising \"%s\""
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
msgid "You cannot change the format of a non-local folder."
msgstr ""
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
#, c-format
msgid ""
"Error while '%s':\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
#, c-format
msgid ""
"Error while performing operation:\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
msgid "Working"
msgstr ""
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
#, fuzzy
msgid "Filtering Folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
msgid "Fetching Mail"
msgstr ""
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
msgstr ""
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
#, c-format
msgid "Sending \"%s\""
msgstr ""
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
#, c-format
msgid "Sending message %d of %d"
msgstr ""
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
#, c-format
msgid "Failed on message %d of %d"
msgstr ""
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
msgid "Complete."
msgstr ""
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
msgid "Saving message to folder"
msgstr ""
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
#, c-format
msgid "Moving messages to %s"
msgstr ""
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
#, c-format
msgid "Copying messages to %s"
msgstr ""
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
#, c-format
msgid "Scanning folders in \"%s\""
msgstr ""
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
msgid "Forwarded messages"
msgstr ""
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
#, c-format
msgid "Opening folder %s"
msgstr ""
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
#, fuzzy, c-format
msgid "Removing folder %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
#, fuzzy, c-format
msgid "Storing folder '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
#, fuzzy
msgid "Refreshing folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
#, c-format
msgid "Emptying trash in '%s'"
msgstr ""
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
#: shell/e-local-storage.c:1151
msgid "Local Folders"
msgstr ""
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
#, c-format
msgid "Retrieving message %s"
msgstr ""
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
#, c-format
msgid "Retrieving %d message(s)"
msgstr ""
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
#, c-format
msgid "Saving %d messsage(s)"
msgstr ""
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
#, c-format
msgid ""
"Unable to create output file: %s\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
msgid "Saving attachment"
msgstr ""
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
#, c-format
msgid "Could not write data: %s"
msgstr ""
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
#, c-format
msgid "Disconnecting from %s"
msgstr ""
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
#, fuzzy, c-format
msgid "Reconnecting to %s"
msgstr "Synchronise \"%s\""
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr ""
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr ""
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr ""
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr ""
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr ""
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr ""
+
+#: mail/mail-send-recv.c:146
msgid "Cancelling..."
msgstr ""
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
#, c-format
msgid "Server: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
#, c-format
msgid "Path: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
#, c-format
msgid "Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
msgid "Send & Receive Mail"
msgstr ""
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
msgid "Cancel _All"
msgstr ""
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
msgid "Updating..."
msgstr ""
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
msgid "Waiting..."
msgstr ""
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
msgid "User canceled operation."
msgstr ""
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
#, c-format
msgid "Enter Password for %s"
msgstr ""
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
msgid "Enter Password"
msgstr ""
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
msgid "_Remember this password"
msgstr ""
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
msgid "_Remember this password for the remainder of this session"
msgstr ""
@@ -12992,17 +13282,21 @@ msgstr ""
msgid "Forwarded message"
msgstr ""
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr ""
+
+#: mail/mail-vfolder.c:92
#, fuzzy, c-format
msgid "Setting up vfolder: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
#, fuzzy, c-format
msgid "Updating vfolders for uri: %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -13011,97 +13305,102 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
msgid "VFolders"
msgstr ""
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
#, fuzzy
msgid "vFolders"
msgstr "Synchronising \"%s\""
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
#, fuzzy
msgid "Edit VFolder"
msgstr "Synchronising \"%s\""
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr ""
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
msgid "New VFolder"
msgstr ""
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr ""
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr ""
+
+#: mail/message-list.c:741
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:901
+#: mail/message-list.c:742
msgid "Seen"
msgstr ""
-#: mail/message-list.c:902
+#: mail/message-list.c:743
msgid "Answered"
msgstr ""
-#: mail/message-list.c:903
+#: mail/message-list.c:744
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:904
+#: mail/message-list.c:745
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:908
+#: mail/message-list.c:749
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:909
+#: mail/message-list.c:750
msgid "Lower"
msgstr ""
-#: mail/message-list.c:913
+#: mail/message-list.c:754
msgid "Higher"
msgstr ""
-#: mail/message-list.c:914
+#: mail/message-list.c:755
msgid "Highest"
msgstr ""
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
msgid "?"
msgstr ""
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
msgid "%b %d %l:%M %p"
msgstr ""
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
msgid "Generating message list"
msgstr ""
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr ""
-
#: mail/message-list.etspec.h:3
msgid "Due By"
msgstr ""
@@ -13118,10 +13417,6 @@ msgstr ""
msgid "Follow Up Flag"
msgstr ""
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr ""
-
#: mail/message-list.etspec.h:8
#, fuzzy
msgid "Original Location"
@@ -13135,10 +13430,6 @@ msgstr ""
msgid "Size"
msgstr ""
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr ""
-
#: mail/message-tag-followup.c:62
msgid "Call"
msgstr ""
@@ -13155,7 +13446,7 @@ msgstr ""
msgid "For Your Information"
msgstr ""
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
msgid "Forward"
msgstr ""
@@ -13163,11 +13454,11 @@ msgstr ""
msgid "No Response Necessary"
msgstr ""
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
msgid "Reply"
msgstr ""
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
msgid "Reply to All"
msgstr ""
@@ -13197,135 +13488,65 @@ msgstr ""
msgid "_Flag:"
msgstr ""
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "Synchronising \"%s\""
-
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "Synchronising \"%s\""
-
-#: mail/subscribe-dialog.glade.h:3
-#, fuzzy
-msgid "S_erver:"
-msgstr "Synchronising \"%s\""
-
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr ""
-
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr ""
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr ""
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr ""
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr ""
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:392
-msgid "No appointments."
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:411
-msgid "%l:%M%p %d %B"
-msgstr ""
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr ""
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
msgstr ""
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
msgstr ""
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
msgstr ""
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
msgstr ""
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
msgstr ""
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
msgstr ""
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
msgstr ""
-#: my-evolution/e-summary-tasks.c:387
-msgid "blue"
-msgstr ""
+#: mail/subscribe-dialog.glade.h:1
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Synchronising \"%s\""
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr ""
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "None Selected"
+msgstr "Synchronising \"%s\""
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr ""
+#: mail/subscribe-dialog.glade.h:3
+#, fuzzy
+msgid "S_erver:"
+msgstr "Synchronising \"%s\""
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr ""
+#: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Scanning folders ..."
+msgstr "Synchronising \"%s\""
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
+#: mail/subscribe-dialog.glade.h:5
+msgid "_Subscribe"
msgstr ""
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
+#: mail/subscribe-dialog.glade.h:6
+msgid "_Unsubscribe"
msgstr ""
#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
@@ -23190,6 +23411,110 @@ msgstr ""
msgid "Zurich"
msgstr ""
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:389
+msgid "No appointments."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:408
+msgid "%l:%M%P %d %B"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:565
+msgid "New News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:581
+msgid "_URL:"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:496
+msgid "All"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+msgid "Shown"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr ""
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr ""
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr ""
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr ""
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr ""
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr ""
+
#: my-evolution/metar.c:30
msgid " F"
msgstr ""
@@ -24453,27 +24778,24 @@ msgstr ""
msgid "_Show full path for folders"
msgstr "Synchronising \"%s\""
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
msgstr ""
-#: notes/component-factory.c:27
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
#, fuzzy
-msgid "Create a new note"
-msgstr "Synchronising \"%s\""
+msgid "Evolution Shell"
+msgstr "Cannot initialise the Evolution shell."
-#: notes/component-factory.c:152
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
+msgid "Evolution folder settings configuration control"
msgstr "Cannot initialise Evolution's mail component."
-#: notes/main.c:30
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Could not initialise Bonobo"
+msgid "Folder Settings"
+msgstr "Synchronising \"%s\""
#: shell/e-activity-handler.c:164
msgid "Show Details"
@@ -24557,43 +24879,6 @@ msgstr ""
msgid "Brought to you by"
msgstr ""
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr ""
-
#: shell/e-shell-config-autocompletion.c:110
#, fuzzy
msgid "Extra Completion folders"
@@ -24685,32 +24970,27 @@ msgid ""
"%s"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
#, fuzzy
msgid "Rename Folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
#: shell/e-shell-folder-creation-dialog.c:180
#, c-format
msgid "The specified folder name is not valid: %s"
msgstr ""
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
msgid "Selected folder does not belong to another user"
msgstr ""
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
#, fuzzy, c-format
msgid ""
"Cannot remove folder:\n"
@@ -24746,127 +25026,118 @@ msgid ""
"to work it out."
msgstr ""
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
msgid "Please select the information that you would like to import:"
msgstr ""
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
#, c-format
msgid ""
"Importing %s\n"
"Importing item %d."
msgstr ""
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
#, fuzzy
msgid "Select importer"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
#, c-format
msgid "File %s does not exist"
msgstr ""
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
#, fuzzy
msgid "Evolution Error"
msgstr "Cannot initialise the Evolution shell."
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
#, c-format
msgid ""
"There is no importer that is able to handle\n"
"%s"
msgstr ""
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
msgid "Importing"
msgstr ""
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
#, c-format
msgid ""
"Importing %s.\n"
"Starting %s"
msgstr ""
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
#, c-format
msgid "Error starting %s"
msgstr ""
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
#, c-format
msgid "Error loading %s"
msgstr ""
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
#, c-format
msgid ""
"Importing %s\n"
"Importing item 1."
msgstr ""
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
msgid "Automatic"
msgstr ""
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
-msgstr "Synchronising \"%s\""
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
+msgstr ""
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
msgid "Select a file"
msgstr ""
-#: shell/e-shell-importer.c:658
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
msgstr ""
-#: shell/e-shell-importer.c:684
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
msgstr ""
-#: shell/e-shell-importer.c:687
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
msgstr ""
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
msgid "Starting Intelligent Importers"
msgstr ""
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
#, c-format
msgid "From %s:"
msgstr ""
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
#, fuzzy
msgid "Select folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
msgid "Select a destination folder for importing this data"
msgstr ""
-#: shell/e-shell-importer.c:1193
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
msgstr ""
#: shell/e-shell-offline-handler.c:592
@@ -24927,20 +25198,12 @@ msgstr "Synchronising \"%s\""
msgid "Cannot find the specified shared folder."
msgstr ""
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
msgstr ""
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Cannot initialise the Evolution shell."
-
#: shell/e-shell-utils.c:116
msgid "No folder name specified."
msgstr ""
@@ -24961,33 +25224,6 @@ msgstr ""
msgid "'.' and '..' are reserved folder names."
msgstr ""
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr ""
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr ""
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online. Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline. Click on this button to work online."
-msgstr ""
-
#: shell/e-shell-view-menu.c:89
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr ""
@@ -25038,12 +25274,68 @@ msgstr ""
msgid "Work Offline"
msgstr ""
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
msgstr ""
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr ""
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian Evolution is currently online. Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian Evolution is currently offline. Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:175
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr ""
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr ""
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
msgstr ""
#: shell/e-shortcuts-view.c:80
@@ -25161,6 +25453,18 @@ msgstr ""
msgid "Remove this shortcut from the shortcut bar"
msgstr ""
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr ""
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr ""
+
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
+
#: shell/e-storage.c:566
msgid "No error"
msgstr ""
@@ -25218,14 +25522,6 @@ msgstr "Synchronising \"%s\""
msgid "This operation cannot be performed in off-line mode"
msgstr ""
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr ""
-
#: shell/e-task-widget.c:211
#, c-format
msgid "%s (...)"
@@ -25240,93 +25536,93 @@ msgstr ""
msgid "<click here to select a folder>"
msgstr ""
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component.c:1184
msgid "CORBA error"
msgstr ""
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
msgid "Interrupted"
msgstr ""
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
msgid "Invalid argument"
msgstr ""
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
msgid "Already has an owner"
msgstr ""
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
msgid "No owner"
msgstr ""
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
msgid "Not found"
msgstr ""
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
msgid "Unsupported type"
msgstr ""
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
msgid "Unsupported schema"
msgstr ""
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
msgid "Unsupported operation"
msgstr ""
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
msgid "Internal error"
msgstr ""
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
msgid "Exists"
msgstr ""
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
msgid "Invalid URI"
msgstr ""
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
#, fuzzy
msgid "Has subfolders"
msgstr "Synchronising \"%s\""
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
msgid "No space left"
msgstr ""
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
msgid "Old owner has died"
msgstr ""
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
#: shell/evolution-test-component.c:63
msgid "Test type"
msgstr ""
@@ -25429,25 +25725,6 @@ msgid ""
"Click the \"Apply\" button to save your settings. "
msgstr ""
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Cannot initialise the Evolution shell."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Synchronising \"%s\""
-
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr ""
@@ -25483,10 +25760,6 @@ msgstr ""
msgid "Importers"
msgstr ""
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr ""
-
#: shell/importer/intelligent.c:195
msgid "Don't import"
msgstr ""
@@ -25656,7 +25929,7 @@ msgstr ""
msgid "Move to Folder..."
msgstr ""
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
msgid "Paste the clipboard"
msgstr ""
@@ -25664,9 +25937,9 @@ msgstr ""
msgid "Previews the contacts to be printed"
msgstr ""
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
msgid "Print Pre_view"
msgstr ""
@@ -25710,21 +25983,17 @@ msgstr ""
msgid "View the current contact"
msgstr ""
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
msgid "_Actions"
msgstr ""
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
msgid "_Forward Contact..."
msgstr ""
@@ -25792,58 +26061,46 @@ msgstr ""
msgid "Go to today"
msgstr ""
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
msgid "Month"
msgstr ""
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
msgid "Previews the calendar to be printed"
msgstr ""
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
msgid "Print this calendar"
msgstr ""
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
msgid "Publish Free/Busy information for this calendar"
msgstr ""
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-msgid "Purg_e"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Show as list"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
msgid "Show one day"
msgstr ""
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
msgid "Show one month"
msgstr ""
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
msgid "Show one week"
msgstr ""
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
msgid "Show the working week"
msgstr ""
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
msgid "Week"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
#: ui/evolution.xml.h:5
#, fuzzy
msgid "Close"
@@ -25854,7 +26111,7 @@ msgstr "Colours"
msgid "Close this item"
msgstr "Colours"
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
msgid "Delete this item"
msgstr ""
@@ -25867,57 +26124,47 @@ msgstr ""
msgid "Preview the printed item"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
msgid "Print this item"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save and Close"
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
msgstr ""
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save and _Close"
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save and Close"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
msgid "Save the item and close the dialog box"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
msgid "Save this item to disk"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
#: ui/evolution.xml.h:46
msgid "_File"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr ""
-
#: ui/evolution-composer-entries.xml.h:1
msgid "Copy selected text to the clipboard"
msgstr ""
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
msgid "Cu_t"
msgstr ""
@@ -25939,39 +26186,51 @@ msgstr ""
msgid "Select all text"
msgstr "Synchronising \"%s\""
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
msgid "Print En_velope..."
msgstr ""
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr ""
+
+#: ui/evolution-contact-editor.xml.h:9
msgid "Save the contact and close the dialog box"
msgstr ""
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
msgid "Send _Message to Contact..."
msgstr ""
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr ""
+
+#: ui/evolution-contact-list-editor.xml.h:3
msgid "Delete this list"
msgstr ""
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr ""
+
+#: ui/evolution-contact-list-editor.xml.h:7
msgid "Save the list and close the dialog box"
msgstr ""
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
msgid "Se_nd list to other..."
msgstr ""
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
msgid "Send _message to list..."
msgstr ""
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Synchronising \"%s\""
-
#: ui/evolution-event-editor.xml.h:1
msgid "Cancel Mee_ting"
msgstr ""
@@ -26046,9 +26305,8 @@ msgid "Permanently remove all deleted messages from all folders"
msgstr ""
#: ui/evolution-mail-global.xml.h:11
-#, fuzzy
-msgid "Post Ne_w Message"
-msgstr "Colours"
+msgid "Post New Message"
+msgstr ""
#: ui/evolution-mail-global.xml.h:12
msgid "Post a message to a Public folder"
@@ -26083,16 +26341,12 @@ msgstr ""
msgid "Change the properties of this folder"
msgstr ""
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
msgid "Copy selected message(s) to the clipboard"
msgstr ""
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
-msgid "Cut selected message(s) to the clipboard"
-msgstr ""
-
#: ui/evolution-mail-list.xml.h:4
-msgid "E_xpunge"
+msgid "Cut selected message(s) to the clipboard"
msgstr ""
#: ui/evolution-mail-list.xml.h:5
@@ -26113,14 +26367,14 @@ msgid ""
msgstr ""
#: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
msgstr ""
#: ui/evolution-mail-list.xml.h:10
msgid "Mark all visible messages as read"
msgstr ""
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
msgid "Paste message(s) from the clipboard"
msgstr ""
@@ -26164,38 +26418,26 @@ msgstr ""
msgid "Threaded Message list"
msgstr ""
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
msgid "_Folder"
msgstr ""
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
msgid "_Invert Selection"
msgstr ""
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
msgid "_Properties..."
msgstr ""
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
msgid "_Threaded Message List"
msgstr ""
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-#, fuzzy
-msgid "_Close"
-msgstr "Colours"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr ""
-
#: ui/evolution-mail-message.xml.h:1
msgid "A_dd Sender to Addressbook"
msgstr ""
@@ -26213,409 +26455,402 @@ msgid "Apply filter rules to the selected messages"
msgstr ""
#: ui/evolution-mail-message.xml.h:5
-msgid "Caret _Mode"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:6
msgid "Compose a reply to all of the recipients of the selected message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
msgid "Compose a reply to the mailing list of the selected message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
msgid "Compose a reply to the sender of the selected message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
msgid "Copy selected messages to another folder"
msgstr ""
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
msgid "Create _Virtual Folder From Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
msgid "Create a rule to filter messages from this sender"
msgstr ""
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
msgid "Create a rule to filter messages to these recipients"
msgstr ""
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
msgid "Create a rule to filter messages to this mailing list"
msgstr ""
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
msgid "Create a rule to filter messages with this subject"
msgstr ""
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
msgid "Create a virtual folder for these recipients"
msgstr ""
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
msgid "Create a virtual folder for this mailing list"
msgstr ""
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
msgid "Create a virtual folder for this sender"
msgstr ""
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
msgid "Create a virtual folder for this subject"
msgstr ""
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
msgid "Decrease the text size"
msgstr ""
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
msgid "Display the next important message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
msgid "Display the next message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
msgid "Display the next unread message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
msgid "Display the next unread thread"
msgstr ""
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
msgid "Display the previous important message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
msgid "Display the previous message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
msgid "Display the previous unread message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
msgid "F_orward"
msgstr ""
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
msgid "Filter on Mailing _List..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
msgid "Filter on Se_nder..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
msgid "Filter on _Recipients..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
msgid "Filter on _Subject..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
msgid "Flag selected message(s) for follow-up"
msgstr ""
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
msgid "Follow _Up..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
msgid "Force images in HTML mail to be loaded"
msgstr ""
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
msgid "Forward the selected message in the body of a new message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
msgid "Forward the selected message quoted like a reply"
msgstr ""
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
msgid "Forward the selected message to someone"
msgstr ""
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
msgid "Forward the selected message to someone as an attachment"
msgstr ""
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
msgid "Increase the text size"
msgstr ""
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
msgid "Load _Images"
msgstr ""
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
msgid "Mark as I_mportant"
msgstr ""
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
msgid "Mark as U_nread"
msgstr ""
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
msgid "Mark as Unimp_ortant"
msgstr ""
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
msgid "Mark the selected message(s) as having been read"
msgstr ""
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
msgid "Mark the selected message(s) as important"
msgstr ""
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
msgid "Mark the selected message(s) as not having been read"
msgstr ""
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
msgid "Mark the selected message(s) as unimportant"
msgstr ""
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
msgid "Mark the selected messages for deletion"
msgstr ""
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
msgid "Move"
msgstr ""
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
msgid "Move selected message(s) to another folder"
msgstr ""
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
msgid "Next"
msgstr ""
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
msgid "Next _Important Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
msgid "Next _Thread"
msgstr ""
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
msgid "Next _Unread Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
msgid "Open the selected message in a new window"
msgstr ""
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
msgid "Open the selected message in the composer to re-send it"
msgstr ""
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
msgid "Original Si_ze"
msgstr ""
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
msgid "P_revious Unread Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:67
-msgid "Post a Repl_y"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Post a Reply"
msgstr ""
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
msgid "Post a reply to a message in a Public folder"
msgstr ""
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
msgid "Pr_evious Important Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
msgid "Preview the message to be printed"
msgstr ""
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
msgid "Previous"
msgstr ""
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
msgid "Print this message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
msgid "Re_direct"
msgstr ""
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
msgid "Redirect (bounce) the selected message to someone"
msgstr ""
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
msgid "Reset the text to its original size"
msgstr ""
-#: ui/evolution-mail-message.xml.h:82
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
msgid "S_maller"
msgstr ""
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
msgid "Save the message as a text file"
msgstr ""
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
msgid "Search for text in the body of the displayed message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
msgid "Set up the page settings for your current printer"
msgstr ""
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
msgid "Show Email _Source"
msgstr ""
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
msgid "Show Full _Headers"
msgstr ""
-#: ui/evolution-mail-message.xml.h:89
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
msgid "Show message in the normal style"
msgstr ""
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
msgid "Show message with all email headers"
msgstr ""
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
msgid "Show the raw email source of the message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
msgid "Text Si_ze"
msgstr ""
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
msgid "Un-delete the selected messages"
msgstr ""
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
msgid "VFolder on Mailing _List..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
msgid "VFolder on Se_nder..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
msgid "VFolder on _Recipients..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
msgid "VFolder on _Subject..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
msgid "_Attached"
msgstr ""
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
msgid "_Copy to Folder"
msgstr ""
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
msgid "_Create Filter From Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
msgid "_Forward Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
msgid "_Go To"
msgstr ""
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
msgid "_Inline"
msgstr ""
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
msgid "_Larger"
msgstr ""
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
msgid "_Message Display"
msgstr ""
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
msgid "_Move to Folder"
msgstr ""
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
msgid "_Next Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
msgid "_Normal Display"
msgstr ""
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
msgid "_Open Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
msgid "_Previous Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
msgid "_Quoted"
msgstr ""
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
msgid "_Resend..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
msgid "_Tools"
msgstr ""
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
msgid "_Undelete"
msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Close"
+msgstr "Colours"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr ""
+
#: ui/evolution-message-composer.xml.h:1
msgid "Attach"
msgstr ""
@@ -26624,7 +26859,7 @@ msgstr ""
msgid "Attach a file"
msgstr ""
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
msgid "Close the current file"
msgstr ""
@@ -26640,7 +26875,7 @@ msgstr ""
msgid "Encrypt this message with your S/MIME Encryption Cetificate"
msgstr ""
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
msgid "For_mat"
msgstr ""
@@ -26672,11 +26907,6 @@ msgstr ""
msgid "S/MIME Sign"
msgstr ""
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr ""
-
#: ui/evolution-message-composer.xml.h:17
msgid "Save As"
msgstr ""
@@ -26690,7 +26920,7 @@ msgid "Save in folder..."
msgstr ""
#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
msgid "Save the current file"
msgstr ""
@@ -26707,7 +26937,7 @@ msgid "Send"
msgstr ""
#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
msgid "Send the mail in HTML format"
msgstr ""
@@ -26773,7 +27003,7 @@ msgid "_From Field"
msgstr ""
#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
msgid "_Insert"
msgstr ""
@@ -26789,11 +27019,11 @@ msgstr ""
msgid "_Security"
msgstr ""
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
msgid "H_TML"
msgstr ""
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
msgid "Save the current file and close the window"
msgstr ""
@@ -26869,19 +27099,15 @@ msgstr ""
msgid "Mar_k as Complete"
msgstr ""
-#: ui/evolution-tasks.xml.h:9
-msgid "Mark selected tasks as complete"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
msgid "Paste task from the clipboard"
msgstr ""
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
msgid "Previews the list of tasks to be printed"
msgstr ""
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
msgid "Print the list of tasks"
msgstr ""
@@ -27137,29 +27363,28 @@ msgstr ""
#: views/mail/galview.xml.h:1
#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
msgstr "Synchronising \"%s\""
#: views/mail/galview.xml.h:2
-msgid "By S_tatus"
+msgid "By Follow Up Flag"
msgstr ""
#: views/mail/galview.xml.h:3
-msgid "By Se_nder"
+msgid "By Sender"
msgstr ""
#: views/mail/galview.xml.h:4
-msgid "By Su_bject"
+msgid "By Status"
msgstr ""
#: views/mail/galview.xml.h:5
-msgid "By _Follow Up Flag"
+msgid "By Subject"
msgstr ""
#: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
-msgstr "Colours"
+msgid "Messages"
+msgstr ""
#: views/tasks/galview.xml.h:1
msgid "With _Category"
@@ -27213,20 +27438,20 @@ msgstr ""
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
msgid "MTWTFSS"
msgstr ""
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
msgid "%B %Y"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
msgid "Now"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
msgid "Today"
msgstr ""
@@ -27344,6 +27569,22 @@ msgstr ""
msgid "_Advanced..."
msgstr ""
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr ""
+
#: widgets/misc/e-search-bar.c:531
msgid "_Search"
msgstr ""
@@ -27393,22 +27634,6 @@ msgid "Evolution Addressbook local file backend"
msgstr ""
#, fuzzy
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Colours"
-
-#, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "%a %d/%m/%Y %I:%M %p"
-
-#, fuzzy
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Scanning folders ..."
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
#~ msgid "Configure the fonts used by Evolution here"
#~ msgstr "Cannot initialise Evolution's mail component."
@@ -27542,6 +27767,10 @@ msgstr ""
#~ msgstr "Cannot initialise Evolution's mail component."
#, fuzzy
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
#~ msgid "Factory to import mbox into Evolution"
#~ msgstr "Cannot initialise Evolution's mail component."
@@ -27562,6 +27791,10 @@ msgstr ""
#~ msgstr "Cannot initialise Evolution's mail component."
#, fuzzy
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Could not initialise Bonobo"
+
+#, fuzzy
#~ msgid "Configuration control for Evolution folder settings."
#~ msgstr "Cannot initialise Evolution's mail component."
@@ -27630,6 +27863,10 @@ msgstr ""
#~ msgid "Summarising folder"
#~ msgstr "Synchronising \"%s\""
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
#~ msgid "%d/%m/%Y"
#~ msgstr "%m/%d/%Y"