aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_CA.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_CA.po')
-rw-r--r--po/en_CA.po6750
1 files changed, 3889 insertions, 2861 deletions
diff --git a/po/en_CA.po b/po/en_CA.po
index 8cd9debdf2..adcdc21b9a 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 1.5.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-10 19:12-0700\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
"PO-Revision-Date: 2004-06-10 19:18-0700\n"
"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
"Language-Team: Canadian English <adamw@FreeBSD.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Report-Msgid-Bugs-To: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: a11y/addressbook/ea-addressbook-view.c:94
#: a11y/addressbook/ea-addressbook-view.c:103
@@ -22,14 +22,6 @@ msgstr ""
msgid "evolution addressbook"
msgstr "evolution addressbook"
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "contact's header: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
#: a11y/addressbook/ea-minicard-view.c:101
msgid "current addressbook folder "
msgstr "current addressbook folder "
@@ -50,34 +42,260 @@ msgstr " cards"
msgid " card"
msgstr " card"
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "contact's header: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "The item could not be sent!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "This store does not support subscriptions, or they are not enabled."
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Could not get group list from server."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "IMAP server response did not contain %s information"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Could not load addressbook"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "No description available."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Save in addressbook"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Error loading default addressbook."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Unable to process spool folder"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Do you wish to save your changes?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Discard"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "and one other contact."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Unable to parse message content"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Error adding contact"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Addressbook address viewer"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
+#: addressbook/conduit/address-conduit.c:275
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
-#: addressbook/conduit/address-conduit.c:1155
#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
msgid "Could not load addressbook"
msgstr "Could not load addressbook"
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
msgid "Could not read pilot's Address application block"
msgstr "Could not read pilot's Address application block"
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autocompletion"
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "C_ontacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificates"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configure autocomplete here"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Addressbook"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Manage your S/MIME certificates here"
#: addressbook/gui/component/addressbook-component.c:93
msgid "New Contact"
@@ -108,7 +326,8 @@ msgid "New Contacts Group"
msgstr "New Contacts Group"
#: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
msgstr "_Contacts Group"
#: addressbook/gui/component/addressbook-component.c:111
@@ -131,18 +350,14 @@ msgid "Migrating `%s':"
msgstr "Migrating `%s':"
#. create the local source group
-#. On This Computer is always first and VFolders is always last
#: addressbook/gui/component/addressbook-migrate.c:489
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:246 mail/mail-vfolder.c:218
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "On This Computer"
#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
#: addressbook/gui/component/addressbook-migrate.c:497
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -206,36 +421,45 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your Pilot Sync data..."
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
msgid "New Address Book"
msgstr "New Address Book"
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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-tasks.xml.h:6
msgid "Delete"
msgstr "Delete"
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
msgid "Properties..."
msgstr "Properties..."
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacts"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sEnter password for %s (user %s)"
#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
msgid "EFolderList xml for the list of completion uris"
@@ -257,58 +481,6 @@ msgstr ""
msgid "URI for the folder last used in the select names dialog"
msgstr "URI for the folder last used in the select names dialog"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "C_ontacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certificates"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution Addressbook"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Manage your S/MIME certificates here"
-
#: addressbook/gui/component/ldap-config.glade.h:1
#: addressbook/gui/component/select-names/select-names.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -316,7 +488,7 @@ msgstr "Manage your S/MIME certificates here"
#: addressbook/gui/contact-editor/fullname.glade.h:1
#: addressbook/gui/contact-editor/im.glade.h:1
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
#: calendar/gui/dialogs/calendar-setup.glade.h:1
#: calendar/gui/dialogs/event-page.glade.h:1
#: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -325,7 +497,7 @@ msgstr "Manage your S/MIME certificates here"
#: calendar/gui/dialogs/task-page.glade.h:1
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr "*"
@@ -351,6 +523,7 @@ msgid "636"
msgstr "636"
#: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
msgid "<b>Authentication</b>"
msgstr "<b>Authentication</b>"
@@ -392,13 +565,11 @@ msgid "Anonymously"
msgstr "Anonymously"
#: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
msgid "Basic"
msgstr "Basic"
#: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "Details"
@@ -630,33 +801,26 @@ msgid "cards"
msgstr "cards"
#: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "minutes"
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Select Contacts from Address Book"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Addressbook name selection interface"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Remove All"
-#: addressbook/gui/component/select-names/e-select-names.c:702
#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
msgstr "Remove"
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Name"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Remove All"
-
#: addressbook/gui/component/select-names/e-select-names-popup.c:222
msgid "View Contact List"
msgstr "View Contact List"
@@ -671,7 +835,7 @@ msgid "Send HTML Mail?"
msgstr "Send HTML Mail?"
#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
msgid "Add to Contacts"
msgstr "Add to Contacts"
@@ -679,15 +843,22 @@ msgstr "Add to Contacts"
msgid "Unnamed Contact"
msgstr "Unnamed Contact"
+#: 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
+msgid "Name"
+msgstr "Name"
+
#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
msgid "Source"
msgstr "Source"
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Select Contacts from Address Book"
#: addressbook/gui/component/select-names/select-names.glade.h:2
msgid "<b>Contacts</b>"
@@ -709,6 +880,11 @@ msgstr "C_ategory:"
msgid "_Find"
msgstr "_Find"
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Search"
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "<b>Email</b>"
msgstr "<b>Email</b>"
@@ -746,9 +922,8 @@ msgid "<b>Work</b>"
msgstr "<b>Work</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
msgid "AIM"
msgstr "AIM"
@@ -769,7 +944,6 @@ msgid "Birthday:"
msgstr "Birthday:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
msgid "Calendar:"
msgstr "Calendar:"
@@ -782,7 +956,7 @@ msgid "Company:"
msgstr "Company:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
@@ -790,7 +964,7 @@ msgid "Contact"
msgstr "Contact"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
msgid "Contact Editor"
msgstr "Contact Editor"
@@ -882,8 +1056,8 @@ msgstr "Web Log:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
#: mail/mail-config.glade.h:157
msgid "Work"
@@ -906,39 +1080,23 @@ msgstr "_File under:"
msgid "_Where:"
msgstr "_Where:"
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Are you sure you want\n"
-"to delete this contact?"
-
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
msgid "Address"
msgstr "Address"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
msgid "Editable"
msgstr "Editable"
@@ -1910,80 +2068,99 @@ msgstr "Zambia"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
msgid "Jabber"
msgstr "Jabber"
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "ICQ"
msgstr "ICQ"
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Service"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Location"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Username"
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
msgid "Home"
msgstr "Home"
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
msgid "Other"
msgstr "Other"
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
msgid "Source Book"
msgstr "Source Book"
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
msgid "Target Book"
msgstr "Target Book"
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
msgid "Is New Contact"
msgstr "Is New Contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
msgid "Writable Fields"
msgstr "Writable Fields"
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
msgid "Changed"
msgstr "Changed"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
msgid "This contact belongs to these categories:"
msgstr "This contact belongs to these categories:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2434
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
msgid "No image"
msgstr "No image"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2637
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -1991,11 +2168,11 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2665
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
msgid "Invalid contact."
msgstr "Invalid contact."
-#: addressbook/gui/contact-editor/e-contact-editor.c:2724
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
msgid ""
"The contact cannot be saved to the selected address book. Do you want to "
"discard changes?"
@@ -2003,12 +2180,7 @@ msgstr ""
"The contact cannot be saved to the selected address book. Do you want to "
"discard changes?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/contact-editor/e-contact-editor.c:2752
-msgid "_Discard"
-msgstr "_Discard"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2747
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
msgid ""
"You are moving the contact from one address book to another, but it cannot "
"be removed from the source. Do you want to save a copy instead?"
@@ -2016,28 +2188,6 @@ msgstr ""
"You are moving the contact from one address book to another, but it cannot "
"be removed from the source. Do you want to save a copy instead?"
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Service"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Location"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Username"
-
#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
msgid "Contact Quick-Add"
msgstr "Contact Quick-Add"
@@ -2055,6 +2205,22 @@ msgstr "_Full Name:"
msgid "E-_mail:"
msgstr "E-_mail:"
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
#: addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Address _2:"
msgstr "Address _2:"
@@ -2210,16 +2376,16 @@ msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Type an email address or drag a contact into the list below:"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
msgid "dialog1"
msgstr "dialog1"
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
msgid "Book"
msgstr "Book"
@@ -2280,411 +2446,6 @@ msgstr ""
msgid "Advanced Search"
msgstr "Advanced Search"
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(map)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "map"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "List Members"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organization"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Position"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Phone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "work"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "personal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Note"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Job Title"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Home page"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Success"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr "Backend busy"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Address Book does not exist"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr "No Self Contact defined"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Contact not found"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Contact ID already exists"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocol not supported"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Cancelled"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "Could not cancel"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Authentication Failed"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS not Available"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "No such source"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Other error"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook. Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"We were unable to open this addressbook. Please check that the path exists "
-"and that you have permission to access it."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "The backend for this addressbook was unable to parse this query."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "The backend for this addressbook refused to perform this query."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "This query did not complete successfully."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Error adding list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Error adding contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Error modifying list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Error modifying contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Error removing list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Error removing contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Select target addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Multiple VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#.
-#. * 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
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(none)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primary Email"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Select an Action"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Create a new contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Add address to existing contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Querying Address Book..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Edit Contact Info"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Merge E-Mail Address"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "and one other contact."
-msgstr[1] "and one other contact."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Show Full VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Show Compact VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Save in addressbook"
-
#: addressbook/gui/widgets/e-addressbook-model.c:148
msgid "No contacts"
msgstr "No contacts"
@@ -2698,9 +2459,9 @@ msgstr[1] "%d contacts"
#: addressbook/gui/widgets/e-addressbook-model.c:302
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
msgid "Query"
msgstr "Query"
@@ -2716,129 +2477,129 @@ msgstr "Model"
msgid "Error modifying card"
msgstr "Error modifying card"
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
msgid "Name begins with"
msgstr "Name begins with"
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
msgid "Email begins with"
msgstr "Email begins with"
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
#: calendar/gui/cal-search-bar.c:54
msgid "Category is"
msgstr "Category is"
#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "Any field contains"
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
msgid "Advanced..."
msgstr "Advanced..."
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
#: calendar/gui/e-meeting-list-view.c:227
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "Type"
-#: addressbook/gui/widgets/e-addressbook-view.c:535
+#: addressbook/gui/widgets/e-addressbook-view.c:539
msgid "Address Book"
msgstr "Address Book"
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard..."
msgstr "Save as VCard..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
msgid "New Contact..."
msgstr "New Contact..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
msgid "New Contact List..."
msgstr "New Contact List..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
msgid "Go to Folder..."
msgstr "Go to Folder..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
msgid "Import..."
msgstr "Import..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
msgid "Search for Contacts..."
msgstr "Search for Contacts..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
msgid "Address Book Sources..."
msgstr "Address Book Sources..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
msgid "Pilot Settings..."
msgstr "Pilot Settings..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "Forward Contact"
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
msgid "Send Message to Contact"
msgstr "Send Message to Contact"
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "Print"
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
msgid "Print Envelope"
msgstr "Print Envelope"
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
msgid "Copy to Address Book..."
msgstr "Copy to Address Book..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
msgid "Move to Address Book..."
msgstr "Move to Address Book..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "Cut"
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "Copy"
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "Paste"
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
#: calendar/gui/e-calendar-view.c:1327
msgid "Current View"
msgstr "Current View"
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr "Any Category"
@@ -2872,6 +2633,8 @@ msgid "Car Phone"
msgstr "Car Phone"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Categories"
msgstr "Categories"
@@ -2879,6 +2642,21 @@ msgstr "Categories"
msgid "Company Phone"
msgstr "Company Phone"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Family Name"
msgstr "Family Name"
@@ -2915,14 +2693,29 @@ msgstr "Journal"
msgid "Manager"
msgstr "Manager"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
msgid "Nickname"
msgstr "Nickname"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Note"
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Office"
msgstr "Office"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organization"
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Other Fax"
msgstr "Other Fax"
@@ -2974,29 +2767,21 @@ msgstr "Unit"
msgid "Web Site"
msgstr "Web Site"
-#: addressbook/gui/widgets/e-minicard.c:137
#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
msgid "Width"
msgstr "Width"
-#: addressbook/gui/widgets/e-minicard.c:144
#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
msgid "Height"
msgstr "Height"
-#: addressbook/gui/widgets/e-minicard.c:152
#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
msgid "Has Focus"
msgstr "Has Focus"
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Selected"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
#: addressbook/gui/widgets/e-minicard-label.c:136
msgid "Field"
msgstr "Field"
@@ -3013,7 +2798,11 @@ msgstr "Text Model"
msgid "Max field name length"
msgstr "Max field name length"
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Column Width"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
msgid ""
"\n"
"\n"
@@ -3027,7 +2816,7 @@ msgstr ""
"\n"
"Double-click here to create a new Contact."
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
msgid ""
"\n"
"\n"
@@ -3037,13 +2826,386 @@ msgstr ""
"\n"
"There are no items to show in this view."
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
msgid "Adapter"
msgstr "Adapter"
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Selected"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Has Cursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(map)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "map"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "List Members"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Position"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Video Conferencing"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Phone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "work"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "personal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Job Title"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Home page"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Success"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Backend busy"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Address Book does not exist"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "No Self Contact defined"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Contact not found"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Contact ID already exists"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocol not supported"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Could not cancel"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Authentication Failed"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS not Available"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "No such source"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Other error"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook. Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"We were unable to open this addressbook. Please check that the path exists "
+"and that you have permission to access it."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it. If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"This version of Evolution does not have LDAP support compiled in to it. If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "The backend for this addressbook was unable to parse this query."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "The backend for this addressbook refused to perform this query."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "This query did not complete successfully."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Error adding list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Error adding contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Error modifying list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Error modifying contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Error removing list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Error removing contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Select target addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Multiple VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#.
+#. * 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
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr "(none)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Primary Email"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Select an Action"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Create a new contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Add address to existing contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Querying Address Book..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Edit Contact Info"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Merge E-Mail Address"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "and one other contact."
+msgstr[1] "and one other contact."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Show Full VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Show Compact VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Save in addressbook"
#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
msgid "Card View"
@@ -3053,17 +3215,17 @@ msgstr "Card View"
msgid "GTK Tree View"
msgstr "GTK Tree View"
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
msgid "Reflow Test"
msgstr "Reflow Test"
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
msgid "This should test the reflow canvas item"
msgstr "This should test the reflow canvas item"
@@ -3087,6 +3249,11 @@ msgstr "Evolution VCard importer"
msgid "VCard (.vcf, .gcrd)"
msgstr "VCard (.vcf, .gcrd)"
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Print envelope"
+
#: addressbook/printing/e-contact-print.c:1000
msgid "Print contacts"
msgstr "Print contacts"
@@ -3096,11 +3263,6 @@ msgstr "Print contacts"
msgid "Print contact"
msgstr "Print contact"
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Print envelope"
-
#: addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
msgstr "10 pt. Tahoma"
@@ -3285,6 +3447,20 @@ msgstr "Contact Print Test"
msgid "This should test the contact print code"
msgstr "This should test the contact print code"
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Can not open file"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Couldn't get list of addressbooks"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "failed to open book"
+
#: addressbook/tools/evolution-addressbook-export.c:56
msgid "Specify the output file instead of standard output"
msgstr "Specify the output file instead of standard output"
@@ -3341,20 +3517,6 @@ msgstr "In normal mode, there should not need size option."
msgid "Impossible internal error."
msgstr "Impossible internal error."
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Can not open file"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Couldn't get list of addressbooks"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "failed to open book"
-
#: addressbook/tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
msgstr "Error loading default addressbook."
@@ -3371,6 +3533,278 @@ msgstr "No filename provided."
msgid "Unnamed List"
msgstr "Unnamed List"
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Don't delete"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Send To:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Appointment"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Do you wish to save your changes?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s You have made changes. Forget those changes and update the editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Discard Changes"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Save Message"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Send"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar importer"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
@@ -3381,29 +3815,93 @@ msgid "Split Multi-Day Events:"
msgstr "Split Multi-Day Events:"
#: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "Could not start wombat server"
-
#: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Could not start wombat"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "Could not start wombat server"
#: calendar/conduits/calendar/calendar-conduit.c:1439
#: calendar/conduits/calendar/calendar-conduit.c:1442
msgid "Could not read pilot's Calendar application block"
msgstr "Could not read pilot's Calendar application block"
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
msgid "Default Priority:"
msgstr "Default Priority:"
-#: calendar/conduits/todo/todo-conduit.c:929
#: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
msgid "Could not read pilot's ToDo application block"
msgstr "Could not read pilot's ToDo application block"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure your timezone, Calendar and Task List here "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution's Calendar component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution's Tasks component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
msgid "Starting:"
msgstr "Starting:"
@@ -3501,10 +3999,6 @@ msgstr ""
msgid "Do not ask me about this program again."
msgstr "Do not ask me about this program again."
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
#: calendar/gui/alarm-notify/notify-main.c:139
msgid "Could not initialize Bonobo"
msgstr "Could not initialize Bonobo"
@@ -3645,8 +4139,28 @@ msgstr "Whether to show times in 24h format instead of using am/pm"
msgid "Whether to show week numbers in date navigator"
msgstr "Whether to show week numbers in date navigator"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Description contains"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Comment contains"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Location contains"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Unmatched"
+
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
#: calendar/gui/gnome-cal.c:1827
#: camel/providers/groupwise/camel-gw-listener.c:311
#: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3668,8 +4182,8 @@ msgid "Purge events older than"
msgstr "Purge events older than"
#: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
msgid "days"
msgstr "days"
@@ -3679,12 +4193,8 @@ msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
#: calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr "%a %d %b"
@@ -3732,64 +4242,52 @@ msgstr "Unable to open the calendar '%s' for creating events and meetings"
msgid "There is no calendar available for creating events and meetings"
msgstr "There is no calendar available for creating events and meetings"
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Events cannot be created in a read-only calendar. Please select a read-write "
-"calendar."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Calendars"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
msgid "New appointment"
msgstr "New appointment"
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
msgid "_Appointment"
msgstr "_Appointment"
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
msgid "Create a new appointment"
msgstr "Create a new appointment"
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
msgid "New meeting"
msgstr "New meeting"
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
msgid "M_eeting"
msgstr "M_eeting"
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
msgid "Create a new meeting request"
msgstr "Create a new meeting request"
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
msgid "New all day appointment"
msgstr "New all day appointment"
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
msgid "All _Day Appointment"
msgstr "All _Day Appointment"
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
msgid "Create a new all-day appointment"
msgstr "Create a new all-day appointment"
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
msgid "New calendar"
msgstr "New calendar"
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "C_alendar"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Calendar"
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
msgid "Create a new calendar"
msgstr "Create a new calendar"
@@ -3819,26 +4317,6 @@ msgstr "Week View"
msgid "Month View"
msgstr "Month View"
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Description contains"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Comment contains"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Location contains"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Unmatched"
-
#: calendar/gui/comp-editor-factory.c:409
msgid "Error while opening the calendar"
msgstr "Error while opening the calendar"
@@ -3856,213 +4334,133 @@ msgstr "Permission denied to open the calendar"
msgid "open_client(): %s"
msgstr "open_client(): %s"
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Audio Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Message Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Email Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Program Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Unknown Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Alarm Repeat"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Message to Display:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Message to Send"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Play sound:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repeat the alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Run program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Send To:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "With these arguments:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Alerts</b>"
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "extra times every"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Task List Options</b>"
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "hours"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>General</b>"
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Add Calendar"
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "A_dd"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Compose a message"
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Basics"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Date/Time:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Messages"
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
msgid "Play a sound"
msgstr "Play a sound"
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
msgid "Pop up an alert"
msgstr "Pop up an alert"
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Reminders"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
msgid "Run a program"
msgstr "Run a program"
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Send To:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
msgid "Send an email"
msgstr "Send an email"
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Summary:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Address:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Run program:"
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Options..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repeat the alarm"
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Send"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
msgid "after"
msgstr "after"
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
msgid "before"
msgstr "before"
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
msgid "day(s)"
msgstr "day(s)"
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
msgid "end of appointment"
msgstr "end of appointment"
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "extra times every"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
msgid "hour(s)"
msgstr "hour(s)"
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "hours"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
msgid "minute(s)"
msgstr "minute(s)"
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
msgid "start of appointment"
msgstr "start of appointment"
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "You must specify a location to get the calendar from."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "The source location '%s' is not well-formed."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "The source location '%s' is not a webcal source."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Source with name '%s' already exists in the selected group"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Add Tasks Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olour:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Add Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Refresh:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Type:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Action/Trigger"
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "A_dd"
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "weeks"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarm on %s"
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
@@ -4171,7 +4569,7 @@ msgid "Free/Busy Publishing"
msgstr "Free/Busy Publishing"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
#: calendar/gui/e-itip-control.c:556
msgid "Friday"
msgstr "Friday"
@@ -4185,7 +4583,7 @@ msgid "Minutes"
msgstr "Minutes"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
#: calendar/gui/e-itip-control.c:552
msgid "Monday"
msgstr "Monday"
@@ -4195,7 +4593,7 @@ msgid "S_un"
msgstr "S_un"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr "Saturday"
@@ -4209,7 +4607,7 @@ msgid "Show week _numbers in date navigator"
msgstr "Show week _numbers in date navigator"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr "Sunday"
@@ -4223,7 +4621,7 @@ msgid "T_hu"
msgstr "T_hu"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr "Thursday"
@@ -4237,7 +4635,7 @@ msgid "Time format:"
msgstr "Time format:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
#: calendar/gui/e-itip-control.c:553
msgid "Tuesday"
msgstr "Tuesday"
@@ -4247,7 +4645,7 @@ msgid "W_eek starts:"
msgstr "W_eek starts:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr "Wednesday"
@@ -4280,7 +4678,8 @@ msgstr "_Compress weekends in month view"
msgid "_Day begins:"
msgstr "_Day begins:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4330,6 +4729,74 @@ msgstr "_Wed"
msgid "before every appointment"
msgstr "before every appointment"
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "You must specify a location to get the calendar from."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "The source location '%s' is not well-formed."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "The source location '%s' is not a webcal source."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Source with name '%s' already exists in the selected group"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Add Tasks Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_olour:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Add Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Refresh:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "weeks"
+
#: calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "This event has been deleted."
@@ -4374,79 +4841,73 @@ msgstr "%s You have made changes. Forget those changes and update the editor?"
msgid "%s You have made no changes, update the editor?"
msgstr "%s You have made no changes, update the editor?"
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " to "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Due "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Due "
+
+#: calendar/gui/dialogs/comp-editor.c:264
msgid "Could not update object"
msgstr "Could not update object"
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
msgid "Edit Appointment"
msgstr "Edit Appointment"
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
#, c-format
msgid "Appointment - %s"
msgstr "Appointment - %s"
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
#, c-format
msgid "Task - %s"
msgstr "Task - %s"
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
#, c-format
msgid "Journal entry - %s"
msgstr "Journal entry - %s"
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
msgid "No summary"
msgstr "No summary"
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Save as..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "Changes made to this item may be discarded if an update arrives"
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " to "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Due "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Due "
-
#: calendar/gui/dialogs/copy-source-dialog.c:57
msgid "Could not open source"
msgstr "Could not open source"
@@ -4508,8 +4969,9 @@ msgid "The item could not be deleted due to an error"
msgstr "The item could not be deleted due to an error"
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Addressbook..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Contacts"
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
msgid "Delegate To:"
@@ -4519,132 +4981,193 @@ msgstr "Delegate To:"
msgid "Enter Delegate"
msgstr "Enter Delegate"
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
msgid "Appointment"
msgstr "Appointment"
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Reminder"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
msgid "Recurrence"
msgstr "Recurrence"
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
msgid "Scheduling"
msgstr "Scheduling"
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orientation"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "Meeting"
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
msgid "Event with no start date"
msgstr "Event with no start date"
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
msgid "Event with no end date"
msgstr "Event with no end date"
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
msgid "Start date is wrong"
msgstr "Start date is wrong"
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
msgid "End date is wrong"
msgstr "End date is wrong"
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
msgid "Start time is wrong"
msgstr "Start time is wrong"
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
msgid "End time is wrong"
msgstr "End time is wrong"
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Unable to open the calendar '%s'."
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "before every appointment"
+msgstr[1] "before every appointment"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "end of appointment"
+msgstr[1] "end of appointment"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "before every appointment"
+msgstr[1] "before every appointment"
+
#: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "A_ll day event"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "before every appointment"
#: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "B_usy"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "before every appointment"
#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "before every appointment"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Task List</b>"
#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Classification"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Time</b>"
#: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Co_nfidential"
+msgid "A_ll day event"
+msgstr "A_ll day event"
#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Date & Time"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Save Custom View..."
#: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "F_ree"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegories..."
#: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "L_ocation:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Calendar:"
#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vate"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Classification"
#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidential"
#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Show Time As"
+msgid "L_ocation:"
+msgstr "L_ocation:"
#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Private"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Public"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Show Time As"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
#: calendar/gui/dialogs/task-page.glade.h:11
msgid "Su_mmary:"
msgstr "Su_mmary:"
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Clear"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Description:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
msgid "_End time:"
msgstr "_End time:"
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
msgid "_Start time:"
msgstr "_Start time:"
#. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
#: mail/mail-config.glade.h:103
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4653,32 +5176,26 @@ msgstr "_Start time:"
msgid "None"
msgstr "None"
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
msgid "The organizer selected no longer has an account."
msgstr "The organizer selected no longer has an account."
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
msgid "An organizer is required."
msgstr "An organizer is required."
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
msgid "At least one attendee is required."
msgstr "At least one attendee is required."
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
msgid "_Delegate To..."
msgstr "_Delegate To..."
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2585 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Remove"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
#: calendar/gui/e-meeting-list-view.c:218
@@ -4723,28 +5240,39 @@ msgid "RSVP"
msgstr "RSVP"
#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
#: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
msgid "Status"
msgstr "Status"
#: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Add A_ttendee"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alerts</b>"
#: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "Add attendees from addressbook."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Other</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Change Organizer"
#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizer:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Contacts"
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Change Organizer"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizer:"
#: calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
@@ -4812,146 +5340,137 @@ msgstr "This and Future Instances"
msgid "All Instances"
msgstr "All Instances"
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "This appointment contains recurrences that Evolution cannot edit."
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
msgid "Recurrence date is invalid"
msgstr "Recurrence date is invalid"
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
msgid "on"
msgstr "on"
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
msgid "first"
msgstr "first"
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
msgid "second"
msgstr "second"
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
msgid "third"
msgstr "third"
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
msgid "fourth"
msgstr "fourth"
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
msgid "last"
msgstr "last"
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
msgid "Other Date"
msgstr "Other Date"
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
msgid "day"
msgstr "day"
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
msgid "on the"
msgstr "on the"
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
msgid "occurrences"
msgstr "occurrences"
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
msgid "Date/Time"
msgstr "Date/Time"
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Every"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
msgstr "Exceptions"
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Preview"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Recurrence Rule"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Custom recurrence"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modify"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Preview</b>"
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_No recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Recurrence"
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Remove"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Every"
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Simple recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Edit appointment"
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
msgid "for"
msgstr "for"
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
msgid "forever"
msgstr "forever"
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
msgid "month(s)"
msgstr "month(s)"
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
msgid "until"
msgstr "until"
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
msgid "week(s)"
msgstr "week(s)"
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "year(s)"
msgstr "year(s)"
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
msgid "Select destination"
msgstr "Select destination"
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
msgid "_Destination"
msgstr "_Destination"
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
msgid "Task List"
msgstr "Task List"
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
msgid "Completed date is wrong"
msgstr "Completed date is wrong"
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Message Fonts</span>"
+
#: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Complete"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alerts</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
#: calendar/gui/print.c:2346
msgid "Completed"
@@ -4965,8 +5484,8 @@ msgstr "High"
#: calendar/gui/dialogs/task-details-page.glade.h:6
#: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
#: calendar/gui/print.c:2343
msgid "In Progress"
msgstr "In Progress"
@@ -4978,22 +5497,22 @@ msgid "Low"
msgstr "Low"
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
msgid "Normal"
msgstr "Normal"
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
msgid "Not Started"
msgstr "Not Started"
#: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Progress"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Percent Complete: %i"
#: calendar/gui/dialogs/task-details-page.glade.h:11
#: calendar/gui/e-calendar-table.c:377
@@ -5016,36 +5535,42 @@ msgstr "_Status:"
msgid "_Web Page:"
msgstr "_Web Page:"
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Task"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
msgid "Assignment"
msgstr "Assignment"
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
msgid "Due date is wrong"
msgstr "Due date is wrong"
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Unable to open tasks in '%s'."
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidential"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Options</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Delete Mail</span>"
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:268
#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr "Description:"
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Folder:"
-
#: calendar/gui/dialogs/task-page.glade.h:10
msgid "Sta_rt date:"
msgstr "Sta_rt date:"
@@ -5054,52 +5579,58 @@ msgstr "Sta_rt date:"
msgid "_Due date:"
msgstr "_Due date:"
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Authentication Credentials for HTTP Server"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Group"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Calendars selected for publishing"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Calendar options</b>"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Daily"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Publishing Frequency"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Free/Busy Editor"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Free/Busy Publishing Location"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
+msgstr "Free/Busy Editor"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Login name:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Daily"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Password:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Mail"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Publishing Frequency"
+#, fuzzy
+msgid "_Password:"
+msgstr "Password:"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
msgstr "Remember password"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "User_name:"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "User Publishes"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
msgstr "Weekly"
#: calendar/gui/e-alarm-list.c:395
@@ -5181,7 +5712,7 @@ msgstr "%s at %s"
msgid "%s for an unknown trigger type"
msgstr "%s for an unknown trigger type"
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
@@ -5190,6 +5721,11 @@ msgstr "Click to open %s"
msgid "Untitled"
msgstr "Untitled"
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Summary:"
+
#: calendar/gui/e-cal-component-preview.c:194
#: calendar/gui/e-cal-component-preview.c:205
msgid "Start Date:"
@@ -5213,20 +5749,93 @@ msgstr "Priority:"
msgid "Web Page:"
msgstr "Web Page:"
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "End Date"
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Private"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Start Date"
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidential"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Summary"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Free"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Busy"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Yes"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "No"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Unknown"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recurring"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Assigned"
#: calendar/gui/e-calendar-table.c:396
msgid "0%"
@@ -5272,15 +5881,6 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Free"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Busy"
-
#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
@@ -5291,7 +5891,7 @@ msgstr "Updating objects"
#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "_Open"
@@ -5301,7 +5901,7 @@ msgstr "Open _Web Page"
#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "_Save As..."
@@ -5324,7 +5924,7 @@ msgstr "C_ut"
#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
#: ui/evolution-tasks.xml.h:20
@@ -5355,12 +5955,27 @@ msgstr "_Mark as Complete"
msgid "_Mark Selected Tasks as Complete"
msgstr "_Mark Selected Tasks as Complete"
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Delete"
+
#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
msgid "_Delete Selected Tasks"
msgstr "_Delete Selected Tasks"
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Save as..."
+
#: calendar/gui/e-calendar-table.c:1350
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "Click to add a task"
@@ -5369,33 +5984,28 @@ msgstr "Click to add a task"
msgid "% Complete"
msgstr "% Complete"
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1178
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
msgid "Complete"
msgstr "Complete"
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Completion date"
msgstr "Completion date"
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
msgid "Due date"
msgstr "Due date"
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
msgid "Priority"
msgstr "Priority"
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
msgid "Start date"
msgstr "Start date"
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Summary"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
msgid "Task sort"
msgstr "Task sort"
@@ -5471,95 +6081,13 @@ msgstr "_Go to Date..."
msgid "_Settings..."
msgstr "_Settings..."
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "End Date"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Start Date"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1704 camel/camel-gpg-context.c:1755
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Unknown"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Recurring"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Assigned"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Yes"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-
#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5576,43 +6104,36 @@ msgstr ""
"\n"
"%s"
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minute divisions"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
msgstr "%A %d %B"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr "%d %b"
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
#: calendar/gui/e-itip-control.c:585
msgid "Yes. (Complex Recurrence)"
@@ -5704,6 +6225,7 @@ msgstr "iCalendar Error"
msgid "An unknown person"
msgstr "An unknown person"
+#. Describe what the user can do
#: calendar/gui/e-itip-control.c:913
msgid ""
"<br> Please review the following information, and then select an action from "
@@ -5745,7 +6267,7 @@ msgstr "Update"
#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "OK"
@@ -5962,51 +6484,35 @@ msgstr "The attachment has no viewable calendar items"
msgid "Update complete\n"
msgstr "Update complete\n"
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Attendee status can not be updated because the item no longer exists"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "This response is not from a current attendee. Add as an attendee?"
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "Attendee status could not be updated because of an invalid status!\n"
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "There was an error on the CORBA system\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "Object could not be found\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "You don't have the right permissions to update the calendar\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Attendee status can not be updated because the item no longer exists"
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
msgid "Removal Complete"
msgstr "Removal Complete"
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
@@ -6035,6 +6541,10 @@ msgstr "Loading Calendar"
msgid "Loading calendar..."
msgstr "Loading calendar..."
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizer:"
+
#: calendar/gui/e-itip-control.glade.h:10
msgid "Server Message:"
msgstr "Server Message:"
@@ -6118,6 +6628,28 @@ msgstr "Delegated"
msgid "In Process"
msgstr "In Process"
+#. 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-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. 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:456
+#: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. 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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr "Out of Office"
@@ -6126,92 +6658,51 @@ msgstr "Out of Office"
msgid "No Information"
msgstr "No Information"
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "Add attendees from addressbook"
-msgstr "Add attendees from addressbook"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Options"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Options"
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
msgid "Show _only working hours"
msgstr "Show _only working hours"
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
msgid "Show _zoomed out"
msgstr "Show _zoomed out"
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
msgid "_Update free/busy"
msgstr "_Update free/busy"
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
msgid "_<<"
msgstr "_<<"
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
msgid "_Autopick"
msgstr "_Autopick"
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
msgid ">_>"
msgstr ">_>"
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
msgid "_All people and resources"
msgstr "_All people and resources"
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
msgid "All _people and one resource"
msgstr "All _people and one resource"
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
msgid "_Required people"
msgstr "_Required people"
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
msgid "Required people and _one resource"
msgstr "Required people and _one resource"
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Meeting _start time:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Meeting _end time:"
-
-#. 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:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: 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
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
#: calendar/gui/e-pub-utils.c:300
#, c-format
msgid "Enter the password for %s"
@@ -6230,9 +6721,7 @@ msgstr ""
msgid "Loading tasks"
msgstr "Loading tasks"
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
@@ -6249,15 +6738,6 @@ msgstr "Deleting selected objects..."
msgid "Expunging"
msgstr "Expunging"
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tasks"
-
#: calendar/gui/gnome-cal.c:704
msgid "Updating query"
msgstr "Updating query"
@@ -6281,55 +6761,6 @@ msgstr "Opening %s"
msgid "Purging"
msgstr "Purging"
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution's Tasks component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Calendars"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "April"
@@ -6675,10 +7106,6 @@ msgstr "Selected month (%b %Y)"
msgid "Selected year (%Y)"
msgstr "Selected year (%Y)"
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Task"
-
#: calendar/gui/print.c:2356
#, c-format
msgid "Status: %s"
@@ -6709,7 +7136,7 @@ msgid "Contacts: "
msgstr "Contacts: "
#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
msgid "Print Preview"
msgstr "Print Preview"
@@ -6737,7 +7164,7 @@ msgid_plural "%d tasks"
msgstr[0] "%d task"
msgstr[1] "%d tasks"
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
@@ -6757,35 +7184,28 @@ msgstr "Unable to open the task list '%s' for creating events and meetings"
msgid "There is no calendar available for creating tasks"
msgstr "There is no calendar available for creating tasks"
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Events cannot be created in a read-only calendar. Please select a read-write "
-"calendar."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
msgid "New task"
msgstr "New task"
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
msgid "_Task"
msgstr "_Task"
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
msgid "Create a new task"
msgstr "Create a new task"
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
msgid "New tasks group"
msgstr "New tasks group"
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
msgstr "_Tasks Group"
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
msgid "Create a new tasks group"
msgstr "Create a new tasks group"
@@ -8546,41 +8966,6 @@ msgstr "Invalid arguments to (user-tag)"
msgid "Error executing filter search: %s: %s"
msgstr "Error executing filter search: %s: %s"
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Unsupported operation: append message: for %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Unsupported operation: search by expression: for %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Unsupported operation: search by uids: for %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Moving messages"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Copying messages"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Learning junk"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Learning non-junk"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtering new message(s)"
-
#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
#, c-format
msgid ""
@@ -8624,6 +9009,41 @@ msgstr "(match-threads) requires the folder set"
msgid "Performing query on unknown header: %s"
msgstr "Performing query on unknown header: %s"
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Unsupported operation: append message: for %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Unsupported operation: search by expression: for %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Unsupported operation: search by uids: for %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Moving messages"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Copying messages"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Learning junk"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Learning non-junk"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtering new message(s)"
+
#: camel/camel-gpg-context.c:722
#, c-format
msgid ""
@@ -8653,8 +9073,8 @@ msgstr ""
"user: \"%s\""
#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
-#: camel/camel-gpg-context.c:1440 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1638 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
#: mail/mail-send-recv.c:611
msgid "Cancelled."
@@ -8694,16 +9114,16 @@ msgstr "Failed to GPG %s: %s\n"
msgid "Could not generate signing data: %s"
msgstr "Could not generate signing data: %s"
-#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1703
-#: camel/camel-gpg-context.c:1754
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
-#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1433
-#: camel/camel-gpg-context.c:1524 camel/camel-gpg-context.c:1547
-#: camel/camel-gpg-context.c:1631 camel/camel-gpg-context.c:1655
-#: camel/camel-gpg-context.c:1725 camel/camel-gpg-context.c:1776
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
@@ -8711,54 +9131,34 @@ msgstr "Failed to execute gpg."
msgid "This is a digitally signed message part"
msgstr "This is a digitally signed message part"
-#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1409
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: camel/camel-gpg-context.c:1416
+#: camel/camel-gpg-context.c:1420
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "Cannot verify message signature: could not create temp file: %s"
-#: camel/camel-gpg-context.c:1507
+#: camel/camel-gpg-context.c:1508
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Could not generate encrypting data: %s"
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1566
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: camel/camel-gpg-context.c:1662 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
msgid "Encrypted content"
msgstr "Encrypted content"
-#: camel/camel-gpg-context.c:1681
+#: camel/camel-gpg-context.c:1682
msgid "Unable to parse message content"
msgstr "Unable to parse message content"
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Could not create lock file for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Timed out trying to get lock file on %s. Try again later."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Failed to get lock using fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Failed to get lock using flock(2): %s"
-
#: camel/camel-lock-client.c:100
#, c-format
msgid "Cannot build locking helper pipe: %s"
@@ -8779,6 +9179,26 @@ msgstr "Could not lock '%s': protocol error with lock-helper"
msgid "Could not lock '%s'"
msgstr "Could not lock '%s'"
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Could not create lock file for %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Timed out trying to get lock file on %s. Try again later."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Failed to get lock using fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Failed to get lock using flock(2): %s"
+
#: camel/camel-movemail.c:107
#, c-format
msgid "Could not check mail file %s: %s"
@@ -9032,7 +9452,7 @@ msgstr "The referenced credentials have expired."
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1236
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
@@ -9116,55 +9536,55 @@ msgstr "POP Before SMTP auth using a non-pop source"
msgid "Regular expression compilation failed: %s: %s"
msgstr "Regular expression compilation failed: %s: %s"
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' needs a username component"
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' needs a host component"
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' needs a path component"
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
#, c-format
msgid "Resolving: %s"
msgstr "Resolving: %s"
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
#, c-format
msgid "Failure in name lookup: %s"
msgstr "Failure in name lookup: %s"
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
#, c-format
msgid "Host lookup failed: cannot create thread: %s"
msgstr "Host lookup failed: cannot create thread: %s"
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "Host lookup failed: %s: host not found"
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "Host lookup failed: %s: unknown reason"
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
msgid "Resolving address"
msgstr "Resolving address"
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
msgid "Host lookup failed: host not found"
msgstr "Host lookup failed: host not found"
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
msgid "Host lookup failed: unknown reason"
msgstr "Host lookup failed: unknown reason"
@@ -9236,7 +9656,7 @@ msgstr "Cannot add encryption certificate"
msgid "Cannot add CMS SignerInfo"
msgstr "Cannot add CMS SignerInfo"
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
msgid "Cannot create encoder context"
msgstr "Cannot create encoder context"
@@ -9317,7 +9737,8 @@ msgid "Certificate only message, certificates imported and verified"
msgstr "Certificate only message, certificates imported and verified"
#: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
msgstr "Can't find signature digests"
#: camel/camel-smime-context.c:651
@@ -9330,47 +9751,51 @@ msgid "Decoder failed"
msgstr "Decoder failed"
#: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "Cannot find certificate for '%s'"
#: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
msgstr "Can't find common bulk encryption algorithm"
#. PORT_GetError(); ??
#: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
msgstr "Can't allocate slot for encryption bulk key"
#: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr "Cannot create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "Cannot create CMS message"
#: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
msgstr "Can't create CMS EnvelopedData"
#: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
msgstr "Can't attach CMS EnvelopedData"
#: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
msgstr "Can't attach CMS data object"
#: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
msgstr "Can't create CMS RecipientInfo"
#: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
msgstr "Can't add CMS RecipientInfo"
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Can't create encoder context"
-
#: camel/camel-smime-context.c:888
msgid "Failed to add data to encoder"
msgstr "Failed to add data to encoder"
@@ -9415,7 +9840,8 @@ msgstr "Cannot create folder: %s: folder exists"
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Cannot rename folder: %s: Invalid operation"
@@ -9424,8 +9850,8 @@ msgstr "Cannot rename folder: %s: Invalid operation"
msgid "Trash"
msgstr "Trash"
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Junk"
@@ -9637,7 +10063,7 @@ msgstr ""
"Certificate revocation list expired: %s\n"
"Issuer: %s"
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
#, c-format
msgid "Could not parse URL `%s'"
msgstr "Could not parse URL `%s'"
@@ -9661,7 +10087,7 @@ msgstr "Cannot copy or move messages into a Virtual Folder"
msgid "Cannot delete folder: %s: No such folder"
msgstr "Cannot delete folder: %s: No such folder"
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Cannot rename folder: %s: No such folder"
@@ -9680,8 +10106,8 @@ msgid "Checking for new mail"
msgstr "Checking for new mail"
#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
msgid "Check for new messages in all folders"
msgstr "Check for new messages in all folders"
@@ -9711,8 +10137,8 @@ msgid "For accessing Novell Groupwise servers"
msgstr "For accessing Novell Groupwise servers"
#: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-provider.c:71
#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9731,333 +10157,28 @@ msgstr ""
msgid "Checklist"
msgstr "Checklist"
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Failed sending command to IMAP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Unexpected response from IMAP4 server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Unexpected greeting from IMAP server %s."
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Cannot select folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Cannot select folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 server %s unexpectedly disconnected: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Got BYE response"
-
-#: camel/providers/imap4/camel-imap4-folder.c:422
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Cannot sync flags to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:428
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Cannot sync flags to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:563
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Cannot expunge folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:568
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Cannot expunge folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:703
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Cannot get message %s from folder `%s': No such message"
-
-#: camel/providers/imap4/camel-imap4-folder.c:708
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Cannot get message %s from folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:833
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Cannot append message to folder `%s': Unknown error"
-
-#: camel/providers/imap4/camel-imap4-folder.c:862
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Cannot append message to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:941
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:945
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:953
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:957
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Folders"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Show only subscribed folders"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Override server-supplied folder namespace"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namespace"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL!!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP service for %s on %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Could not connect to %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL unavailable"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Connection cancelled"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPlease enter the IMAP password for %s on host %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Cannot authenticate to IMAP server %s using %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Cannot create folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Cannot create folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Cannot delete folder `%s': Special folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Cannot delete folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Cannot delete folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Cannot rename folder `%s' to `%s': Special folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Cannot rename folder `%s' to `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Cannot subscribe to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Cannot unsubscribe from folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Unexpected token in response from IMAP server %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "No data"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP server %s unexpectedly disconnected: %s"
-
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
msgid "Operation cancelled"
msgstr "Operation cancelled"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %s"
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Unknown error"
+
#. for imap ALERT codes, account user@host
#: camel/providers/imap/camel-imap-command.c:320
#, c-format
@@ -10126,7 +10247,7 @@ msgstr ""
" %s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
#: camel/providers/local/camel-mbox-folder.c:418
#: camel/providers/local/camel-mh-folder.c:202
msgid "No such message"
@@ -10198,6 +10319,27 @@ msgstr "Use custom command to connect to server"
msgid "Command:"
msgstr "Command:"
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Folders"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Show only subscribed folders"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Override server-supplied folder namespace"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Namespace"
+
#: camel/providers/imap/camel-imap-provider.c:64
msgid "Apply filters to new messages in INBOX on this server"
msgstr "Apply filters to new messages in INBOX on this server"
@@ -10218,43 +10360,92 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "For reading and storing mail on IMAP servers."
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP service for %s on %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Could not connect to %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL unavailable"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Connection cancelled"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Failed to connect to IMAP server %s in secure mode: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
msgid "SSL/TLS extension not supported."
msgstr "SSL/TLS extension not supported."
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not connect with command \"%s\": %s"
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP server %s does not support requested authentication type %s"
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr "No support for authentication type %s"
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%sPlease enter the IMAP password for %s@%s"
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
msgid "You didn't enter a password."
msgstr "You didn't enter a password."
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10265,30 +10456,266 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
msgid "The parent folder is not allowed to contain subfolders"
msgstr "The parent folder is not allowed to contain subfolders"
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
#, c-format
msgid "Cannot create folder `%s': folder exists."
msgstr "Cannot create folder `%s': folder exists."
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Failed sending command to IMAP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Unexpected response from IMAP4 server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Unexpected greeting from IMAP server %s."
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Cannot select folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Cannot select folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "IMAP4 server %s unexpectedly disconnected: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Got BYE response"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Cannot sync flags to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Cannot sync flags to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Cannot expunge folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Cannot expunge folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Cannot get message %s from folder `%s': No such message"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Cannot get message %s from folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Cannot append message to folder `%s': Unknown error"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Cannot append message to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL!!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPlease enter the IMAP password for %s on host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Cannot authenticate to IMAP server %s using %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Cannot create folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Cannot create folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Cannot delete folder `%s': Special folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Cannot delete folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Cannot rename folder `%s' to `%s': Special folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Cannot rename folder `%s' to `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Cannot subscribe to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Cannot unsubscribe from folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Unexpected token in response from IMAP server %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "No data"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP server %s unexpectedly disconnected: %s"
+
#: camel/providers/imapp/camel-imapp-provider.c:39
#: camel/providers/pop3/camel-pop3-provider.c:38
msgid "Message storage"
@@ -10457,18 +10884,26 @@ msgstr "Could not save summary: %s: %s"
msgid "Unable to add message to summary: unknown reason"
msgstr "Unable to add message to summary: unknown reason"
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Inbox"
+
+#: camel/providers/local/camel-maildir-folder.c:214
msgid "Maildir append message cancelled"
msgstr "Maildir append message cancelled"
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Cannot append message to maildir folder: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mbox-folder.c:436
#: camel/providers/local/camel-mbox-folder.c:467
@@ -10484,48 +10919,48 @@ msgstr ""
"Cannot get message: %s from folder %s\n"
" %s"
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
msgid "Invalid message contents"
msgstr "Invalid message contents"
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
#: camel/providers/local/camel-mbox-store.c:154
#: camel/providers/local/camel-mh-store.c:204
#, c-format
msgid "Cannot get folder `%s': %s"
msgstr "Cannot get folder `%s': %s"
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
#: camel/providers/local/camel-mbox-store.c:162
#: camel/providers/local/camel-mh-store.c:211
#, c-format
msgid "Cannot get folder `%s': folder does not exist."
msgstr "Cannot get folder `%s': folder does not exist."
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
#: camel/providers/local/camel-mbox-store.c:184
#: camel/providers/local/camel-mbox-store.c:196
#, c-format
msgid "Cannot create folder `%s': %s"
msgstr "Cannot create folder `%s': %s"
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
#, c-format
msgid "Cannot get folder `%s': not a maildir directory."
msgstr "Cannot get folder `%s': not a maildir directory."
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
#: camel/providers/local/camel-mh-store.c:260
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "Could not delete folder `%s': %s"
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
msgid "not a maildir directory"
msgstr "not a maildir directory"
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
#: camel/providers/local/camel-spool-store.c:284
#: camel/providers/local/camel-spool-store.c:314
#, c-format
@@ -11112,20 +11547,25 @@ msgstr ""
msgid "Could not connect to POP server %s (port %d): %s"
msgstr "Could not connect to POP server %s (port %d): %s"
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Failed to authenticate on POP server %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "Failed to connect to POP server %s in secure mode: %s"
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
#, c-format
msgid "Could not connect to POP server %s"
msgstr "Could not connect to POP server %s"
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -11134,28 +11574,28 @@ msgstr ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
#, c-format
msgid "SASL `%s' Login failed for POP server %s: %s"
msgstr "SASL `%s' Login failed for POP server %s: %s"
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "Cannot login to POP server %s: SASL Protocol error"
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "Failed to authenticate on POP server %s: %s"
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
#, c-format
msgid "%sPlease enter the POP password for %s on host %s"
msgstr "%sPlease enter the POP password for %s on host %s"
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -11164,7 +11604,16 @@ msgstr ""
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
#, c-format
msgid "No such folder `%s'."
msgstr "No such folder `%s'."
@@ -11376,93 +11825,93 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
#, c-format
msgid "SMTP server %s"
msgstr "SMTP server %s"
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "SMTP mail delivery via %s"
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
msgid "Cannot send message: service not connected."
msgstr "Cannot send message: service not connected."
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
msgid "Cannot send message: sender address not valid."
msgstr "Cannot send message: sender address not valid."
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
msgid "Sending message"
msgstr "Sending message"
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
msgid "Cannot send message: no recipients defined."
msgstr "Cannot send message: no recipients defined."
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
msgid "Cannot send message: one or more invalid recipients"
msgstr "Cannot send message: one or more invalid recipients"
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
#, c-format
msgid "HELO command failed: %s"
msgstr "HELO command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
msgid "HELO command failed"
msgstr "HELO command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
msgid "SMTP Authentication"
msgstr "SMTP Authentication"
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
msgid "Error creating SASL authentication object."
msgstr "Error creating SASL authentication object."
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
#, c-format
msgid "AUTH command failed: %s"
msgstr "AUTH command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
msgid "AUTH command failed"
msgstr "AUTH command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
msgid "Bad authentication response from server.\n"
msgstr "Bad authentication response from server.\n"
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
#, c-format
msgid "MAIL FROM command failed: %s: mail not sent"
msgstr "MAIL FROM command failed: %s: mail not sent"
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
msgid "MAIL FROM command failed"
msgstr "MAIL FROM command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
#, c-format
msgid "RCPT TO command failed: %s: mail not sent"
msgstr "RCPT TO command failed: %s: mail not sent"
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
#, c-format
msgid "DATA command failed: %s: mail not sent"
msgstr "DATA command failed: %s: mail not sent"
@@ -11470,26 +11919,26 @@ msgstr "DATA command failed: %s: mail not sent"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
msgid "DATA command failed"
msgstr "DATA command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
#, c-format
msgid "RSET command failed: %s"
msgstr "RSET command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
msgid "RSET command failed"
msgstr "RSET command failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
#, c-format
msgid "QUIT command failed: %s"
msgstr "QUIT command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
msgid "QUIT command failed"
msgstr "QUIT command failed"
@@ -11552,72 +12001,6 @@ msgstr "MIME type:"
msgid "Suggest automatic display of attachment"
msgstr "Suggest automatic display of attachment"
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Open file"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Autogenerated"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Signature:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> File Attached"
-msgstr[1] "<b>%d</b> Files Attached"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Hide _Attachment Bar (drop attachments here)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Show _Attachment Bar (drop attachments here)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Compose a message"
-
-#: composer/e-msg-composer.c:4270
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-
#: composer/e-msg-composer-hdrs.c:512
msgid "Posting destination"
msgstr "Posting destination"
@@ -11698,17 +12081,90 @@ msgstr "Click here to select folders to post to"
msgid "Attach file(s)"
msgstr "Attach file(s)"
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Could not open file"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Open file"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signature:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> File Attached"
+msgstr[1] "<b>%d</b> Files Attached"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Hide _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Show _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Compose a message"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Forwarded message - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Attach original message"
+msgstr[1] "Attach original message"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+
#. mail-composer:no-attach primary
#: composer/mail-composer-errors.xml.h:2
msgid "You cannot attach the file `{0}' to this message."
msgstr "You cannot attach the file `{0}' to this message."
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
#. mail-composer:attach-notfile primary
#: composer/mail-composer-errors.xml.h:6
msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11728,18 +12184,32 @@ msgstr ""
"To attach the contents of this directory, either attach the files in this "
"directory individually, or create an archive of the directory and attach it."
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Could not create message."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
msgid "Unfinished messages found"
msgstr "Unfinished messages found"
#. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
msgid "Do you want to recover unfinished messages?"
msgstr "Do you want to recover unfinished messages?"
#. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
msgid ""
"Evolution quit unexpectedly while you were composing a new message. "
"Recovering the message will allow you to continue where you left off."
@@ -11747,31 +12217,31 @@ msgstr ""
"Evolution quit unexpectedly while you were composing a new message. "
"Recovering the message will allow you to continue where you left off."
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
msgid "Don't Recover"
msgstr "Don't Recover"
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
msgid "Recover"
msgstr "Recover"
#. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
msgid "Could not save to autosave file \"{0}\"."
msgstr "Could not save to autosave file \"{0}\"."
#. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
msgid "Error saving to autosave because \"{1}\"."
msgstr "Error saving to autosave because \"{1}\"."
#. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
msgid "Warning: Modified Message"
msgstr "Warning: Modified Message"
#. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
msgid ""
"Are you sure you want to discard the message, titled '{0}', you are "
"composing?"
@@ -11780,7 +12250,7 @@ msgstr ""
"composing?"
#. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
msgid ""
"Closing this composer window will discard the message permanently, unless "
"you choose to save the message in your Drafts folder. This will allow you to "
@@ -11790,63 +12260,48 @@ msgstr ""
"you choose to save the message in your Drafts folder. This will allow you to "
"continue the message at a later date."
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Discard Changes"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
msgid "Save Message"
msgstr "Save Message"
#. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
msgid "Could not create message."
msgstr "Could not create message."
#. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
msgid "Because \"{0}\", you may need to select different mail options."
msgstr "Because \"{0}\", you may need to select different mail options."
#. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
msgid "Could not read signature file \"{0}\"."
msgstr "Could not read signature file \"{0}\"."
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
-
#. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
msgid "All accounts have been removed."
msgstr "All accounts have been removed."
#. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
msgid "You need to configure an account before you can compose mail."
msgstr "You need to configure an account before you can compose mail."
#. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
msgid "Could not create composer window."
msgstr "Could not create composer window."
#. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
msgid "Unable to activate the address selector control."
msgstr "Unable to activate the address selector control."
-#: composer/mail-composer-errors.xml.h:50
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
msgid ""
"Unable to activate the HTML editor control.\n"
"\n"
@@ -12009,16 +12464,12 @@ msgstr "Sync Categories:"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#. strftime 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
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.
-#. strftime 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
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
@@ -12070,31 +12521,23 @@ msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
@@ -12171,10 +12614,6 @@ msgstr "%d-%b-%Y"
msgid "Select a time to compare against"
msgstr "Select a time to compare against"
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "_Filter Rules"
-
#. filter:no-date primary
#: filter/filter-errors.xml.h:2
msgid "Missing date."
@@ -12191,7 +12630,6 @@ msgid "Missing file name."
msgstr "Missing file name."
#. filter:no-file secondary
-#. filter:bad-file secondary
#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
msgid "You must specify a file name."
msgstr "You must specify a file name."
@@ -12201,172 +12639,42 @@ msgstr "You must specify a file name."
msgid "File \"{0}\" does not exist or is not a regular file."
msgstr "File \"{0}\" does not exist or is not a regular file."
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Missing folder."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
-
#. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
msgid "Bad regular expression \"{0}\"."
msgstr "Bad regular expression \"{0}\"."
#. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
msgid "Could not compile regular expression \"{1}\"."
msgstr "Could not compile regular expression \"{1}\"."
#. filter:no-name primary
-#. filter:no-name-vfolder primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
msgid "Missing name."
msgstr "Missing name."
#. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
msgid "You must name this filter."
msgstr "You must name this filter."
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "You must name this vFolder."
-
#. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
msgid "Name \"{0}\" already used."
msgstr "Name \"{0}\" already used."
#. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
msgid "Please choose another name."
msgstr "Please choose another name."
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "No sources selected."
-
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"You must specify at least one folder as a source.\n"
-"Select folders individually, select all local folders,\n"
-"select all remote folders, or select all remote and\n"
-"local folders."
-
#: filter/filter-file.c:288
msgid "Choose a file"
msgstr "Choose a file"
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Then</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Select Folder"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid " "
-msgstr " "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Filter Rules</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vFolder Sources</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Compare against"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Incoming"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "a time relative to the current time"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "ago"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "months"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "seconds"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "specific folders only"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "the current time"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "the time you specify"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "with all active remote folders"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "with all local and active remote folders"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "with all local folders"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "years"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
msgid "Important"
msgstr "Important"
@@ -12430,6 +12738,70 @@ msgstr "incoming"
msgid "outgoing"
msgstr "outgoing"
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Filter Rules</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Compare against"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Incoming"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "a time relative to the current time"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "ago"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "months"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "seconds"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "the current time"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "the time you specify"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "years"
+
#: filter/rule-editor.c:285
msgid "Add Rule"
msgstr "Add Rule"
@@ -12442,58 +12814,70 @@ msgstr "Edit Rule"
msgid "Rule name"
msgstr "Rule name"
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "_Score Rules"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Body contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure mail preferences, including security and message display, here"
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Body does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure spell-checking, signatures, and the message composer here"
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Body or subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configure your email accounts here"
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Message contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Mail"
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Recipients contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Sender contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Mail component"
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Subject does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Virtual _Folders"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Add"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Mail"
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VFolder source"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Mail"
#. translators: default account indicator
#: mail/em-account-prefs.c:418
@@ -12525,45 +12909,352 @@ msgstr "Add signature script"
msgid "Signature(s)"
msgstr "Signature(s)"
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
msgid "an unknown sender"
msgstr "an unknown sender"
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Filter Rules"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Select Folder"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
+msgstr "Assign Task"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Assigned"
+
+#: mail/em-filter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Attachment"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belize"
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Body contains"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "_Copy to Folder"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "Received"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Item sent!\n"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Delete"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "Body does not contain"
+
+#: mail/em-filter-i18n.h:14
+#, fuzzy
+msgid "does not end with"
+msgstr "File %s does not exist"
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "File %s does not exist"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Body does not contain"
+
+#: mail/em-filter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "Body does not contain"
+
+#: mail/em-filter-i18n.h:18
+#, fuzzy
+msgid "does not start with"
+msgstr "Could not start wombat"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "Draft"
+msgstr "Date"
+
+#: mail/em-filter-i18n.h:21
+#, fuzzy
+msgid "ends with"
+msgstr "Name begins with"
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "E_xit"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "Text"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Expires"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "Follow-Up"
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "List"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "after"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "before"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Flagged"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "List"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Flagged"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "June"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "%s mailing list"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Message to Send"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Message to Send"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Messages"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Mark as _Not Junk"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "_Move to Folder"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Exit the program"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Play sound:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Read"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "Recipients contain"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Replies"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "Purge events older than"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Run program:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Send"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Status"
+
+#: mail/em-filter-i18n.h:57
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Size"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Source Book"
+
+#: mail/em-filter-i18n.h:60
+#, fuzzy
+msgid "Specific header"
+msgstr "specific folders only"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Stop Loading"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subject"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "United States"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Then</b>"
#: mail/em-folder-browser.c:129
msgid "Create _Virtual Folder From Search..."
msgstr "Create _Virtual Folder From Search..."
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
msgstr "Folder properties"
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Properties"
-
#. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Folder Name"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Total messages"
-
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Unread messages"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Total messages"
+msgstr[1] "Total messages"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Unread messages"
+msgstr[1] "Unread messages"
#: mail/em-folder-selection-button.c:120
msgid "<click here to select a folder>"
@@ -12573,8 +13264,8 @@ msgstr "<click here to select a folder>"
msgid "Create New Folder"
msgstr "Create New Folder"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2311
-#: mail/mail-component.c:719
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
@@ -12586,444 +13277,276 @@ msgstr "Create"
msgid "Folder _name:"
msgstr "Folder _name:"
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Loading..."
+
+#: mail/em-folder-tree.c:846
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "_Copy to Folder"
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
msgid "_Move to Folder"
msgstr "_Move to Folder"
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2098
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
msgid "_Move"
msgstr "_Move"
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: mail/em-folder-tree.c:2085 mail/em-folder-tree.c:2098
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
#: mail/importers/evolution-mbox-importer.c:119
#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder"
msgstr "Select folder"
-#: mail/em-folder-tree.c:2085 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
msgid "C_opy"
msgstr "C_opy"
-#: mail/em-folder-tree.c:2125
+#: mail/em-folder-tree.c:2144
#, c-format
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
-#: mail/em-folder-tree.c:2311 mail/mail-component.c:719
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
msgid "Create folder"
msgstr "Create folder"
-#: mail/em-folder-tree.c:2500
+#: mail/em-folder-tree.c:2526
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Rename the \"%s\" folder to:"
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2528
msgid "Rename Folder"
msgstr "Rename Folder"
-#: mail/em-folder-tree.c:2573 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
msgid "_View"
msgstr "_View"
-#: mail/em-folder-tree.c:2574
+#: mail/em-folder-tree.c:2604
msgid "Open in _New Window"
msgstr "Open in _New Window"
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2608
msgid "_Copy..."
msgstr "_Copy..."
-#: mail/em-folder-tree.c:2579
+#: mail/em-folder-tree.c:2609
msgid "_Move..."
msgstr "_Move..."
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2583
+#: mail/em-folder-tree.c:2613
msgid "_New Folder..."
msgstr "_New Folder..."
-#: mail/em-folder-tree.c:2586
+#: mail/em-folder-tree.c:2616
msgid "_Rename..."
msgstr "_Rename..."
-#: mail/em-folder-tree.c:2589 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
msgid "_Properties"
msgstr "_Properties"
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Loading..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:516
-#: mail/mail-component.c:569
-msgid "Mail"
-msgstr "Mail"
-
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
#: ui/evolution-mail-message.xml.h:113
msgid "_Edit as New Message..."
msgstr "_Edit as New Message..."
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
msgid "_Print"
msgstr "_Print"
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "Reply to _List"
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "Reply to _All"
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
#: ui/evolution-mail-message.xml.h:114
msgid "_Forward"
msgstr "_Forward"
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
msgid "Follo_w Up..."
msgstr "Follo_w Up..."
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
msgid "Fla_g Completed"
msgstr "Fla_g Completed"
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
msgid "Cl_ear Flag"
msgstr "Cl_ear Flag"
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
msgid "_Mark as Unimportant"
msgstr "_Mark as Unimportant"
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
msgid "U_ndelete"
msgstr "U_ndelete"
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
msgid "Mo_ve to Folder..."
msgstr "Mo_ve to Folder..."
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr "_Copy to Folder..."
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
msgid "Add Sender to Address_book"
msgstr "Add Sender to Address_book"
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
msgid "Appl_y Filters"
msgstr "Appl_y Filters"
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
msgid "F_ilter Junk"
msgstr "F_ilter Junk"
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
msgid "Crea_te Rule From Message"
msgstr "Crea_te Rule From Message"
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
msgid "VFolder on _Subject"
msgstr "VFolder on _Subject"
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
msgid "VFolder on Se_nder"
msgstr "VFolder on Se_nder"
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
msgid "VFolder on _Recipients"
msgstr "VFolder on _Recipients"
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
msgid "VFolder on Mailing _List"
msgstr "VFolder on Mailing _List"
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
msgid "Filter on Sub_ject"
msgstr "Filter on Sub_ject"
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
msgid "Filter on Sen_der"
msgstr "Filter on Sen_der"
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
msgid "Filter on Re_cipients"
msgstr "Filter on Re_cipients"
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
msgid "Filter on _Mailing List"
msgstr "Filter on _Mailing List"
#. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "Default"
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
msgid "Print Message"
msgstr "Print Message"
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "From"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "To"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Subject"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Date"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Valid signature but cannot verify sender"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Encrypted"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
#. message-search popup match count string
#: mail/em-format-html-display.c:410
#, c-format
msgid "Matches: %d"
msgstr "Matches: %d"
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: mail/em-format-html-display.c:641
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
@@ -13031,7 +13554,11 @@ msgstr ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: mail/em-format-html-display.c:642
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
@@ -13039,7 +13566,11 @@ msgstr ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: mail/em-format-html-display.c:643
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
@@ -13047,11 +13578,11 @@ msgstr ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
msgid "Valid signature, cannot verify sender"
msgstr "Valid signature, cannot verify sender"
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
@@ -13059,7 +13590,11 @@ msgstr ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: mail/em-format-html-display.c:650
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"The Internet."
@@ -13067,7 +13602,11 @@ msgstr ""
"This message is not encrypted. Its content may be viewed in transit across "
"The Internet."
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: mail/em-format-html-display.c:651
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would "
"be difficult, but not impossible for an outsider to view the content of this "
@@ -13077,7 +13616,11 @@ msgstr ""
"be difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: mail/em-format-html-display.c:652
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
@@ -13085,7 +13628,11 @@ msgstr ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: mail/em-format-html-display.c:653
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -13095,39 +13642,161 @@ msgstr ""
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
msgid "_View Certificate"
msgstr "_View Certificate"
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
msgid "This certificate is not viewable"
msgstr "This certificate is not viewable"
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Completed on %B %d, %Y, %l:%M %p"
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
msgid "Overdue:"
msgstr "Overdue:"
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
msgid "by %B %d, %Y, %l:%M %p"
msgstr "by %B %d, %Y, %l:%M %p"
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
msgid "_View Inline"
msgstr "_View Inline"
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
msgid "_Hide"
msgstr "_Hide"
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
#, c-format
msgid "Page %d of %d"
msgstr "Page %d of %d"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Valid signature but cannot verify sender"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "From"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "To"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Mailer"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
+msgstr "<I> (%a, %R %Z)</I>"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Date"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
#: mail/em-junk-filter.c:86
msgid "Spamassassin (built-in)"
msgstr "Spamassassin (built-in)"
@@ -13237,7 +13906,7 @@ msgstr "Se_nd message to..."
msgid "_Add to Addressbook"
msgstr "_Add to Addressbook"
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
#, c-format
msgid "Open in %s..."
msgstr "Open in %s..."
@@ -13284,11 +13953,23 @@ msgid "Add address"
msgstr "Add address"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Virtual _Folders"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Add"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VFolder source"
+
#: mail/evolution-mail.schemas.in.in.h:1
msgid "Automatic link recognition"
msgstr "Automatic link recognition"
@@ -13759,63 +14440,33 @@ msgstr "port for starting user runned spamd"
msgid "spamd port"
msgstr "spamd port"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure mail preferences, including security and message display, here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Mail"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
#: mail/importers/elm-importer.c:88
msgid "Evolution is importing your old Elm mail"
@@ -13873,34 +14524,6 @@ msgstr "Importing `%s'"
msgid "Importing mailbox"
msgstr "Importing mailbox"
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
#: mail/importers/mail-importer.c:360
#, c-format
msgid "Scanning %s"
@@ -14070,91 +14693,83 @@ msgstr "%s mailing list"
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: mail/mail-component.c:469
+#: mail/mail-component.c:459
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d deleted"
msgstr[1] "%d deleted"
-#: mail/mail-component.c:471
+#: mail/mail-component.c:461
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d junk"
msgstr[1] "%d junk"
-#: mail/mail-component.c:494
+#: mail/mail-component.c:484
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d draft"
msgstr[1] "%d drafts"
-#: mail/mail-component.c:496
+#: mail/mail-component.c:486
#, c-format
msgid "%d sent"
-msgid_plural "%d send"
+msgid_plural "%d sent"
msgstr[0] "%d sent"
msgstr[1] "%d sent"
-#: mail/mail-component.c:498
+#: mail/mail-component.c:488
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d unsent"
msgstr[1] "%d unsent"
-#: mail/mail-component.c:502
+#: mail/mail-component.c:492
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "%d total"
msgstr[1] "%d total"
-#: mail/mail-component.c:504
+#: mail/mail-component.c:494
#, c-format
msgid ", %d unread"
msgid_plural ", %d unread"
msgstr[0] ", %d unread"
msgstr[1] ", %d unread"
-#: mail/mail-component.c:671
+#: mail/mail-component.c:661
msgid "New Mail Message"
msgstr "New Mail Message"
-#: mail/mail-component.c:672
+#: mail/mail-component.c:662
msgid "_Mail Message"
msgstr "_Mail Message"
-#: mail/mail-component.c:673
+#: mail/mail-component.c:663
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: mail/mail-component.c:679
+#: mail/mail-component.c:669
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: mail/mail-component.c:680
+#: mail/mail-component.c:670
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: mail/mail-component.c:681
+#: mail/mail-component.c:671
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: mail/mail-component.c:813
+#: mail/mail-component.c:803
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Connecting to server..."
-
#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
msgid "Identity"
msgstr "Identity"
@@ -14216,14 +14831,22 @@ msgstr ""
"name for this account in the space below. This name will be used for display "
"purposes only."
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Checking Service"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Connecting to server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid " "
+msgstr " "
+
#: mail/mail-config.glade.h:2
msgid " Ch_eck for Supported Types "
msgstr " Ch_eck for Supported Types "
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Preview</b>"
-
#: mail/mail-config.glade.h:5
msgid "<b>SSL is not supported in this build of evolution</b>"
msgstr "<b>SSL is not supported in this build of evolution</b>"
@@ -14476,7 +15099,7 @@ msgstr "Do not quote original message"
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "Don't sign _meeting requests (for Outlook compatibility)"
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "Done"
@@ -14814,6 +15437,122 @@ msgstr "colour"
msgid "description"
msgstr "description"
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Please read carefully the licence agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder Sources</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digital Signature</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Encryption</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Accepted"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "C_ompleted"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Case Sensitive"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Find in Message"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Find:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Flag to Follow Up"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Folder Subscriptions"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "%s Licence Agreement"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "None Selected"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erver:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Security Information"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "List of accepted licences"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Due By:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Flag:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Subscribe"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "specific folders only"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "with all active remote folders"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "with all local and active remote folders"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "with all local folders"
+
#. mail:camel-service-auth-invalid primary
#: mail/mail-errors.xml.h:2
msgid "Invalid authentication"
@@ -14835,6 +15574,7 @@ msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
#. mail:camel-service-auth-failed secondary
#: mail/mail-errors.xml.h:8
+#, fuzzy
msgid ""
"Check to make sure your password is spelled correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
@@ -14847,6 +15587,7 @@ msgstr ""
msgid "Are you sure you want to send a message in HTML format?"
msgstr "Are you sure you want to send a message in HTML format?"
+#. mail:ask-send-html secondary
#: mail/mail-errors.xml.h:12
msgid ""
"Please make sure the following recipients are willing and able to receive "
@@ -14861,8 +15602,9 @@ msgstr ""
#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
msgid "_Send"
-msgstr "_Send"
+msgstr "Send"
#. mail:ask-send-no-subject primary
#: mail/mail-errors.xml.h:17
@@ -14879,11 +15621,11 @@ msgstr ""
"an idea of the topic of your letter."
#. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
msgid "Are you sure you want to send a message with only BCC recipients?"
msgstr "Are you sure you want to send a message with only BCC recipients?"
+#. mail:ask-send-only-bcc-contact secondary
#: mail/mail-errors.xml.h:24
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
@@ -14957,7 +15699,6 @@ msgstr ""
"folder \"{0}\"?"
#. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
msgid "If you continue, you will not be able to recover these messages."
msgstr "If you continue, you will not be able to recover these messages."
@@ -14986,6 +15727,7 @@ msgstr "You have unsent messages, do you wish to quit anyway?"
#. mail:exit-unsaved secondary
#: mail/mail-errors.xml.h:55
+#, fuzzy
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
@@ -14998,6 +15740,7 @@ msgstr ""
msgid "Your message with the subject \"{0}\" was not delivered."
msgstr "Your message with the subject \"{0}\" was not delivered."
+#. mail:camel-exception secondary
#: mail/mail-errors.xml.h:59
msgid ""
"The message was sent via the \"sendmail\" external application. Sendmail "
@@ -15030,21 +15773,6 @@ msgstr "Error while performing operation."
msgid "{0}."
msgstr "{0}."
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
#. mail:ask-session-password primary
#: mail/mail-errors.xml.h:82
msgid "Enter password."
@@ -15061,8 +15789,6 @@ msgid "Cannot save to directory \"{0}\"."
msgstr "Cannot save to directory \"{0}\"."
#. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
msgid "Cannot save to file \"{0}\"."
@@ -15099,7 +15825,6 @@ msgid "Cannot delete system folder \"{0}\"."
msgstr "Cannot delete system folder \"{0}\"."
#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
@@ -15133,13 +15858,11 @@ msgstr ""
"will be deleted permanently."
#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "Cannot rename \"{0}\" to \"{1}\"."
#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "A folder named \"{1}\" already exists. Please use a different name."
@@ -15150,25 +15873,21 @@ msgid "Because \"{2}\"."
msgstr "Because \"{2}\"."
#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "Cannot move folder \"{0}\" to \"{1}\"."
#. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
msgid "Cannot open source \"{2}\"."
msgstr "Cannot open source \"{2}\"."
#. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
msgid "Cannot open target \"{2}\"."
msgstr "Cannot open target \"{2}\"."
#. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15184,7 +15903,6 @@ msgid "Cannot open source \"{1}\""
msgstr "Cannot open source \"{1}\""
#. mail:account-incomplete primary
-#. mail:account-notunique primary
#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
msgid "Cannot save changes to account."
msgstr "Cannot save changes to account."
@@ -15206,8 +15924,11 @@ msgstr "Delete account?"
#. mail:ask-delete-account primary
#: mail/mail-errors.xml.h:166
+#, fuzzy
msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
#. mail:ask-delete-account secondary
#: mail/mail-errors.xml.h:168
@@ -15215,8 +15936,9 @@ msgid "If you proceed, the account information will be deleted permanently."
msgstr "If you proceed, the account information will be deleted permanently."
#: mail/mail-errors.xml.h:169
+#, fuzzy
msgid "Don't delete"
-msgstr "Don't delete"
+msgstr "_Undelete"
#. mail:no-save-signature primary
#: mail/mail-errors.xml.h:171
@@ -15245,6 +15967,7 @@ msgstr "Discard changes?"
#. mail:ask-signature-changed primary
#: mail/mail-errors.xml.h:181
+#, fuzzy
msgid "Do you wish to save your changes?"
msgstr "Do you wish to save your changes?"
@@ -15281,6 +16004,7 @@ msgstr "Cannot add vFolder \"{0}\"."
msgid "vFolders automatically updated."
msgstr "vFolders automatically updated."
+#. mail:vfolder-updated secondary
#: mail/mail-errors.xml.h:196
msgid ""
"The following vFolder(s):\n"
@@ -15300,6 +16024,7 @@ msgstr ""
msgid "Mail filters automatically updated."
msgstr "Mail filters automatically updated."
+#. mail:filter-updated secondary
#: mail/mail-errors.xml.h:204
msgid ""
"The following filter rule(s):\n"
@@ -15314,12 +16039,45 @@ msgstr ""
" \"{1}\"\n"
"And have been updated."
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
#: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Missing folder."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "You must name this vFolder."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "No sources selected."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+"You must specify at least one folder as a source.\n"
+"Select folders individually, select all local folders,\n"
+"select all remote folders, or select all remote and\n"
+"local folders."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
msgid "Problem migrating old mail folder \"{0}\"."
msgstr "Problem migrating old mail folder \"{0}\"."
-#: mail/mail-errors.xml.h:212
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:226
msgid ""
"A non-empty folder at \"{1}\" already exists.\n"
"\n"
@@ -15331,15 +16089,15 @@ msgstr ""
"You can choose to ignore this folder, overwrite or append its contents, or "
"quit.\n"
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
msgid "Ignore"
msgstr "Ignore"
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
msgid "_Overwrite"
msgstr "_Overwrite"
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
msgid "_Append"
msgstr "_Append"
@@ -15500,7 +16258,7 @@ msgstr ""
msgid "Saving attachment"
msgstr "Saving attachment"
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -15509,45 +16267,21 @@ msgstr ""
"Cannot create output file: %s:\n"
" %s"
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
#, c-format
msgid "Could not write data: %s"
msgstr "Could not write data: %s"
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
#, c-format
msgid "Disconnecting from %s"
msgstr "Disconnecting from %s"
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
#, c-format
msgid "Reconnecting to %s"
msgstr "Reconnecting to %s"
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Case Sensitive"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Find in Message"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Find:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digital Signature</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Encryption</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Security Information"
-
#: mail/mail-send-recv.c:157
msgid "Cancelling..."
msgstr "Cancelling..."
@@ -15655,15 +16389,15 @@ msgstr "Updating vFolders for '%s:%s'"
msgid "Updating vFolders for '%s'"
msgstr "Updating vFolders for '%s'"
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
msgid "vFolders"
msgstr "vFolders"
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
msgid "Edit VFolder"
msgstr "Edit VFolder"
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
msgid "New VFolder"
msgstr "New VFolder"
@@ -15783,10 +16517,6 @@ msgstr "Forward"
msgid "No Response Necessary"
msgstr "No Response Necessary"
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Read"
-
#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr "Reply"
@@ -15799,49 +16529,49 @@ msgstr "Reply to All"
msgid "Review"
msgstr "Review"
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Flag to Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Body contains"
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "C_ompleted"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Body does not contain"
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Body or subject contains"
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Due By:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Message contains"
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Flag:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Recipients contain"
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Folder Subscriptions"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Sender contains"
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "None Selected"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Subject contains"
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Subject does not contain"
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Subscribe"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Shell"
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
#: shell/apps_evolution_shell.schemas.in.in.h:1
msgid "480"
@@ -15909,30 +16639,19 @@ msgstr "Whether to skip the development warning dialog"
msgid "mail"
msgstr "mail"
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Uknown system error."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>Authentication</b>"
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Execute actions"
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Generic error"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
msgid "(Untitled)"
@@ -16117,23 +16836,6 @@ msgstr "Folder name cannot contain the character \"#\"."
msgid "'.' and '..' are reserved folder names."
msgstr "'.' and '..' are reserved folder names."
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution is currently online. Click on this button to work offline."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in the process of going offline."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution is currently offline. Click on this button to work online."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Switch to %s"
-
#: shell/e-shell-window-commands.c:66
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "The GNOME Pilot tools do not appear to be installed on this system."
@@ -16167,10 +16869,88 @@ msgstr "_Work Offline"
msgid "Work Offline"
msgstr "Work Offline"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr "Evolution is currently online. Click on this button to work offline."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution is in the process of going offline."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr "Evolution is currently offline. Click on this button to work online."
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Switch to %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Uknown system error."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Invalid arguments"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Cannot register on OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Configuration Database not found"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Generic error"
+
#: shell/e-user-creatable-items-handler.c:691
msgid "New"
msgstr "New"
+#: shell/evolution-startup-wizard.glade.h:2
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Evolution Import Assistant"
+
+#: shell/evolution-startup-wizard.glade.h:3
+#, fuzzy
+msgid "Importing Files"
+msgstr "Import File"
+
+#: shell/evolution-startup-wizard.glade.h:4
+#, fuzzy
+msgid "Timezone "
+msgstr "Time _zone:"
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr ""
+
+#: shell/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+
+#: shell/evolution-startup-wizard.glade.h:11
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
+msgstr ""
+
#: shell/evolution-test-component.c:140
msgid "New Test"
msgstr "New Test"
@@ -16183,18 +16963,6 @@ msgstr "_Test"
msgid "Create a new test item"
msgstr "Create a new test item"
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr "Click \"Import\" to begin importing the file into Evolution. "
@@ -16253,8 +17021,9 @@ msgstr "Don't ask me again"
msgid "Evolution can import data from the following files:"
msgstr "Evolution can import data from the following files:"
-#: shell/main.c:231
-#, c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:225
+#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
"of the Evolution groupware suite.\n"
@@ -16288,7 +17057,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: shell/main.c:255
+#: shell/main.c:249
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -16296,39 +17065,39 @@ msgstr ""
"Thanks\n"
"The Evolution Team\n"
-#: shell/main.c:262
+#: shell/main.c:256
msgid "Don't tell me again"
msgstr "Don't tell me again"
-#: shell/main.c:496
+#: shell/main.c:461
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: shell/main.c:498
+#: shell/main.c:463
msgid "Start in offline mode"
msgstr "Start in offline mode"
-#: shell/main.c:500
+#: shell/main.c:465
msgid "Start in online mode"
msgstr "Start in online mode"
-#: shell/main.c:503
+#: shell/main.c:468
msgid "Forcibly shut down all evolution components"
msgstr "Forcibly shut down all evolution components"
-#: shell/main.c:507
+#: shell/main.c:472
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: shell/main.c:510
+#: shell/main.c:475
msgid "Send the debugging output of all components to a file."
msgstr "Send the debugging output of all components to a file."
-#: shell/main.c:534
+#: shell/main.c:502
msgid "Evolution"
msgstr "Evolution"
-#: shell/main.c:538
+#: shell/main.c:506
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -16337,6 +17106,94 @@ msgstr ""
"%s: --online and --offline cannot be used together.\n"
" Use %s --help for more information.\n"
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "Body contains"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Could not start wombat server"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Account Assistant"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
#: smime/gui/certificate-manager.c:556
msgid "Select a cert to import..."
@@ -16580,6 +17437,11 @@ msgstr "Your Certificates"
msgid "_Edit CA Trust"
msgstr "_Edit CA Trust"
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
msgid "%d/%m/%Y"
msgstr "%d/%m/%Y"
@@ -16779,11 +17641,6 @@ msgstr "Subject Unique ID"
msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
#: smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr "PKCS12 File Password"
@@ -16923,8 +17780,8 @@ msgstr "View the current contact"
#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
msgid "_Actions"
msgstr "_Actions"
@@ -17398,16 +18255,6 @@ msgstr "_Invert Selection"
msgid "_Threaded Message List"
msgstr "_Threaded Message List"
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Close this window"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Close"
-
#: ui/evolution-mail-message.xml.h:1
msgid "A_dd Sender to Address Book"
msgstr "A_dd Sender to Address Book"
@@ -17808,6 +18655,16 @@ msgstr "_Tools"
msgid "_Undelete"
msgstr "_Undelete"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Close"
+
#: ui/evolution-message-composer.xml.h:1
msgid "Attach"
msgstr "Attach"
@@ -17890,10 +18747,6 @@ msgstr "Save the current file with a different name"
msgid "Save the message in a specified folder"
msgstr "Save the message in a specified folder"
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Send"
-
#: ui/evolution-message-composer.xml.h:25
#: ui/evolution-signature-editor.xml.h:11
msgid "Send the mail in HTML format"
@@ -18596,3 +19449,178 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Authentication Credentials for HTTP Server"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Calendars selected for publishing"
+
+#~ msgid "Login name:"
+#~ msgstr "Login name:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "User Publishes"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "Events cannot be created in a read-only calendar. Please select a read-"
+#~ "write calendar."
+
+#~ msgid "C_alendar"
+#~ msgstr "C_alendar"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Audio Alarm Options"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Message Alarm Options"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Email Alarm Options"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Program Alarm Options"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Unknown Alarm Options"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarm Repeat"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Message to Display:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "With these arguments:"
+
+#~ msgid "Basics"
+#~ msgstr "Basics"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Date/Time:"
+
+#~ msgid "Reminders"
+#~ msgstr "Reminders"
+
+#~ msgid "_Options..."
+#~ msgstr "_Options..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Addressbook..."
+
+#~ msgid "Reminder"
+#~ msgstr "Reminder"
+
+#~ msgid "B_usy"
+#~ msgstr "B_usy"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Co_nfidential"
+
+#~ msgid "Date & Time"
+#~ msgstr "Date & Time"
+
+#~ msgid "F_ree"
+#~ msgstr "F_ree"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vate"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_blic"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Add A_ttendee"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Add attendees from addressbook."
+
+#~ msgid "Preview"
+#~ msgstr "Preview"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Recurrence Rule"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Custom recurrence"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modify"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_No recurrence"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Simple recurrence"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Complete"
+
+#~ msgid "Progress"
+#~ msgstr "Progress"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Con_fidential"
+
+#~ msgid "Folder:"
+#~ msgstr "Folder:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "There was an error on the CORBA system\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Object could not be found\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "You don't have the right permissions to update the calendar\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Attendee status could not be updated!\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Add attendees from addressbook"
+
+#~ msgid "_Options"
+#~ msgstr "_Options"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Meeting _start time:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Meeting _end time:"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "Events cannot be created in a read-only calendar. Please select a read-"
+#~ "write calendar."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Can't find certificate for `%s'"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Cannot create CMS Message"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Can't create encoder context"
+
+#~ msgid "_Score Rules"
+#~ msgstr "_Score Rules"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
+
+#~ msgid "Properties"
+#~ msgstr "Properties"
+
+#~ msgid "Folder Name"
+#~ msgstr "Folder Name"