diff options
Diffstat (limited to 'po/en_AU.po')
| -rw-r--r-- | po/en_AU.po | 3635 |
1 files changed, 1967 insertions, 1668 deletions
diff --git a/po/en_AU.po b/po/en_AU.po index 18ba28ad56..f1c55d076e 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: evolution 0.6\n" -"POT-Creation-Date: 2002-06-27 14:13-0400\n" +"POT-Creation-Date: 2002-08-13 08:06-0400\n" "PO-Revision-Date: 2000-10-22 16:19+0100\n" "Last-Translator: Michael Zucchi <notzed@ximian.com>\n" "Language-Team: \n" @@ -34,7 +34,7 @@ msgstr "" msgid "File As" msgstr "" -#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76 +#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74 #: my-evolution/e-summary-table.c:59 msgid "Name" msgstr "" @@ -342,45 +342,45 @@ msgstr "" msgid "Could not initialize Bonobo" msgstr "Could not initialise Bonobo" -#: addressbook/backend/pas/pas-backend-file.c:261 -#: addressbook/backend/pas/pas-backend-ldap.c:2735 +#: addressbook/backend/pas/pas-backend-file.c:356 +#: addressbook/backend/pas/pas-backend-ldap.c:2747 msgid "Searching..." msgstr "" -#: addressbook/backend/pas/pas-backend-file.c:263 +#: addressbook/backend/pas/pas-backend-file.c:358 msgid "Loading..." msgstr "" #. need a different error message here. -#: addressbook/backend/pas/pas-backend-file.c:272 +#: addressbook/backend/pas/pas-backend-file.c:381 msgid "Error in search expression." msgstr "" -#: addressbook/backend/pas/pas-backend-ldap.c:1126 +#: addressbook/backend/pas/pas-backend-ldap.c:1138 msgid "Adding card to LDAP server..." msgstr "" -#: addressbook/backend/pas/pas-backend-ldap.c:1229 +#: addressbook/backend/pas/pas-backend-ldap.c:1241 msgid "Removing card from LDAP server..." msgstr "" -#: addressbook/backend/pas/pas-backend-ldap.c:1465 +#: addressbook/backend/pas/pas-backend-ldap.c:1477 msgid "Modifying card from LDAP server..." msgstr "" -#: addressbook/backend/pas/pas-backend-ldap.c:2589 +#: addressbook/backend/pas/pas-backend-ldap.c:2601 msgid "Restarting search." msgstr "" -#: addressbook/backend/pas/pas-backend-ldap.c:2681 +#: addressbook/backend/pas/pas-backend-ldap.c:2693 msgid "Receiving LDAP search results..." msgstr "" -#: addressbook/backend/pas/pas-backend-ldap.c:2762 +#: addressbook/backend/pas/pas-backend-ldap.c:2774 msgid "Error performing search" msgstr "" -#: addressbook/backend/pas/pas-backend-ldap.c:2786 +#: addressbook/backend/pas/pas-backend-ldap.c:2798 msgid "Could not parse query string" msgstr "" @@ -470,11 +470,11 @@ msgid "This page can be used to configure access to LDAP directory servers" msgstr "" #: addressbook/gui/component/addressbook-component.c:73 -#: addressbook/gui/component/addressbook-component.c:620 +#: addressbook/gui/component/addressbook-component.c:608 #: calendar/gui/dialogs/comp-editor-util.c:310 #: calendar/gui/dialogs/comp-editor-util.c:366 -#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173 -#: shell/e-shortcuts.c:1042 +#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177 +#: shell/e-shortcuts.c:1067 msgid "Contacts" msgstr "" @@ -490,21 +490,28 @@ msgstr "" msgid "LDAP server containing contact information" msgstr "" -#: addressbook/gui/component/addressbook-component.c:578 -msgid "New Contact List" +#: addressbook/gui/component/addressbook-component.c:564 +msgid "New Contact" msgstr "" -#: addressbook/gui/component/addressbook-component.c:578 -msgid "Contact _List" +#: addressbook/gui/component/addressbook-component.c:564 +msgid "_Contact" msgstr "" -#: addressbook/gui/component/addressbook-component.c:581 -msgid "New Contact" +#: addressbook/gui/component/addressbook-component.c:565 +msgid "Create a new contact" msgstr "" -#: addressbook/gui/component/addressbook-component.c:581 -#: ui/evolution-addressbook.xml.h:32 -msgid "_Contact" +#: addressbook/gui/component/addressbook-component.c:568 +msgid "New Contact List" +msgstr "" + +#: addressbook/gui/component/addressbook-component.c:568 +msgid "Contact _List" +msgstr "" + +#: addressbook/gui/component/addressbook-component.c:569 +msgid "Create a new contact list" msgstr "" #: addressbook/gui/component/addressbook-config.c:197 @@ -523,24 +530,24 @@ msgstr "" msgid "The server responded with no supported search bases" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1152 +#: addressbook/gui/component/addressbook-config.c:1150 msgid "This server does not support LDAPv3 schema information" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1174 +#: addressbook/gui/component/addressbook-config.c:1172 msgid "Error retrieving schema information" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1182 +#: addressbook/gui/component/addressbook-config.c:1180 msgid "Server did not respond with valid schema information" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1638 +#: addressbook/gui/component/addressbook-config.c:1636 msgid "LDAP was not enabled in this build of Evolution" msgstr "" #: addressbook/gui/component/addressbook-factory.c:72 -#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139 +#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142 msgid "Could not initialize gnome-vfs" msgstr "Could not initialise gnome-vfs" @@ -549,18 +556,18 @@ msgstr "Could not initialise gnome-vfs" msgid "Other Contacts" msgstr "_Other Organiser" -#: addressbook/gui/component/addressbook.c:516 +#: addressbook/gui/component/addressbook.c:468 msgid "Unable to open addressbook" msgstr "" -#: addressbook/gui/component/addressbook.c:525 +#: addressbook/gui/component/addressbook.c:477 msgid "" "We were unable to open this addressbook. This either\n" "means you have entered an incorrect URI, or the LDAP server\n" "is down" msgstr "" -#: addressbook/gui/component/addressbook.c:530 +#: addressbook/gui/component/addressbook.c:482 msgid "" "This version of Evolution does not have LDAP support\n" "compiled in to it. If you want to use LDAP in Evolution\n" @@ -568,48 +575,48 @@ msgid "" "retrieving OpenLDAP from the link below.\n" msgstr "" -#: addressbook/gui/component/addressbook.c:538 +#: addressbook/gui/component/addressbook.c:490 msgid "" "We were unable to open this addressbook. Please check that the\n" "path exists and that you have permission to access it." msgstr "" -#: addressbook/gui/component/addressbook.c:648 -#: addressbook/gui/component/addressbook.c:651 +#: addressbook/gui/component/addressbook.c:600 +#: addressbook/gui/component/addressbook.c:603 #, c-format msgid "Enter password for %s (user %s)" msgstr "" -#: addressbook/gui/component/addressbook.c:776 +#: addressbook/gui/component/addressbook.c:728 msgid "Name begins with" msgstr "" -#: addressbook/gui/component/addressbook.c:777 +#: addressbook/gui/component/addressbook.c:729 msgid "Email is" msgstr "" -#: addressbook/gui/component/addressbook.c:778 +#: addressbook/gui/component/addressbook.c:730 #: calendar/gui/cal-search-bar.c:53 msgid "Category is" msgstr "" #. We attach subitems below -#: addressbook/gui/component/addressbook.c:779 +#: addressbook/gui/component/addressbook.c:731 #: calendar/gui/cal-search-bar.c:49 msgid "Any field contains" msgstr "" -#: addressbook/gui/component/addressbook.c:780 +#: addressbook/gui/component/addressbook.c:732 msgid "Advanced..." msgstr "" #. All, unmatched, separator -#: addressbook/gui/component/addressbook.c:1008 +#: addressbook/gui/component/addressbook.c:960 #: calendar/gui/cal-search-bar.c:382 msgid "Any Category" msgstr "" -#: addressbook/gui/component/addressbook.c:1090 +#: addressbook/gui/component/addressbook.c:1042 msgid "The URI that the Folder Browser will display" msgstr "" @@ -726,7 +733,7 @@ msgstr "" msgid "Addressbook Sources" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57 +#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58 #: mail/mail-config.glade.h:15 msgid "Always" msgstr "" @@ -810,8 +817,8 @@ msgstr "" msgid "Mappings" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59 -#: mail/mail-config.glade.h:77 +#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60 +#: mail/mail-config.glade.h:75 msgid "Never" msgstr "" @@ -861,8 +868,8 @@ msgstr "" #. No time range is set, so don't start a query #: addressbook/gui/component/ldap-config.glade.h:50 -#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701 -#: calendar/gui/e-week-view.c:1213 +#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709 +#: calendar/gui/e-week-view.c:1214 msgid "Searching" msgstr "" @@ -1044,15 +1051,15 @@ msgid "Using email address" msgstr "" #: addressbook/gui/component/ldap-config.glade.h:103 -#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138 +#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134 msgid "Whenever Possible" msgstr "" #: addressbook/gui/component/ldap-config.glade.h:104 #: addressbook/gui/contact-editor/contact-editor.glade.h:30 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4 -#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7 -#: mail/mail-config.glade.h:141 +#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14 +#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1 msgid "_Add" msgstr "" @@ -1092,12 +1099,12 @@ msgstr "" msgid "_Download limit:" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9 -#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36 +#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16 +#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25 #: ui/evolution-mail-messagedisplay.xml.h:6 -#: ui/evolution-message-composer.xml.h:47 -#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10 +#: ui/evolution-message-composer.xml.h:41 +#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10 #: ui/evolution-tasks.xml.h:17 msgid "_Edit" msgstr "" @@ -1200,10 +1207,10 @@ msgstr "" #. Fixme: Ditto #: addressbook/gui/component/select-names/e-select-names-popup.c:163 -#: addressbook/gui/component/select-names/e-select-names.c:980 -#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437 -#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552 -#: shell/e-shortcuts-view.c:180 +#: addressbook/gui/component/select-names/e-select-names.c:677 +#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462 +#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560 +#: shell/e-shortcuts-view.c:178 msgid "Remove" msgstr "" @@ -1232,30 +1239,12 @@ msgstr "" msgid "Unnamed Contact" msgstr "" -#: addressbook/gui/component/select-names/e-select-names.c:600 -msgid "Find contact in" -msgstr "" - -#: addressbook/gui/component/select-names/e-select-names.c:716 -msgid "" -"Evolution is unable to get the addressbook local storage.\n" -"This may have been caused by the evolution-addressbook component crashing.\n" -"To help us better understand and ultimately resolve this problem,\n" -"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n" -"detailed description of the circumstances under which this error\n" -"occurred. Thank you." -msgstr "" - -#: addressbook/gui/component/select-names/e-select-names.c:724 -msgid "" -"Evolution is unable to get the addressbook local storage.\n" -"Under normal circumstances, this should never happen.\n" -"You may need to exit and restart Evolution in order to\n" -"correct this problem." +#: addressbook/gui/component/select-names/e-select-names.c:511 +msgid "Select Contacts from Addressbook" msgstr "" -#: addressbook/gui/component/select-names/e-select-names.c:806 -msgid "Select Contacts from Addressbook" +#: addressbook/gui/component/select-names/e-select-names.c:544 +msgid "Find contact in" msgstr "" #: addressbook/gui/component/select-names/select-names.glade.h:1 @@ -1277,14 +1266,10 @@ msgid "" msgstr "" #: addressbook/gui/component/select-names/select-names.glade.h:6 -msgid "_Browse..." -msgstr "" - -#: addressbook/gui/component/select-names/select-names.glade.h:7 msgid "_Category:" msgstr "" -#: addressbook/gui/component/select-names/select-names.glade.h:8 +#: addressbook/gui/component/select-names/select-names.glade.h:7 msgid "_Folder:" msgstr "" @@ -1387,11 +1372,12 @@ msgstr "" #: addressbook/gui/contact-editor/contact-editor.glade.h:31 #: calendar/gui/dialogs/alarm-page.glade.h:9 #: calendar/gui/dialogs/meeting-page.c:673 -#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612 -#: filter/filter.glade.h:8 mail/folder-browser.c:1703 -#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27 -#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16 -#: ui/evolution.xml.h:41 +#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649 +#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15 +#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150 +#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32 +#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97 +#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45 msgid "_Delete" msgstr "" @@ -2621,7 +2607,7 @@ msgid "_Hide addresses when sending mail to this list" msgstr "" #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6 -#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10 +#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17 msgid "_Remove" msgstr "" @@ -2680,7 +2666,7 @@ msgid "" msgstr "" #: addressbook/gui/search/e-addressbook-search-dialog.c:145 -#: widgets/misc/e-filter-bar.c:231 +#: widgets/misc/e-filter-bar.c:152 msgid "Advanced Search" msgstr "" @@ -2707,21 +2693,21 @@ msgid "Error getting book view" msgstr "" #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140 -#: addressbook/gui/widgets/e-addressbook-util.c:90 +#: addressbook/gui/widgets/e-addressbook-util.c:91 #: addressbook/gui/widgets/e-minicard.c:475 msgid "Error modifying card" msgstr "" #: addressbook/gui/widgets/e-addressbook-util.c:35 -#: shell/evolution-shell-component.c:1079 +#: shell/evolution-shell-component.c:1090 msgid "Success" msgstr "" #: addressbook/gui/widgets/e-addressbook-util.c:36 #: camel/providers/imap/camel-imap-command.c:305 #: camel/providers/imap/camel-imap-command.c:393 -#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164 -#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118 +#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130 +#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129 msgid "Unknown error" msgstr "" @@ -2729,8 +2715,8 @@ msgstr "" msgid "Repository offline" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503 -#: shell/evolution-shell-component.c:1109 +#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504 +#: shell/evolution-shell-component.c:1120 msgid "Permission denied" msgstr "" @@ -2747,7 +2733,7 @@ msgid "Protocol not supported" msgstr "" #: addressbook/gui/widgets/e-addressbook-util.c:42 -#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197 +#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189 #: calendar/gui/dialogs/task-details-page.glade.h:3 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299 #: camel/camel-service.c:738 camel/camel-service.c:778 @@ -2768,46 +2754,50 @@ msgid "TLS not Available" msgstr "" #: addressbook/gui/widgets/e-addressbook-util.c:46 +msgid "Addressbook does not exist" +msgstr "" + +#: addressbook/gui/widgets/e-addressbook-util.c:47 msgid "Other error" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:62 +#: addressbook/gui/widgets/e-addressbook-util.c:63 #: calendar/gui/dialogs/save-comp.c:50 msgid "Do you want to save changes?" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:81 +#: addressbook/gui/widgets/e-addressbook-util.c:82 msgid "Error adding list" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:81 -#: addressbook/gui/widgets/e-addressbook-util.c:291 +#: addressbook/gui/widgets/e-addressbook-util.c:82 +#: addressbook/gui/widgets/e-addressbook-util.c:292 msgid "Error adding card" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:90 +#: addressbook/gui/widgets/e-addressbook-util.c:91 msgid "Error modifying list" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:100 +#: addressbook/gui/widgets/e-addressbook-util.c:101 msgid "Error removing list" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:100 -#: addressbook/gui/widgets/e-addressbook-util.c:249 +#: addressbook/gui/widgets/e-addressbook-util.c:101 +#: addressbook/gui/widgets/e-addressbook-util.c:250 #: addressbook/gui/widgets/e-addressbook-view.c:1624 msgid "Error removing card" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:207 +#: addressbook/gui/widgets/e-addressbook-util.c:208 msgid "Display Cards?" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:208 +#: addressbook/gui/widgets/e-addressbook-util.c:209 msgid "Display Cards" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:212 +#: addressbook/gui/widgets/e-addressbook-util.c:213 #, c-format msgid "" "You have requested that %d cards be cards. This will cause %d new windows to " @@ -2815,19 +2805,19 @@ msgid "" "displayed on your screen. Do you really want to display all of these cards?" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:347 +#: addressbook/gui/widgets/e-addressbook-util.c:348 msgid "Move card to" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:349 +#: addressbook/gui/widgets/e-addressbook-util.c:350 msgid "Copy card to" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:352 +#: addressbook/gui/widgets/e-addressbook-util.c:353 msgid "Move cards to" msgstr "" -#: addressbook/gui/widgets/e-addressbook-util.c:354 +#: addressbook/gui/widgets/e-addressbook-util.c:355 msgid "Copy cards to" msgstr "" @@ -2899,7 +2889,7 @@ msgstr "" #: addressbook/gui/widgets/e-addressbook-view.c:701 #: addressbook/gui/widgets/e-addressbook-view.c:890 #: addressbook/gui/widgets/e-addressbook-view.c:1826 -#: ui/evolution-addressbook.xml.h:21 +#: ui/evolution-addressbook.xml.h:19 msgid "Save as VCard" msgstr "" @@ -2932,7 +2922,7 @@ msgid "Pilot Settings..." msgstr "" #: addressbook/gui/widgets/e-addressbook-view.c:891 -#: ui/evolution-addressbook.xml.h:12 +#: ui/evolution-addressbook.xml.h:10 msgid "Forward Contact" msgstr "" @@ -2941,8 +2931,8 @@ msgid "Send Message to Contact" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.c:893 -#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8 -#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65 +#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8 +#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67 #: ui/my-evolution.xml.h:1 msgid "Print" msgstr "" @@ -2960,7 +2950,7 @@ msgid "Move to folder..." msgstr "" #: addressbook/gui/widgets/e-addressbook-view.c:903 -#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4 +#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4 msgid "Cut" msgstr "" @@ -2971,20 +2961,20 @@ msgid "Copy" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.c:905 -#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9 +#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9 msgid "Paste" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12 -#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411 -#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4 +#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11 +#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411 +#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4 #: ui/evolution-contact-editor.xml.h:2 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20 msgid "Delete" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.c:909 -#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453 +#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486 msgid "Current View" msgstr "" @@ -3140,7 +3130,7 @@ msgstr "" msgid "Number of columns:" msgstr "" -#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83 +#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80 msgid "Options" msgstr "" @@ -3230,26 +3220,26 @@ msgstr "" #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522 #: calendar/gui/dialogs/task-details-page.glade.h:6 -#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732 +#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745 msgid "High" msgstr "" #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524 -#: calendar/gui/calendar-model.c:1711 -#: calendar/gui/dialogs/task-details-page.glade.h:9 -#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731 +#: calendar/gui/calendar-model.c:1707 +#: calendar/gui/dialogs/task-details-page.glade.h:10 +#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744 msgid "Normal" msgstr "" #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526 #: calendar/gui/dialogs/task-details-page.glade.h:8 -#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730 +#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743 msgid "Low" msgstr "" #. An empty string is the same as 'None'. #: calendar/cal-util/cal-util.c:520 -#: calendar/gui/dialogs/task-details-page.glade.h:13 +#: calendar/gui/dialogs/task-details-page.glade.h:14 #: calendar/gui/e-calendar-table.c:421 msgid "Undefined" msgstr "" @@ -3369,11 +3359,11 @@ msgstr "" msgid "_Edit appointment" msgstr "" -#: calendar/gui/alarm-notify/alarm-queue.c:675 +#: calendar/gui/alarm-notify/alarm-queue.c:676 msgid "No description available." msgstr "" -#: calendar/gui/alarm-notify/alarm-queue.c:735 +#: calendar/gui/alarm-notify/alarm-queue.c:736 msgid "" "Evolution does not support calendar reminders with\n" "email notifications yet, but this reminder was\n" @@ -3381,13 +3371,13 @@ msgid "" "a normal reminder dialog box instead." msgstr "" -#: calendar/gui/alarm-notify/alarm-queue.c:753 -#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658 +#: calendar/gui/alarm-notify/alarm-queue.c:754 +#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869 #: widgets/misc/e-messagebox.c:159 msgid "Warning" msgstr "" -#: calendar/gui/alarm-notify/alarm-queue.c:758 +#: calendar/gui/alarm-notify/alarm-queue.c:759 #, c-format msgid "" "An Evolution Calendar reminder is about to trigger. This reminder is " @@ -3398,7 +3388,7 @@ msgid "" "Are you sure you want to run this program?" msgstr "" -#: calendar/gui/alarm-notify/alarm-queue.c:772 +#: calendar/gui/alarm-notify/alarm-queue.c:773 msgid "Do not ask me about this program again." msgstr "" @@ -3426,7 +3416,7 @@ msgstr "" msgid "Comment contains" msgstr "" -#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089 +#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105 msgid "Unmatched" msgstr "" @@ -3437,7 +3427,7 @@ msgstr "" #. strftime format %a = abbreviated weekday name, %d = day of month, #. %b = abbreviated month name. Don't use any other specifiers. #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288 -#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333 +#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333 msgid "%a %d %b" msgstr "" @@ -3459,17 +3449,17 @@ msgstr "%m/%d/%Y" msgid "%d %B" msgstr "" -#: calendar/gui/calendar-commands.c:800 +#: calendar/gui/calendar-commands.c:797 msgid "" "Could not create the calendar view. Please check your ORBit and OAF setup." msgstr "" -#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988 +#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977 #: calendar/gui/e-calendar-table.c:397 msgid "Private" msgstr "" -#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990 +#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979 #: calendar/gui/e-calendar-table.c:398 msgid "Confidential" msgstr "" @@ -3494,37 +3484,37 @@ msgstr "" msgid "W" msgstr "" -#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147 +#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139 #: calendar/gui/e-calendar-table.c:470 msgid "Free" msgstr "" #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471 #: calendar/gui/e-meeting-time-sel.c:438 -#: shell/evolution-shell-component.c:1103 +#: shell/evolution-shell-component.c:1114 msgid "Busy" msgstr "" -#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191 -#: calendar/gui/dialogs/task-details-page.glade.h:10 +#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183 +#: calendar/gui/dialogs/task-details-page.glade.h:11 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290 msgid "Not Started" msgstr "" -#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193 +#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185 #: calendar/gui/dialogs/task-details-page.glade.h:7 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293 msgid "In Progress" msgstr "" -#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195 +#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187 #: calendar/gui/dialogs/task-details-page.glade.h:4 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296 msgid "Completed" msgstr "" -#: calendar/gui/calendar-model.c:1052 +#: calendar/gui/calendar-model.c:1041 msgid "" "The geographical position must be entered in the format: \n" "\n" @@ -3532,56 +3522,55 @@ msgid "" msgstr "" #. An empty string is the same as 'None'. -#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309 -#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918 -#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210 -#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445 -#: mail/mail-accounts.c:454 mail/mail-accounts.c:509 -#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67 -#: widgets/e-timezone-dialog/e-timezone-dialog.c:202 +#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309 +#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002 +#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229 +#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453 +#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:204 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603 msgid "None" msgstr "" -#: calendar/gui/calendar-model.c:1713 +#: calendar/gui/calendar-model.c:1709 msgid "Recurring" msgstr "" -#: calendar/gui/calendar-model.c:1715 +#: calendar/gui/calendar-model.c:1711 msgid "Assigned" msgstr "" -#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302 +#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560 -#: calendar/gui/e-meeting-model.c:848 +#: calendar/gui/e-meeting-model.c:850 msgid "Yes" msgstr "" -#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314 -#: calendar/gui/e-meeting-model.c:849 +#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314 +#: calendar/gui/e-meeting-model.c:851 msgid "No" msgstr "" -#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1 +#: calendar/gui/calendar-view-factory.c:148 msgid "Day View" msgstr "" -#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4 +#: calendar/gui/calendar-view-factory.c:151 msgid "Work Week View" msgstr "" -#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3 +#: calendar/gui/calendar-view-factory.c:154 msgid "Week View" msgstr "" -#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2 +#: calendar/gui/calendar-view-factory.c:157 msgid "Month View" msgstr "" #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363 -#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3 -#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036 +#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3 +#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059 msgid "Calendar" msgstr "" @@ -3589,12 +3578,12 @@ msgstr "" msgid "Folder containing appointments and events" msgstr "" -#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741 +#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502 -#: calendar/importers/icalendar-importer.c:645 -#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250 -#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178 -#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1 +#: calendar/importers/icalendar-importer.c:703 +#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299 +#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182 +#: shell/e-shortcuts.c:1063 msgid "Tasks" msgstr "" @@ -3602,36 +3591,52 @@ msgstr "" msgid "Folder containing to-do items" msgstr "" -#: calendar/gui/component-factory.c:704 +#: calendar/gui/component-factory.c:708 +msgid "New appointment" +msgstr "" + +#: calendar/gui/component-factory.c:708 +msgid "_Appointment" +msgstr "" + +#: calendar/gui/component-factory.c:709 +msgid "Create a new appointment" +msgstr "" + +#: calendar/gui/component-factory.c:713 msgid "New meeting" msgstr "" -#: calendar/gui/component-factory.c:704 +#: calendar/gui/component-factory.c:713 msgid "_Meeting" msgstr "" -#: calendar/gui/component-factory.c:708 +#: calendar/gui/component-factory.c:714 +msgid "Create a new meeting request" +msgstr "" + +#: calendar/gui/component-factory.c:718 msgid "New task" msgstr "" -#: calendar/gui/component-factory.c:708 +#: calendar/gui/component-factory.c:718 msgid "_Task" msgstr "" -#: calendar/gui/component-factory.c:712 -msgid "New All Day Appointment" +#: calendar/gui/component-factory.c:719 +msgid "Create a new task" msgstr "" -#: calendar/gui/component-factory.c:712 -msgid "All _Day Appointment" +#: calendar/gui/component-factory.c:723 +msgid "New All Day Appointment" msgstr "" -#: calendar/gui/component-factory.c:716 -msgid "New appointment" +#: calendar/gui/component-factory.c:723 +msgid "All _Day Appointment" msgstr "" -#: calendar/gui/component-factory.c:716 -msgid "_Appointment" +#: calendar/gui/component-factory.c:724 +msgid "Create a new all-day appointment" msgstr "" #: calendar/gui/control-factory.c:123 @@ -3697,7 +3702,8 @@ msgstr "" msgid "With these arguments:" msgstr "" -#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83 +#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73 +#: filter/filter.glade.h:20 msgid "days" msgstr "" @@ -3705,11 +3711,13 @@ msgstr "" msgid "extra times every" msgstr "" -#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84 +#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72 +#: filter/filter.glade.h:21 msgid "hours" msgstr "" -#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85 +#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71 +#: filter/filter.glade.h:22 msgid "minutes" msgstr "" @@ -3837,7 +3845,7 @@ msgstr "" #: calendar/gui/dialogs/alarm-page.glade.h:7 #: calendar/gui/dialogs/recurrence-page.glade.h:8 -#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11 +#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11 msgid "Summary:" msgstr "" @@ -3866,7 +3874,7 @@ msgstr "" msgid "hour(s)" msgstr "" -#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188 +#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184 msgid "minute(s)" msgstr "" @@ -4040,7 +4048,7 @@ msgid "_Fri" msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40 -#: mail/mail-config.glade.h:161 +#: mail/mail-config.glade.h:157 msgid "_General" msgstr "" @@ -4080,19 +4088,33 @@ msgstr "" msgid "before every appointment" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:51 -msgid "The meeting status has changed. Send an updated version?" +#: calendar/gui/dialogs/cancel-comp.c:56 +msgid "" +"The event being deleted is a meeting, would you like to send a cancellation " +"notice?" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:57 +#: calendar/gui/dialogs/cancel-comp.c:59 msgid "Are you sure you want to cancel and delete this meeting?" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:62 +#: calendar/gui/dialogs/cancel-comp.c:65 +msgid "" +"The task being deleted is assigned, would you like to send a cancellation " +"notice?" +msgstr "" + +#: calendar/gui/dialogs/cancel-comp.c:68 msgid "Are you sure you want to cancel and delete this task?" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:67 +#: calendar/gui/dialogs/cancel-comp.c:74 +msgid "" +"The journal entry being deleted is published, would you like to send a " +"cancellation notice?" +msgstr "" + +#: calendar/gui/dialogs/cancel-comp.c:77 msgid "Are you sure you want to cancel and delete this journal entry?" msgstr "" @@ -4160,61 +4182,61 @@ msgstr "" msgid "Due " msgstr "" -#: calendar/gui/dialogs/comp-editor.c:342 +#: calendar/gui/dialogs/comp-editor.c:343 #, fuzzy msgid "Could not update invalid object" msgstr "Could not initialise Bonobo" -#: calendar/gui/dialogs/comp-editor.c:345 +#: calendar/gui/dialogs/comp-editor.c:346 msgid "Object not found, not updated" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:348 +#: calendar/gui/dialogs/comp-editor.c:349 msgid "You don't have permissions to update this object" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:351 +#: calendar/gui/dialogs/comp-editor.c:352 #, fuzzy msgid "Could not update object" msgstr "Could not initialise Bonobo" -#: calendar/gui/dialogs/comp-editor.c:797 +#: calendar/gui/dialogs/comp-editor.c:798 msgid "Edit Appointment" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:802 +#: calendar/gui/dialogs/comp-editor.c:803 #, c-format msgid "Appointment - %s" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:805 +#: calendar/gui/dialogs/comp-editor.c:806 #, c-format msgid "Task - %s" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:808 +#: calendar/gui/dialogs/comp-editor.c:809 #, c-format msgid "Journal entry - %s" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:822 +#: calendar/gui/dialogs/comp-editor.c:823 msgid "No summary" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:1203 -#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818 -#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017 +#: calendar/gui/dialogs/comp-editor.c:1213 +#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862 +#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148 msgid "Save as..." msgstr "" -#: calendar/gui/dialogs/comp-editor.c:1299 -#: calendar/gui/dialogs/comp-editor.c:1323 -#: calendar/gui/dialogs/comp-editor.c:1347 +#: calendar/gui/dialogs/comp-editor.c:1314 +#: calendar/gui/dialogs/comp-editor.c:1338 +#: calendar/gui/dialogs/comp-editor.c:1362 msgid "" "Changes made to this item may be discarded if an update arrives via email" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:1374 +#: calendar/gui/dialogs/comp-editor.c:1389 msgid "Unable to obtain current version!" msgstr "" @@ -4413,7 +4435,7 @@ msgid "Member" msgstr "" #: calendar/gui/dialogs/meeting-page.etspec.h:8 -#: calendar/gui/e-itip-control.c:1003 +#: calendar/gui/e-itip-control.c:1010 #: calendar/gui/e-meeting-time-sel.etspec.h:8 msgid "RSVP" msgstr "" @@ -4425,7 +4447,7 @@ msgstr "" #: calendar/gui/dialogs/meeting-page.etspec.h:10 #: calendar/gui/e-calendar-table.etspec.h:15 -#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54 +#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58 #: mail/message-list.etspec.h:12 msgid "Status" msgstr "" @@ -4506,7 +4528,7 @@ msgstr "" msgid "first" msgstr "" -#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86 +#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70 msgid "second" msgstr "" @@ -4527,7 +4549,7 @@ msgstr "" msgid "Other Date" msgstr "_Other Organiser" -#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83 +#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73 msgid "day" msgstr "" @@ -4625,20 +4647,26 @@ msgstr "" msgid "Date Completed:" msgstr "" -#: calendar/gui/dialogs/task-details-page.glade.h:11 -msgid "Progress" +#: calendar/gui/dialogs/task-details-page.glade.h:9 +#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343 +#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863 +msgid "Needs Action" msgstr "" #: calendar/gui/dialogs/task-details-page.glade.h:12 -#: my-evolution/e-summary-preferences.c:887 +msgid "Progress" +msgstr "" + +#: calendar/gui/dialogs/task-details-page.glade.h:13 +#: my-evolution/e-summary-preferences.c:883 msgid "URL:" msgstr "" -#: calendar/gui/dialogs/task-details-page.glade.h:14 +#: calendar/gui/dialogs/task-details-page.glade.h:15 msgid "_Priority:" msgstr "" -#: calendar/gui/dialogs/task-details-page.glade.h:15 +#: calendar/gui/dialogs/task-details-page.glade.h:16 msgid "_Status:" msgstr "" @@ -4652,7 +4680,7 @@ msgstr "" msgid "Assignment" msgstr "" -#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934 +#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941 #: calendar/gui/e-itip-control.glade.h:6 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43 msgid "Description:" @@ -4721,76 +4749,76 @@ msgstr "" msgid "100%" msgstr "" -#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750 -#: calendar/gui/e-week-view.c:1853 +#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763 +#: calendar/gui/e-week-view.c:1854 msgid "Deleting selected objects" msgstr "" -#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594 -#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676 -#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39 +#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631 +#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678 +#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36 msgid "_Open" msgstr "" -#: calendar/gui/e-calendar-table.c:985 +#: calendar/gui/e-calendar-table.c:988 msgid "_Save as..." msgstr "" -#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596 -#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473 -#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30 -#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107 +#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633 +#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506 +#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30 +#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6 msgid "_Print..." msgstr "" -#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601 -#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1 +#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638 +#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1 msgid "C_ut" msgstr "" -#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602 -#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34 +#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639 +#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24 #: ui/evolution-tasks.xml.h:15 msgid "_Copy" msgstr "" -#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565 -#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449 -#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40 +#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602 +#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482 +#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29 #: ui/evolution-tasks.xml.h:19 msgid "_Paste" msgstr "" -#: calendar/gui/e-calendar-table.c:996 +#: calendar/gui/e-calendar-table.c:999 msgid "_Assign Task" msgstr "" -#: calendar/gui/e-calendar-table.c:997 +#: calendar/gui/e-calendar-table.c:1000 msgid "_Forward as iCalendar" msgstr "" -#: calendar/gui/e-calendar-table.c:998 +#: calendar/gui/e-calendar-table.c:1001 msgid "_Mark as Complete" msgstr "" -#: calendar/gui/e-calendar-table.c:999 +#: calendar/gui/e-calendar-table.c:1002 msgid "_Mark Selected Tasks as Complete" msgstr "" -#: calendar/gui/e-calendar-table.c:1004 +#: calendar/gui/e-calendar-table.c:1007 msgid "_Delete Selected Tasks" msgstr "" -#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418 -#: calendar/gui/e-week-view.c:4194 +#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502 +#: calendar/gui/e-week-view.c:4255 msgid "Updating objects" msgstr "" -#: calendar/gui/e-calendar-table.c:1354 +#: calendar/gui/e-calendar-table.c:1357 #: calendar/gui/e-calendar-table.etspec.h:6 msgid "Click to add a task" msgstr "" @@ -4799,8 +4827,8 @@ msgstr "" msgid "Alarms" msgstr "" -#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943 -#: camel/camel-filter-driver.c:1051 +#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992 +#: camel/camel-filter-driver.c:1100 msgid "Complete" msgstr "" @@ -4828,11 +4856,9 @@ msgstr "" msgid "Start Date" msgstr "" -#. FIXME: Inbox shortcut should point to something else for -#. people who won't care about using /Local Folders/Inbox #: calendar/gui/e-calendar-table.etspec.h:16 -#: my-evolution/component-factory.c:51 shell/e-shell.c:774 -#: shell/e-shortcuts.c:1030 +#: my-evolution/component-factory.c:51 shell/e-shell.c:740 +#: shell/e-shortcuts.c:1051 msgid "Summary" msgstr "" @@ -4871,105 +4897,104 @@ msgstr "" #. strftime format %A = full weekday name, %d = day of month, #. %B = full month name. Don't use any other specifiers. -#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413 +#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507 msgid "%A %d %B" msgstr "" #. strftime format %d = day of month, %b = abbreviated month name. #. Don't use any other specifiers. -#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440 +#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448 #: calendar/gui/e-week-view-main-item.c:347 msgid "%d %b" msgstr "" #. String to use in 12-hour time format for times in the morning. -#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375 +#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376 #: calendar/gui/print.c:791 msgid "am" msgstr "" #. String to use in 12-hour time format for times in the afternoon. -#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378 +#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379 #: calendar/gui/print.c:793 msgid "pm" msgstr "" -#: calendar/gui/e-day-view.c:3549 +#: calendar/gui/e-day-view.c:3586 msgid "New _Appointment" msgstr "" -#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439 +#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472 msgid "New All Day _Event" msgstr "" -#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440 +#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473 msgid "New Meeting" msgstr "" -#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441 +#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474 msgid "New Task" msgstr "" -#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11 +#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11 msgid "Print..." msgstr "" -#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455 +#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488 #: ui/evolution-calendar.xml.h:10 msgid "Go to _Today" msgstr "" -#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456 +#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489 msgid "_Go to Date..." msgstr "" -#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460 +#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493 #: ui/evolution-calendar.xml.h:31 msgid "_Publish Free/Busy Information" msgstr "" -#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464 -#: ui/evolution.xml.h:39 +#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497 msgid "_Configure..." msgstr "" -#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465 +#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498 msgid "_Configure Pilot..." msgstr "" -#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472 -#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110 +#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505 +#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112 msgid "_Save As..." msgstr "" -#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484 +#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517 msgid "_Schedule Meeting..." msgstr "" -#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485 +#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518 msgid "_Forward as iCalendar..." msgstr "" -#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490 +#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523 msgid "Make this Occurrence _Movable" msgstr "" -#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491 +#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524 msgid "Delete this _Occurrence" msgstr "" -#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492 +#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525 msgid "Delete _All Occurrences" msgstr "" -#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841 -#: shell/e-shell-view-menu.c:638 +#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882 +#: shell/e-shell-view-menu.c:639 msgid "The GNOME Pilot tools do not appear to be installed on this system." msgstr "" -#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847 -#: shell/e-shell-view-menu.c:646 +#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888 +#: shell/e-shell-view-menu.c:647 #, c-format msgid "Error executing %s." msgstr "" @@ -5010,7 +5035,7 @@ msgstr "" msgid "Task Due: <b>" msgstr "" -#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821 +#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822 msgid "iCalendar Information" msgstr "" @@ -5019,328 +5044,333 @@ msgstr "" msgid "iCalendar Error" msgstr "" -#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868 +#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869 msgid "An unknown person" msgstr "" #. Describe what the user can do -#: calendar/gui/e-itip-control.c:875 +#: calendar/gui/e-itip-control.c:876 msgid "" "<br> Please review the following information, and then select an action from " "the menu below." msgstr "" -#: calendar/gui/e-itip-control.c:891 +#: calendar/gui/e-itip-control.c:892 msgid "<i>None</i>" msgstr "" -#: calendar/gui/e-itip-control.c:903 +#: calendar/gui/e-itip-control.c:898 +#, fuzzy +msgid "Location:" +msgstr "Organisation" + +#: calendar/gui/e-itip-control.c:910 msgid "Status:" msgstr "" -#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322 -#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862 -#: calendar/gui/itip-utils.c:382 +#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322 +#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864 +#: calendar/gui/itip-utils.c:490 msgid "Accepted" msgstr "" -#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385 +#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493 msgid "Tentatively Accepted" msgstr "" -#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324 -#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863 -#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414 +#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324 +#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865 +#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522 msgid "Declined" msgstr "" -#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150 -#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258 -#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358 -#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836 +#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131 +#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293 +#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822 +#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629 #: camel/providers/smtp/camel-smtp-transport.c:172 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326 -#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58 +#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58 #: widgets/misc/e-charset-picker.c:444 msgid "Unknown" msgstr "" -#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999 -#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038 -#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064 +#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006 +#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045 +#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071 msgid "Choose an action:" msgstr "" -#: calendar/gui/e-itip-control.c:972 +#: calendar/gui/e-itip-control.c:979 msgid "Update" msgstr "" -#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004 -#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040 -#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066 -#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258 +#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011 +#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047 +#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073 +#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258 msgid "OK" msgstr "" -#: calendar/gui/e-itip-control.c:1000 +#: calendar/gui/e-itip-control.c:1007 msgid "Accept" msgstr "" -#: calendar/gui/e-itip-control.c:1001 +#: calendar/gui/e-itip-control.c:1008 msgid "Tentatively accept" msgstr "" -#: calendar/gui/e-itip-control.c:1002 +#: calendar/gui/e-itip-control.c:1009 msgid "Decline" msgstr "" -#: calendar/gui/e-itip-control.c:1026 +#: calendar/gui/e-itip-control.c:1033 msgid "Send Free/Busy Information" msgstr "" -#: calendar/gui/e-itip-control.c:1039 +#: calendar/gui/e-itip-control.c:1046 msgid "Update respondent status" msgstr "" -#: calendar/gui/e-itip-control.c:1052 +#: calendar/gui/e-itip-control.c:1059 msgid "Send Latest Information" msgstr "" -#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402 -#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1 +#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510 +#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1 msgid "Cancel" msgstr "" -#: calendar/gui/e-itip-control.c:1117 +#: calendar/gui/e-itip-control.c:1150 #, c-format msgid "<b>%s</b> has published meeting information." msgstr "" -#: calendar/gui/e-itip-control.c:1118 +#: calendar/gui/e-itip-control.c:1151 msgid "Meeting Information" msgstr "" -#: calendar/gui/e-itip-control.c:1122 +#: calendar/gui/e-itip-control.c:1155 #, c-format msgid "<b>%s</b> requests your presence at a meeting." msgstr "" -#: calendar/gui/e-itip-control.c:1123 +#: calendar/gui/e-itip-control.c:1156 msgid "Meeting Proposal" msgstr "" -#: calendar/gui/e-itip-control.c:1127 +#: calendar/gui/e-itip-control.c:1160 #, c-format msgid "<b>%s</b> wishes to add to an existing meeting." msgstr "" -#: calendar/gui/e-itip-control.c:1128 +#: calendar/gui/e-itip-control.c:1161 msgid "Meeting Update" msgstr "" -#: calendar/gui/e-itip-control.c:1132 +#: calendar/gui/e-itip-control.c:1165 #, c-format msgid "<b>%s</b> wishes to receive the latest meeting information." msgstr "" -#: calendar/gui/e-itip-control.c:1133 +#: calendar/gui/e-itip-control.c:1166 msgid "Meeting Update Request" msgstr "" -#: calendar/gui/e-itip-control.c:1156 +#: calendar/gui/e-itip-control.c:1173 #, c-format msgid "<b>%s</b> has replied to a meeting request." msgstr "" -#: calendar/gui/e-itip-control.c:1157 +#: calendar/gui/e-itip-control.c:1174 msgid "Meeting Reply" msgstr "" -#: calendar/gui/e-itip-control.c:1161 +#: calendar/gui/e-itip-control.c:1181 #, c-format msgid "<b>%s</b> has cancelled a meeting." msgstr "" -#: calendar/gui/e-itip-control.c:1162 +#: calendar/gui/e-itip-control.c:1182 msgid "Meeting Cancellation" msgstr "" -#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239 -#: calendar/gui/e-itip-control.c:1274 +#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250 +#: calendar/gui/e-itip-control.c:1285 #, c-format msgid "<b>%s</b> has sent an unintelligible message." msgstr "" -#: calendar/gui/e-itip-control.c:1167 +#: calendar/gui/e-itip-control.c:1190 msgid "Bad Meeting Message" msgstr "" -#: calendar/gui/e-itip-control.c:1189 +#: calendar/gui/e-itip-control.c:1211 #, c-format msgid "<b>%s</b> has published task information." msgstr "" -#: calendar/gui/e-itip-control.c:1190 +#: calendar/gui/e-itip-control.c:1212 msgid "Task Information" msgstr "" -#: calendar/gui/e-itip-control.c:1194 +#: calendar/gui/e-itip-control.c:1216 #, c-format msgid "<b>%s</b> requests you perform a task." msgstr "" -#: calendar/gui/e-itip-control.c:1195 +#: calendar/gui/e-itip-control.c:1217 msgid "Task Proposal" msgstr "" -#: calendar/gui/e-itip-control.c:1199 +#: calendar/gui/e-itip-control.c:1221 #, c-format msgid "<b>%s</b> wishes to add to an existing task." msgstr "" -#: calendar/gui/e-itip-control.c:1200 +#: calendar/gui/e-itip-control.c:1222 msgid "Task Update" msgstr "" -#: calendar/gui/e-itip-control.c:1204 +#: calendar/gui/e-itip-control.c:1226 #, c-format msgid "<b>%s</b> wishes to receive the latest task information." msgstr "" -#: calendar/gui/e-itip-control.c:1205 +#: calendar/gui/e-itip-control.c:1227 msgid "Task Update Request" msgstr "" -#: calendar/gui/e-itip-control.c:1229 +#: calendar/gui/e-itip-control.c:1234 #, c-format msgid "<b>%s</b> has replied to a task assignment." msgstr "" -#: calendar/gui/e-itip-control.c:1230 +#: calendar/gui/e-itip-control.c:1235 msgid "Task Reply" msgstr "" -#: calendar/gui/e-itip-control.c:1234 +#: calendar/gui/e-itip-control.c:1242 #, c-format msgid "<b>%s</b> has cancelled a task." msgstr "" -#: calendar/gui/e-itip-control.c:1235 +#: calendar/gui/e-itip-control.c:1243 msgid "Task Cancellation" msgstr "" -#: calendar/gui/e-itip-control.c:1240 +#: calendar/gui/e-itip-control.c:1251 msgid "Bad Task Message" msgstr "" -#: calendar/gui/e-itip-control.c:1259 +#: calendar/gui/e-itip-control.c:1270 #, c-format msgid "<b>%s</b> has published free/busy information." msgstr "" -#: calendar/gui/e-itip-control.c:1260 +#: calendar/gui/e-itip-control.c:1271 msgid "Free/Busy Information" msgstr "" -#: calendar/gui/e-itip-control.c:1264 +#: calendar/gui/e-itip-control.c:1275 #, c-format msgid "<b>%s</b> requests your free/busy information." msgstr "" -#: calendar/gui/e-itip-control.c:1265 +#: calendar/gui/e-itip-control.c:1276 msgid "Free/Busy Request" msgstr "" -#: calendar/gui/e-itip-control.c:1269 +#: calendar/gui/e-itip-control.c:1280 #, c-format msgid "<b>%s</b> has replied to a free/busy request." msgstr "" -#: calendar/gui/e-itip-control.c:1270 +#: calendar/gui/e-itip-control.c:1281 msgid "Free/Busy Reply" msgstr "" -#: calendar/gui/e-itip-control.c:1275 +#: calendar/gui/e-itip-control.c:1286 msgid "Bad Free/Busy Message" msgstr "" -#: calendar/gui/e-itip-control.c:1354 +#: calendar/gui/e-itip-control.c:1365 msgid "The message does not appear to be properly formed" msgstr "" -#: calendar/gui/e-itip-control.c:1373 +#: calendar/gui/e-itip-control.c:1384 msgid "The message contains only unsupported requests." msgstr "" -#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407 +#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418 msgid "The attachment does not contain a valid calendar message" msgstr "" -#: calendar/gui/e-itip-control.c:1432 +#: calendar/gui/e-itip-control.c:1443 msgid "The attachment has no viewable calendar items" msgstr "" -#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659 +#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670 msgid "Object is invalid and cannot be updated\n" msgstr "" -#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662 +#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673 msgid "There was an error on the CORBA system\n" msgstr "" -#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665 +#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676 msgid "Object could not be found\n" msgstr "" -#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668 +#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679 msgid "You don't have permissions to update the calendar\n" msgstr "" -#: calendar/gui/e-itip-control.c:1579 +#: calendar/gui/e-itip-control.c:1590 msgid "Update complete\n" msgstr "" -#: calendar/gui/e-itip-control.c:1582 +#: calendar/gui/e-itip-control.c:1593 msgid "Calendar file could not be updated!\n" msgstr "" -#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677 +#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688 msgid "Attendee status can not be updated because the item no longer exists" msgstr "" -#: calendar/gui/e-itip-control.c:1632 +#: calendar/gui/e-itip-control.c:1643 msgid "This response is not from a current attendee. Add as an attendee?" msgstr "" -#: calendar/gui/e-itip-control.c:1644 +#: calendar/gui/e-itip-control.c:1655 msgid "Attendee status could not be updated because of an invalid status!\n" msgstr "" -#: calendar/gui/e-itip-control.c:1671 +#: calendar/gui/e-itip-control.c:1682 msgid "Attendee status updated\n" msgstr "" -#: calendar/gui/e-itip-control.c:1674 +#: calendar/gui/e-itip-control.c:1685 msgid "Attendee status could not be updated!\n" msgstr "" -#: calendar/gui/e-itip-control.c:1709 +#: calendar/gui/e-itip-control.c:1720 msgid "Removal Complete" msgstr "" -#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789 +#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800 msgid "Item sent!\n" msgstr "" -#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793 +#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804 msgid "The item could not be sent!\n" msgstr "" -#: calendar/gui/e-itip-control.c:1896 +#: calendar/gui/e-itip-control.c:1907 msgid "Select Calendar Folder" msgstr "" -#: calendar/gui/e-itip-control.c:1903 +#: calendar/gui/e-itip-control.c:1914 msgid "Select Tasks Folder" msgstr "" @@ -5385,7 +5415,7 @@ msgstr "" msgid "Chair Persons" msgstr "" -#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748 +#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750 msgid "Required Participants" msgstr "" @@ -5398,57 +5428,52 @@ msgid "Non-Participants" msgstr "" #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250 -#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816 +#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818 msgid "Individual" msgstr "" #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252 -#: calendar/gui/e-meeting-model.c:817 +#: calendar/gui/e-meeting-model.c:819 msgid "Group" msgstr "" #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254 -#: calendar/gui/e-meeting-model.c:818 +#: calendar/gui/e-meeting-model.c:820 msgid "Resource" msgstr "" #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256 -#: calendar/gui/e-meeting-model.c:819 +#: calendar/gui/e-meeting-model.c:821 msgid "Room" msgstr "" #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285 -#: calendar/gui/e-meeting-model.c:832 +#: calendar/gui/e-meeting-model.c:834 msgid "Chair" msgstr "" #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287 -#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833 +#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835 msgid "Required Participant" msgstr "" #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289 -#: calendar/gui/e-meeting-model.c:834 +#: calendar/gui/e-meeting-model.c:836 msgid "Optional Participant" msgstr "" #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291 -#: calendar/gui/e-meeting-model.c:835 +#: calendar/gui/e-meeting-model.c:837 msgid "Non-Participant" msgstr "" -#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343 -#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861 -msgid "Needs Action" -msgstr "" - #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349 -#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437 +#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437 msgid "Tentative" msgstr "" #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351 -#: calendar/gui/e-meeting-model.c:865 +#: calendar/gui/e-meeting-model.c:867 msgid "Delegated" msgstr "" @@ -5538,46 +5563,43 @@ msgstr "" msgid "Meeting _end time:" msgstr "" -#: calendar/gui/e-tasks.c:362 +#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941 +#: calendar/gui/gnome-cal.c:1952 #, c-format msgid "Opening tasks at %s" msgstr "" -#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196 +#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196 #, c-format msgid "Could not load the tasks in `%s'" msgstr "" -#: calendar/gui/e-tasks.c:404 +#: calendar/gui/e-tasks.c:390 #, c-format msgid "The method required to load `%s' is not supported" msgstr "" -#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544 +#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544 #, fuzzy, c-format msgid "You don't have permission to open the folder in `%s'" msgstr "Could not close temporary folder: %s" -#: calendar/gui/e-tasks.c:558 +#: calendar/gui/e-tasks.c:522 msgid "Completing tasks..." msgstr "" -#: calendar/gui/e-tasks.c:581 +#: calendar/gui/e-tasks.c:545 msgid "Deleting selected objects..." msgstr "" -#: calendar/gui/e-tasks.c:674 +#: calendar/gui/e-tasks.c:638 msgid "Expunging" msgstr "" -#: calendar/gui/e-week-view.c:3438 +#: calendar/gui/e-week-view.c:3471 msgid "New _Appointment..." msgstr "" -#: calendar/gui/e-week-view.c:3489 -msgid "_Delete this Appointment" -msgstr "" - #: calendar/gui/gnome-cal.c:1522 #, c-format msgid "Could not open the folder in `%s'" @@ -5588,11 +5610,16 @@ msgstr "" msgid "The method required to open `%s' is not supported" msgstr "" -#: calendar/gui/gnome-cal.c:1918 +#: calendar/gui/gnome-cal.c:1924 #, c-format msgid "Opening calendar at %s" msgstr "" +#: calendar/gui/gnome-cal.c:1963 +#, fuzzy +msgid "Opening default tasks folder" +msgstr "Synchronising folder" + #: calendar/gui/goto-dialog.glade.h:1 msgid "April" msgstr "" @@ -5649,51 +5676,56 @@ msgstr "" msgid "September" msgstr "" -#: calendar/gui/itip-utils.c:280 +#: calendar/gui/itip-utils.c:383 msgid "At least one attendee is necessary" msgstr "" -#: calendar/gui/itip-utils.c:311 +#: calendar/gui/itip-utils.c:419 msgid "An organizer must be set." msgstr "" -#: calendar/gui/itip-utils.c:354 +#: calendar/gui/itip-utils.c:462 msgid "Event information" msgstr "" -#: calendar/gui/itip-utils.c:356 +#: calendar/gui/itip-utils.c:464 msgid "Task information" msgstr "" -#: calendar/gui/itip-utils.c:358 +#: calendar/gui/itip-utils.c:466 msgid "Journal information" msgstr "" -#: calendar/gui/itip-utils.c:360 +#: calendar/gui/itip-utils.c:468 msgid "Free/Busy information" msgstr "" -#: calendar/gui/itip-utils.c:362 +#: calendar/gui/itip-utils.c:470 msgid "Calendar information" msgstr "" -#: calendar/gui/itip-utils.c:398 +#: calendar/gui/itip-utils.c:506 msgid "Updated" msgstr "" -#: calendar/gui/itip-utils.c:406 +#: calendar/gui/itip-utils.c:514 msgid "Refresh" msgstr "" -#: calendar/gui/itip-utils.c:410 +#: calendar/gui/itip-utils.c:518 msgid "Counter-proposal" msgstr "" -#: calendar/gui/itip-utils.c:660 +#: calendar/gui/itip-utils.c:697 msgid "You must be an attendee of the event." msgstr "" -#: calendar/gui/main.c:96 +#: calendar/gui/main.c:70 +#, fuzzy +msgid "Could not activate Bonobo" +msgstr "Could not initialise Bonobo" + +#: calendar/gui/main.c:99 msgid "Could not create the component editor factory" msgstr "" @@ -5920,9 +5952,8 @@ msgid "Print Calendar" msgstr "" #: calendar/gui/print.c:2521 calendar/gui/print.c:2613 -#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945 -#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19 -#: ui/evolution-mail-message.xml.h:66 +#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157 +#: my-evolution/e-summary.c:619 msgid "Print Preview" msgstr "" @@ -5951,8 +5982,8 @@ msgid "" "Really erase these tasks?" msgstr "" -#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430 -#: mail/mail-callbacks.c:2672 +#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641 +#: mail/mail-callbacks.c:2883 msgid "Do not ask me again." msgstr "" @@ -6004,125 +6035,137 @@ msgstr "" msgid "Imports vCalendar files into Evolution" msgstr "" -#: calendar/importers/icalendar-importer.c:424 +#: calendar/importers/icalendar-importer.c:168 +#, fuzzy, c-format +msgid "Can't get storage list from registry: %s" +msgstr "" +"Can not get message: %s from folder %s\n" +" %s" + +#: calendar/importers/icalendar-importer.c:180 +#, c-format +msgid "Can't call getFolderAtPath on storage: %s" +msgstr "" + +#: calendar/importers/icalendar-importer.c:482 msgid "Reminder!!" msgstr "" -#: calendar/importers/icalendar-importer.c:638 +#: calendar/importers/icalendar-importer.c:696 msgid "Calendar Events" msgstr "" -#: calendar/importers/icalendar-importer.c:663 +#: calendar/importers/icalendar-importer.c:721 msgid "" "Evolution has found Gnome Calendar files.\n" "Would you like to import them into Evolution?" msgstr "" -#: calendar/importers/icalendar-importer.c:670 +#: calendar/importers/icalendar-importer.c:728 msgid "Gnome Calendar" msgstr "" -#: calendar/pcs/query.c:248 +#: calendar/pcs/query.c:255 msgid "time-now expects 0 arguments" msgstr "" -#: calendar/pcs/query.c:272 +#: calendar/pcs/query.c:279 msgid "make-time expects 1 argument" msgstr "" -#: calendar/pcs/query.c:277 +#: calendar/pcs/query.c:284 msgid "make-time expects argument 1 to be a string" msgstr "" -#: calendar/pcs/query.c:285 +#: calendar/pcs/query.c:292 msgid "make-time argument 1 must be an ISO 8601 date/time string" msgstr "" -#: calendar/pcs/query.c:314 +#: calendar/pcs/query.c:321 msgid "time-add-day expects 2 arguments" msgstr "" -#: calendar/pcs/query.c:319 +#: calendar/pcs/query.c:326 msgid "time-add-day expects argument 1 to be a time_t" msgstr "" -#: calendar/pcs/query.c:326 +#: calendar/pcs/query.c:333 msgid "time-add-day expects argument 2 to be an integer" msgstr "" -#: calendar/pcs/query.c:353 +#: calendar/pcs/query.c:360 msgid "time-day-begin expects 1 argument" msgstr "" -#: calendar/pcs/query.c:358 +#: calendar/pcs/query.c:365 msgid "time-day-begin expects argument 1 to be a time_t" msgstr "" -#: calendar/pcs/query.c:385 +#: calendar/pcs/query.c:392 msgid "time-day-end expects 1 argument" msgstr "" -#: calendar/pcs/query.c:390 +#: calendar/pcs/query.c:397 msgid "time-day-end expects argument 1 to be a time_t" msgstr "" -#: calendar/pcs/query.c:426 +#: calendar/pcs/query.c:433 msgid "get-vtype expects 0 arguments" msgstr "" -#: calendar/pcs/query.c:522 +#: calendar/pcs/query.c:529 msgid "occur-in-time-range? expects 2 arguments" msgstr "" -#: calendar/pcs/query.c:527 +#: calendar/pcs/query.c:534 msgid "occur-in-time-range? expects argument 1 to be a time_t" msgstr "" -#: calendar/pcs/query.c:534 +#: calendar/pcs/query.c:541 msgid "occur-in-time-range? expects argument 2 to be a time_t" msgstr "" -#: calendar/pcs/query.c:664 +#: calendar/pcs/query.c:671 msgid "contains? expects 2 arguments" msgstr "" -#: calendar/pcs/query.c:669 +#: calendar/pcs/query.c:676 msgid "contains? expects argument 1 to be a string" msgstr "" -#: calendar/pcs/query.c:676 +#: calendar/pcs/query.c:683 msgid "contains? expects argument 2 to be a string" msgstr "" -#: calendar/pcs/query.c:693 +#: calendar/pcs/query.c:700 msgid "" "contains? expects argument 1 to be one of \"any\", \"summary\", \"description" "\"" msgstr "" -#: calendar/pcs/query.c:735 +#: calendar/pcs/query.c:742 msgid "has-categories? expects at least 1 argument" msgstr "" -#: calendar/pcs/query.c:747 +#: calendar/pcs/query.c:754 msgid "" "has-categories? expects all arguments to be strings or one and only one " "argument to be a boolean false (#f)" msgstr "" -#: calendar/pcs/query.c:835 +#: calendar/pcs/query.c:842 msgid "is-completed? expects 0 arguments" msgstr "" -#: calendar/pcs/query.c:880 +#: calendar/pcs/query.c:887 msgid "completed-before? expects 1 argument" msgstr "" -#: calendar/pcs/query.c:885 +#: calendar/pcs/query.c:892 msgid "completed-before? expects argument 1 to be a time_t" msgstr "" -#: calendar/pcs/query.c:1160 +#: calendar/pcs/query.c:1167 msgid "Evaluation of the search expression did not yield a boolean value" msgstr "" @@ -7710,71 +7753,79 @@ msgstr "Synchronising \"%s\"" msgid "You must be working online to complete this operation" msgstr "" -#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719 +#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768 msgid "Syncing folders" msgstr "Synchronising folders" -#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194 +#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243 #, c-format msgid "Error parsing filter: %s: %s" msgstr "" -#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200 +#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249 #, c-format msgid "Error executing filter: %s: %s" msgstr "" -#: camel/camel-filter-driver.c:884 +#: camel/camel-filter-driver.c:933 msgid "Unable to open spool folder" msgstr "" -#: camel/camel-filter-driver.c:893 +#: camel/camel-filter-driver.c:942 msgid "Unable to process spool folder" msgstr "" -#: camel/camel-filter-driver.c:908 +#: camel/camel-filter-driver.c:957 #, c-format msgid "Getting message %d (%d%%)" msgstr "" -#: camel/camel-filter-driver.c:912 +#: camel/camel-filter-driver.c:961 msgid "Cannot open message" msgstr "Can not open message" -#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925 +#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974 #, c-format msgid "Failed on message %d" msgstr "" -#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046 +#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095 msgid "Syncing folder" msgstr "Synchronising folder" -#: camel/camel-filter-driver.c:1013 +#: camel/camel-filter-driver.c:1062 #, c-format msgid "Getting message %d of %d" msgstr "" -#: camel/camel-filter-driver.c:1028 +#: camel/camel-filter-driver.c:1077 #, c-format msgid "Failed at message %d of %d" msgstr "" -#: camel/camel-filter-search.c:140 +#: camel/camel-filter-search.c:136 msgid "Failed to retrieve message" msgstr "" -#: camel/camel-filter-search.c:538 +#: camel/camel-filter-search.c:384 +msgid "Invalid arguments to (system-flag)" +msgstr "" + +#: camel/camel-filter-search.c:399 +msgid "Invalid arguments to (user-tag)" +msgstr "" + +#: camel/camel-filter-search.c:511 #, fuzzy, c-format msgid "Failed to create pipe to '%s': %s" msgstr "Could not close temporary folder: %s" -#: camel/camel-filter-search.c:577 +#: camel/camel-filter-search.c:547 #, fuzzy, c-format msgid "Failed to create create child process '%s': %s" msgstr "Could not close temporary folder: %s" -#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687 +#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657 #, c-format msgid "Error executing filter search: %s: %s" msgstr "" @@ -7828,7 +7879,7 @@ msgstr "" msgid "Copying messages" msgstr "Can not open message" -#: camel/camel-gpg-context.c:696 +#: camel/camel-gpg-context.c:705 #, c-format msgid "" "Unexpected GnuPG status message encountered:\n" @@ -7836,46 +7887,46 @@ msgid "" "%s" msgstr "" -#: camel/camel-gpg-context.c:710 +#: camel/camel-gpg-context.c:719 msgid "Failed to parse gpg userid hint." msgstr "" -#: camel/camel-gpg-context.c:733 +#: camel/camel-gpg-context.c:742 msgid "Failed to parse gpg passphrase request." msgstr "" -#: camel/camel-gpg-context.c:741 +#: camel/camel-gpg-context.c:750 #, c-format msgid "" "You need a passphrase to unlock the key for\n" "user: \"%s\"" msgstr "" -#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175 -#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356 -#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534 +#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220 +#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401 +#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540 msgid "Cancelled." msgstr "" -#: camel/camel-gpg-context.c:770 +#: camel/camel-gpg-context.c:779 msgid "Failed to unlock secret key: 3 bad passphrases given." msgstr "" -#: camel/camel-gpg-context.c:776 +#: camel/camel-gpg-context.c:785 #, c-format msgid "Unexpected response from GnuPG: %s" msgstr "" -#: camel/camel-gpg-context.c:782 +#: camel/camel-gpg-context.c:795 msgid "No data provided" msgstr "" -#: camel/camel-gpg-context.c:827 +#: camel/camel-gpg-context.c:840 #, fuzzy msgid "Failed to encrypt: No valid recipients specified." msgstr "Can not encrypt this message: no recipients specified" -#: camel/camel-gpg-context.c:1077 +#: camel/camel-gpg-context.c:1095 #, c-format msgid "" "Failed to GPG %s message: %s\n" @@ -7883,17 +7934,17 @@ msgid "" "%.*s" msgstr "" -#: camel/camel-gpg-context.c:1083 +#: camel/camel-gpg-context.c:1101 #, c-format msgid "Failed to GPG %s message: %s\n" msgstr "" -#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273 -#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403 +#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318 +#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448 msgid "Failed to execute gpg." msgstr "" -#: camel/camel-gpg-context.c:1258 +#: camel/camel-gpg-context.c:1303 #, fuzzy, c-format msgid "Cannot verify message signature: could not create temp file: %s" msgstr "Can not verify this message: could not create temporary file: %s" @@ -7919,22 +7970,22 @@ msgid "Could not lock '%s'" msgstr "" #. well, this is really only a programatic error -#: camel/camel-lock.c:91 camel/camel-lock.c:110 +#: camel/camel-lock.c:93 camel/camel-lock.c:112 #, c-format msgid "Could not create lock file for %s: %s" msgstr "" -#: camel/camel-lock.c:150 +#: camel/camel-lock.c:152 #, c-format msgid "Timed out trying to get lock file on %s. Try again later." msgstr "" -#: camel/camel-lock.c:204 +#: camel/camel-lock.c:206 #, c-format msgid "Failed to get lock using fcntl(2): %s" msgstr "" -#: camel/camel-lock.c:266 +#: camel/camel-lock.c:268 #, c-format msgid "Failed to get lock using flock(2): %s" msgstr "" @@ -7993,11 +8044,15 @@ msgstr "" msgid "Error copying mail temp file: %s" msgstr "" -#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272 +#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274 msgid "Failed to decrypt MIME part: protocol error" msgstr "" -#: camel/camel-multipart-encrypted.c:325 +#: camel/camel-multipart-encrypted.c:287 +msgid "Failed to decrypt MIME part: invalid structure" +msgstr "" + +#: camel/camel-multipart-encrypted.c:327 msgid "Failed to decrypt MIME part: parse error" msgstr "" @@ -8117,7 +8172,7 @@ msgid "" msgstr "" #: camel/camel-sasl-kerberos4.c:218 -#: camel/providers/imap/camel-imap-store.c:846 +#: camel/providers/imap/camel-imap-store.c:1002 msgid "Bad authentication response from server." msgstr "" @@ -8284,26 +8339,124 @@ msgstr "Can not get folder: Invalid operation on this store" msgid "Cannot create folder: Invalid operation on this store" msgstr "Can not create folder: Invalid operation on this store" -#: camel/camel-tcp-stream-openssl.c:614 -#, c-format -msgid "" -"Issuer: %s\n" -"Subject: %s" +#: camel/camel-tcp-stream-openssl.c:566 +msgid "Unable to get issuer's certificate" msgstr "" -#: camel/camel-tcp-stream-openssl.c:619 -#, c-format -msgid "" -"Bad certificate from %s:\n" -"\n" -"%s\n" -"\n" -"Do you wish to accept anyway?" +#: camel/camel-tcp-stream-openssl.c:568 +msgid "Unable to get Certificate Revocation List" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:570 +msgid "Unable to decrypt certificate signature" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:572 +msgid "Unable to decrypt Certificate Revocation List signature" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:574 +msgid "Unable to decode issuer's public key" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:576 +#, fuzzy +msgid "Certificate signature failure" +msgstr "Could not close temporary folder: %s" + +#: camel/camel-tcp-stream-openssl.c:578 +msgid "Certificate Revocation List signature failure" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:580 +msgid "Certificate not yet valid" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:582 +msgid "Certificate has expired" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:584 +msgid "CRL not yet valid" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:586 +msgid "CRL has expired" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:591 +msgid "Error in CRL" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:593 +msgid "Out of memory" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:595 +msgid "Zero-depth self-signed certificate" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:597 +msgid "Self-signed certificate in chain" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:599 +msgid "Unable to get issuer's certificate locally" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:601 +msgid "Unable to verify leaf signature" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:603 +msgid "Certificate chain too long" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:605 +msgid "Certificate Revoked" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:607 +msgid "Invalid Certificate Authority (CA)" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:609 +msgid "Path length exceeded" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:611 +msgid "Invalid purpose" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:613 +msgid "Certificate untrusted" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:615 +msgid "Certificate rejected" msgstr "" -#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer); -#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL); -#: camel/camel-tcp-stream-ssl.c:495 +#: camel/camel-tcp-stream-openssl.c:618 +msgid "Subject/Issuer mismatch" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:620 +msgid "AKID/SKID mismatch" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:622 +msgid "AKID/Issuer serial mismatch" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:624 +msgid "Key usage does not support certificate signing" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:627 +msgid "Error in application verification" +msgstr "" + +#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524 #, c-format msgid "" "Issuer: %s\n" @@ -8312,16 +8465,28 @@ msgid "" "Signature: %s" msgstr "" -#: camel/camel-tcp-stream-ssl.c:501 +#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530 msgid "GOOD" msgstr "" -#: camel/camel-tcp-stream-ssl.c:501 +#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530 msgid "BAD" msgstr "" +#: camel/camel-tcp-stream-openssl.c:702 +#, c-format +msgid "" +"Bad certificate from %s:\n" +"\n" +"%s\n" +"\n" +"%s\n" +"\n" +"Do you wish to accept anyway?" +msgstr "" + #. construct our user prompt -#: camel/camel-tcp-stream-ssl.c:504 +#: camel/camel-tcp-stream-ssl.c:533 #, c-format msgid "" "SSL Certificate check for %s:\n" @@ -8336,32 +8501,37 @@ msgstr "" msgid "Could not parse URL `%s'" msgstr "" -#: camel/camel-vee-folder.c:649 +#: camel/camel-vee-folder.c:618 +#, c-format +msgid "Error storing `%s': %s" +msgstr "" + +#: camel/camel-vee-folder.c:656 #, c-format msgid "No such message %s in %s" msgstr "" -#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802 +#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822 #, fuzzy msgid "Cannot copy or move messages into a Virtual Folder" msgstr "You can not copy messages from this rubbish bin." -#: camel/camel-vee-store.c:262 +#: camel/camel-vee-store.c:296 #, c-format msgid "Cannot delete folder: %s: Invalid operation" msgstr "Can not delete folder: %s: Invalid operation" -#: camel/camel-vee-store.c:297 +#: camel/camel-vee-store.c:319 #, c-format msgid "Cannot delete folder: %s: No such folder" msgstr "Can not delete folder: %s: No such folder" -#: camel/camel-vee-store.c:310 +#: camel/camel-vee-store.c:332 #, c-format msgid "Cannot rename folder: %s: Invalid operation" msgstr "Can not rename folder: %s: Invalid operation" -#: camel/camel-vee-store.c:318 +#: camel/camel-vee-store.c:340 #, c-format msgid "Cannot rename folder: %s: No such folder" msgstr "Can not rename folder: %s: No such folder" @@ -8369,12 +8539,12 @@ msgstr "Can not rename folder: %s: No such folder" #: camel/providers/imap/camel-imap-command.c:220 #: camel/providers/imap/camel-imap-command.c:259 #: camel/providers/imap/camel-imap-command.c:438 -#: camel/providers/imap/camel-imap-store.c:2276 +#: camel/providers/imap/camel-imap-store.c:2404 msgid "Operation cancelled" msgstr "" #: camel/providers/imap/camel-imap-command.c:304 -#: camel/providers/imap/camel-imap-store.c:2279 +#: camel/providers/imap/camel-imap-store.c:2407 #, c-format msgid "Server unexpectedly disconnected: %s" msgstr "" @@ -8403,40 +8573,40 @@ msgstr "" msgid "Unexpected OK response from IMAP server: %s" msgstr "" -#: camel/providers/imap/camel-imap-folder.c:215 +#: camel/providers/imap/camel-imap-folder.c:219 #, c-format msgid "Could not create directory %s: %s" msgstr "" -#: camel/providers/imap/camel-imap-folder.c:234 +#: camel/providers/imap/camel-imap-folder.c:238 #, c-format msgid "Could not load summary for %s" msgstr "" -#: camel/providers/imap/camel-imap-folder.c:300 +#: camel/providers/imap/camel-imap-folder.c:304 msgid "Folder was destroyed and recreated on server." msgstr "" #. Check UIDs and flags of all messages we already know of. -#: camel/providers/imap/camel-imap-folder.c:525 +#: camel/providers/imap/camel-imap-folder.c:535 msgid "Scanning for changed messages" msgstr "" -#: camel/providers/imap/camel-imap-folder.c:1842 -#: camel/providers/imap/camel-imap-folder.c:2323 +#: camel/providers/imap/camel-imap-folder.c:1909 +#: camel/providers/imap/camel-imap-folder.c:2406 msgid "This message is not currently available" msgstr "" -#: camel/providers/imap/camel-imap-folder.c:1999 -#: camel/providers/imap/camel-imap-folder.c:2076 +#: camel/providers/imap/camel-imap-folder.c:2066 +#: camel/providers/imap/camel-imap-folder.c:2143 msgid "Fetching summary information for new messages" msgstr "" -#: camel/providers/imap/camel-imap-folder.c:2005 +#: camel/providers/imap/camel-imap-folder.c:2072 msgid "Scanning for new messages" msgstr "" -#: camel/providers/imap/camel-imap-folder.c:2360 +#: camel/providers/imap/camel-imap-folder.c:2443 msgid "Could not find message body in FETCH response." msgstr "" @@ -8445,10 +8615,10 @@ msgstr "" msgid "Could not open cache directory: %s" msgstr "" -#: camel/providers/imap/camel-imap-message-cache.c:257 -#: camel/providers/imap/camel-imap-message-cache.c:314 -#: camel/providers/imap/camel-imap-message-cache.c:345 -#: camel/providers/imap/camel-imap-message-cache.c:377 +#: camel/providers/imap/camel-imap-message-cache.c:252 +#: camel/providers/imap/camel-imap-message-cache.c:309 +#: camel/providers/imap/camel-imap-message-cache.c:340 +#: camel/providers/imap/camel-imap-message-cache.c:372 #, c-format msgid "Failed to cache message %s: %s" msgstr "" @@ -8461,7 +8631,7 @@ msgstr "" msgid "Check for new messages in all folders" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031 +#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043 msgid "Folders" msgstr "" @@ -8491,7 +8661,7 @@ msgstr "" #: camel/providers/imap/camel-imap-provider.c:80 #: camel/providers/nntp/camel-nntp-store.c:267 -#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87 +#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84 msgid "Password" msgstr "" @@ -8499,69 +8669,73 @@ msgstr "" msgid "This option will connect to the IMAP server using a plaintext password." msgstr "" -#: camel/providers/imap/camel-imap-store.c:423 +#: camel/providers/imap/camel-imap-store.c:433 #, c-format msgid "IMAP server %s" msgstr "" -#: camel/providers/imap/camel-imap-store.c:425 +#: camel/providers/imap/camel-imap-store.c:435 #, c-format msgid "IMAP service for %s on %s" msgstr "" -#: camel/providers/imap/camel-imap-store.c:544 +#: camel/providers/imap/camel-imap-store.c:554 #: camel/providers/nntp/camel-nntp-store.c:130 #: camel/providers/nntp/camel-nntp-store.c:148 #: camel/providers/pop3/camel-pop3-store.c:180 msgid "Connection cancelled" msgstr "" -#: camel/providers/imap/camel-imap-store.c:547 +#: camel/providers/imap/camel-imap-store.c:557 #: camel/providers/nntp/camel-nntp-store.c:133 -#: camel/providers/pop3/camel-pop3-store.c:183 #: camel/providers/smtp/camel-smtp-transport.c:276 #, c-format msgid "Could not connect to %s (port %d): %s" msgstr "" -#: camel/providers/imap/camel-imap-store.c:606 -#: camel/providers/imap/camel-imap-store.c:637 +#: camel/providers/imap/camel-imap-store.c:616 +#: camel/providers/imap/camel-imap-store.c:647 #, fuzzy, c-format msgid "Failed to connect to IMAP server %s in secure mode: %s" msgstr "Could not close temporary folder: %s" -#: camel/providers/imap/camel-imap-store.c:607 +#: camel/providers/imap/camel-imap-store.c:617 #: camel/providers/pop3/camel-pop3-store.c:213 msgid "SSL/TLS extension not supported." msgstr "" -#: camel/providers/imap/camel-imap-store.c:638 +#: camel/providers/imap/camel-imap-store.c:648 #: camel/providers/pop3/camel-pop3-store.c:254 msgid "SSL negotiations failed" msgstr "" -#: camel/providers/imap/camel-imap-store.c:869 +#: camel/providers/imap/camel-imap-store.c:891 +#, c-format +msgid "The folder %s no longer exists" +msgstr "" + +#: camel/providers/imap/camel-imap-store.c:1025 #, c-format msgid "IMAP server %s does not support requested authentication type %s" msgstr "" -#: camel/providers/imap/camel-imap-store.c:879 -#: camel/providers/smtp/camel-smtp-transport.c:471 +#: camel/providers/imap/camel-imap-store.c:1035 +#: camel/providers/smtp/camel-smtp-transport.c:476 #, c-format msgid "No support for authentication type %s" msgstr "" -#: camel/providers/imap/camel-imap-store.c:903 +#: camel/providers/imap/camel-imap-store.c:1059 #, c-format msgid "%sPlease enter the IMAP password for %s@%s" msgstr "" -#: camel/providers/imap/camel-imap-store.c:918 -#: camel/providers/smtp/camel-smtp-transport.c:512 +#: camel/providers/imap/camel-imap-store.c:1074 +#: camel/providers/smtp/camel-smtp-transport.c:517 msgid "You didn't enter a password." msgstr "" -#: camel/providers/imap/camel-imap-store.c:947 +#: camel/providers/imap/camel-imap-store.c:1103 #, c-format msgid "" "Unable to authenticate to IMAP server.\n" @@ -8569,31 +8743,37 @@ msgid "" "\n" msgstr "" -#: camel/providers/imap/camel-imap-store.c:1269 -#: camel/providers/imap/camel-imap-store.c:1388 +#: camel/providers/imap/camel-imap-store.c:1426 +#: camel/providers/imap/camel-imap-store.c:1563 #, c-format msgid "No such folder %s" msgstr "" -#: camel/providers/imap/camel-imap-store.c:1656 +#: camel/providers/imap/camel-imap-store.c:1750 +#, c-format +msgid "" +"The folder name \"%s\" is invalid because it containes the character \"%c\"" +msgstr "" + +#: camel/providers/imap/camel-imap-store.c:1788 msgid "The parent folder is not allowed to contain subfolders" msgstr "" #. $HOME relative path + protocol string -#: camel/providers/local/camel-local-folder.c:351 +#: camel/providers/local/camel-local-folder.c:352 #, c-format msgid "~%s (%s)" msgstr "" #. /var/spool/mail relative path + protocol -#: camel/providers/local/camel-local-folder.c:355 -#: camel/providers/local/camel-local-folder.c:358 +#: camel/providers/local/camel-local-folder.c:356 +#: camel/providers/local/camel-local-folder.c:359 #, fuzzy, c-format msgid "mailbox:%s (%s)" msgstr "Can not open mailbox: %s: %s\n" #. a full path + protocol -#: camel/providers/local/camel-local-folder.c:362 +#: camel/providers/local/camel-local-folder.c:363 #, c-format msgid "%s (%s)" msgstr "" @@ -8615,7 +8795,9 @@ msgid "Local delivery" msgstr "" #: camel/providers/local/camel-local-provider.c:66 -msgid "For retrieving local mail from standard mbox formated spools." +msgid "" +"For retrieving (moving) local mail from standard mbox formated spools into " +"folders managed by Evolution." msgstr "" #: camel/providers/local/camel-local-provider.c:77 @@ -8641,12 +8823,12 @@ msgstr "" #: camel/providers/local/camel-local-provider.c:102 msgid "" -"For reading and storing local mail in standard mbox spool files.\n" +"For reading and storing local mail in external standard mbox spool files.\n" "May also be used to read a tree of Elm, Pine, or Mutt style folders." msgstr "" #: camel/providers/local/camel-local-store.c:139 -#: camel/providers/local/camel-local-store.c:228 +#: camel/providers/local/camel-local-store.c:229 #: camel/providers/local/camel-spool-store.c:110 #, c-format msgid "Store root %s is not an absolute path" @@ -8657,38 +8839,38 @@ msgstr "" msgid "Store root %s is not a regular directory" msgstr "" -#: camel/providers/local/camel-local-store.c:154 -#: camel/providers/local/camel-local-store.c:170 -#: camel/providers/local/camel-local-store.c:236 +#: camel/providers/local/camel-local-store.c:155 +#: camel/providers/local/camel-local-store.c:171 +#: camel/providers/local/camel-local-store.c:237 #, c-format msgid "Cannot get folder: %s: %s" msgstr "Can not get folder: %s: %s" -#: camel/providers/local/camel-local-store.c:185 +#: camel/providers/local/camel-local-store.c:186 msgid "Local stores do not have an inbox" msgstr "" -#: camel/providers/local/camel-local-store.c:197 +#: camel/providers/local/camel-local-store.c:198 #, c-format msgid "Local mail file %s" msgstr "" -#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908 +#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910 #, c-format msgid "Could not rename folder %s to %s: %s" msgstr "" -#: camel/providers/local/camel-local-store.c:358 +#: camel/providers/local/camel-local-store.c:359 #, fuzzy, c-format msgid "Could not rename '%s': %s" msgstr "Could not close temporary folder: %s" -#: camel/providers/local/camel-local-store.c:379 +#: camel/providers/local/camel-local-store.c:380 #, c-format msgid "Could not delete folder summary file `%s': %s" msgstr "" -#: camel/providers/local/camel-local-store.c:389 +#: camel/providers/local/camel-local-store.c:390 #, c-format msgid "Could not delete folder index file `%s': %s" msgstr "" @@ -8746,7 +8928,7 @@ msgid "" msgstr "" #: camel/providers/local/camel-maildir-store.c:110 -#: camel/providers/local/camel-mbox-store.c:102 +#: camel/providers/local/camel-mbox-store.c:101 #: camel/providers/local/camel-mh-store.c:209 #, c-format msgid "Folder `%s' does not exist." @@ -8782,24 +8964,24 @@ msgstr "" msgid "Could not scan folder `%s': %s" msgstr "" -#: camel/providers/local/camel-maildir-summary.c:408 -#: camel/providers/local/camel-maildir-summary.c:531 +#: camel/providers/local/camel-maildir-summary.c:416 +#: camel/providers/local/camel-maildir-summary.c:545 #, c-format msgid "Cannot open maildir directory path: %s: %s" msgstr "Can not open maildir directory path: %s: %s" -#: camel/providers/local/camel-maildir-summary.c:525 +#: camel/providers/local/camel-maildir-summary.c:539 msgid "Checking folder consistency" msgstr "" -#: camel/providers/local/camel-maildir-summary.c:629 +#: camel/providers/local/camel-maildir-summary.c:640 msgid "Checking for new messages" msgstr "" -#: camel/providers/local/camel-maildir-summary.c:718 +#: camel/providers/local/camel-maildir-summary.c:729 #: camel/providers/local/camel-mbox-summary.c:345 -#: camel/providers/local/camel-mbox-summary.c:582 -#: camel/providers/local/camel-mbox-summary.c:672 +#: camel/providers/local/camel-mbox-summary.c:583 +#: camel/providers/local/camel-mbox-summary.c:673 #: camel/providers/local/camel-spool-summary.c:145 msgid "Storing folder" msgstr "Synchronising folder" @@ -8843,35 +9025,35 @@ msgstr "" msgid "Message construction failed: Corrupt mailbox?" msgstr "" -#: camel/providers/local/camel-mbox-store.c:95 +#: camel/providers/local/camel-mbox-store.c:94 #, c-format msgid "" "Could not open file `%s':\n" "%s" msgstr "" -#: camel/providers/local/camel-mbox-store.c:111 +#: camel/providers/local/camel-mbox-store.c:110 #, c-format msgid "" "Could not create file `%s':\n" "%s" msgstr "" -#: camel/providers/local/camel-mbox-store.c:120 -#: camel/providers/local/camel-mbox-store.c:147 +#: camel/providers/local/camel-mbox-store.c:119 +#: camel/providers/local/camel-mbox-store.c:146 #, c-format msgid "`%s' is not a regular file." msgstr "" -#: camel/providers/local/camel-mbox-store.c:139 -#: camel/providers/local/camel-mbox-store.c:162 +#: camel/providers/local/camel-mbox-store.c:138 +#: camel/providers/local/camel-mbox-store.c:161 #, c-format msgid "" "Could not delete folder `%s':\n" "%s" msgstr "" -#: camel/providers/local/camel-mbox-store.c:154 +#: camel/providers/local/camel-mbox-store.c:153 #, c-format msgid "Folder `%s' is not empty. Not deleted." msgstr "" @@ -8886,64 +9068,64 @@ msgstr "" msgid "Fatal mail parser error near position %ld in folder %s" msgstr "" -#: camel/providers/local/camel-mbox-summary.c:452 +#: camel/providers/local/camel-mbox-summary.c:453 #, c-format msgid "Cannot check folder: %s: %s" msgstr "Synchronising folder failed: %s: %s" -#: camel/providers/local/camel-mbox-summary.c:587 -#: camel/providers/local/camel-mbox-summary.c:677 +#: camel/providers/local/camel-mbox-summary.c:588 +#: camel/providers/local/camel-mbox-summary.c:678 #: camel/providers/local/camel-spool-summary.c:150 #, c-format msgid "Could not open file: %s: %s" msgstr "" -#: camel/providers/local/camel-mbox-summary.c:599 +#: camel/providers/local/camel-mbox-summary.c:600 #: camel/providers/local/camel-spool-summary.c:169 #, c-format msgid "Cannot open temporary mailbox: %s" msgstr "" -#: camel/providers/local/camel-mbox-summary.c:611 -#: camel/providers/local/camel-mbox-summary.c:773 +#: camel/providers/local/camel-mbox-summary.c:612 +#: camel/providers/local/camel-mbox-summary.c:774 #, c-format msgid "Could not close source folder %s: %s" msgstr "" -#: camel/providers/local/camel-mbox-summary.c:620 +#: camel/providers/local/camel-mbox-summary.c:621 #, c-format msgid "Could not close temp folder: %s" msgstr "Could not close temporary folder: %s" -#: camel/providers/local/camel-mbox-summary.c:631 +#: camel/providers/local/camel-mbox-summary.c:632 #, c-format msgid "Could not rename folder: %s" msgstr "" -#: camel/providers/local/camel-mbox-summary.c:715 -#: camel/providers/local/camel-mbox-summary.c:723 -#: camel/providers/local/camel-mbox-summary.c:912 -#: camel/providers/local/camel-mbox-summary.c:920 +#: camel/providers/local/camel-mbox-summary.c:716 +#: camel/providers/local/camel-mbox-summary.c:724 +#: camel/providers/local/camel-mbox-summary.c:913 +#: camel/providers/local/camel-mbox-summary.c:921 msgid "Summary and folder mismatch, even after a sync" msgstr "" -#: camel/providers/local/camel-mbox-summary.c:847 +#: camel/providers/local/camel-mbox-summary.c:848 #: camel/providers/local/camel-spool-summary.c:332 #, c-format msgid "Unknown error: %s" msgstr "" -#: camel/providers/local/camel-mbox-summary.c:882 +#: camel/providers/local/camel-mbox-summary.c:883 #, fuzzy, c-format msgid "Could not store folder: %s" msgstr "Could not close temporary folder: %s" -#: camel/providers/local/camel-mbox-summary.c:973 +#: camel/providers/local/camel-mbox-summary.c:974 #, c-format msgid "Error writing to temp mailbox: %s" msgstr "Error writing to temporary mailbox: %s" -#: camel/providers/local/camel-mbox-summary.c:990 +#: camel/providers/local/camel-mbox-summary.c:991 #, c-format msgid "Writing to tmp mailbox failed: %s: %s" msgstr "Writing to temporary mailbox failed: %s: %s" @@ -9089,49 +9271,49 @@ msgstr "" msgid "Operation failed: %s" msgstr "" -#: camel/providers/pop3/camel-pop3-folder.c:272 +#: camel/providers/pop3/camel-pop3-folder.c:245 msgid "Retrieving POP summary" msgstr "" -#: camel/providers/pop3/camel-pop3-folder.c:285 -#: camel/providers/pop3/camel-pop3-folder.c:446 -#: camel/providers/pop3/camel-pop3-folder.c:505 -#: camel/providers/pop3/camel-pop3-folder.c:522 +#: camel/providers/pop3/camel-pop3-folder.c:261 +#: camel/providers/pop3/camel-pop3-folder.c:426 +#: camel/providers/pop3/camel-pop3-folder.c:485 +#: camel/providers/pop3/camel-pop3-folder.c:502 msgid "User cancelled" msgstr "" -#: camel/providers/pop3/camel-pop3-folder.c:287 +#: camel/providers/pop3/camel-pop3-folder.c:263 #, fuzzy, c-format msgid "Cannot get POP summary: %s" msgstr "Can not get folder: %s: %s" -#: camel/providers/pop3/camel-pop3-folder.c:325 +#: camel/providers/pop3/camel-pop3-folder.c:305 msgid "Expunging deleted messages" msgstr "" -#: camel/providers/pop3/camel-pop3-folder.c:420 +#: camel/providers/pop3/camel-pop3-folder.c:400 #, c-format msgid "No message with uid %s" msgstr "" #. Sigh, most of the crap in this function is so that the cancel button #. returns the proper exception code. Sigh. -#: camel/providers/pop3/camel-pop3-folder.c:427 +#: camel/providers/pop3/camel-pop3-folder.c:407 #, c-format msgid "Retrieving POP message %d" msgstr "" -#: camel/providers/pop3/camel-pop3-folder.c:448 -#: camel/providers/pop3/camel-pop3-folder.c:507 -#: camel/providers/pop3/camel-pop3-folder.c:514 -#: camel/providers/pop3/camel-pop3-folder.c:524 +#: camel/providers/pop3/camel-pop3-folder.c:428 +#: camel/providers/pop3/camel-pop3-folder.c:487 +#: camel/providers/pop3/camel-pop3-folder.c:494 +#: camel/providers/pop3/camel-pop3-folder.c:504 #, fuzzy, c-format msgid "Cannot get message %s: %s" msgstr "" "Can not get message: %s\n" " %s" -#: camel/providers/pop3/camel-pop3-folder.c:514 +#: camel/providers/pop3/camel-pop3-folder.c:494 msgid "Unknown reason" msgstr "" @@ -9148,7 +9330,7 @@ msgstr "" msgid "Delete after %s day(s)" msgstr "" -#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86 +#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83 msgid "POP" msgstr "" @@ -9169,6 +9351,11 @@ msgid "" "claim to support it." msgstr "" +#: camel/providers/pop3/camel-pop3-store.c:183 +#, fuzzy, c-format +msgid "Could not connect to POP server %s (port %d): %s" +msgstr "Could not close temporary folder: %s" + #: camel/providers/pop3/camel-pop3-store.c:212 #: camel/providers/pop3/camel-pop3-store.c:241 #: camel/providers/pop3/camel-pop3-store.c:253 @@ -9178,50 +9365,52 @@ msgstr "" #: camel/providers/pop3/camel-pop3-store.c:351 #, fuzzy, c-format -msgid "Could not connect to POP server on %s" +msgid "Could not connect to POP server %s" msgstr "Could not close temporary folder: %s" #: camel/providers/pop3/camel-pop3-store.c:392 -#: camel/providers/pop3/camel-pop3-store.c:495 +#: camel/providers/pop3/camel-pop3-store.c:498 +#, c-format msgid "" -"Unable to connect to POP server.\n" -"No support for requested authentication mechanism." +"Unable to connect to POP server %s: No support for requested authentication " +"mechanism." msgstr "" #: camel/providers/pop3/camel-pop3-store.c:408 #, c-format -msgid "SASL `%s' Login failed: %s" -msgstr "" - -#: camel/providers/pop3/camel-pop3-store.c:419 -msgid "SASL Protocol error" +msgid "SASL `%s' Login failed for POP server %s: %s" msgstr "" -#: camel/providers/pop3/camel-pop3-store.c:434 +#: camel/providers/pop3/camel-pop3-store.c:420 #, c-format -msgid "I/O Error: %s" +msgid "Cannot login to POP server %s: SASL Protocol error" msgstr "" -#: camel/providers/pop3/camel-pop3-store.c:455 +#: camel/providers/pop3/camel-pop3-store.c:436 +#, fuzzy, c-format +msgid "Failed to authenticate on POP server %s: %s" +msgstr "Could not close temporary folder: %s" + +#: camel/providers/pop3/camel-pop3-store.c:458 #, c-format msgid "%sPlease enter the POP password for %s@%s" msgstr "" -#: camel/providers/pop3/camel-pop3-store.c:507 -#: camel/providers/pop3/camel-pop3-store.c:511 -#, c-format +#: camel/providers/pop3/camel-pop3-store.c:509 +#: camel/providers/pop3/camel-pop3-store.c:514 +#, fuzzy, c-format msgid "" -"Unable to connect to POP server.\n" +"Unable to connect to POP server %s.\n" "Error sending password: %s" -msgstr "" +msgstr "Could not close temporary folder: %s" -#: camel/providers/pop3/camel-pop3-store.c:604 +#: camel/providers/pop3/camel-pop3-store.c:609 #, c-format msgid "No such folder `%s'." msgstr "" #: camel/providers/sendmail/camel-sendmail-provider.c:36 -#: mail/mail-config.glade.h:111 +#: mail/mail-config.glade.h:109 msgid "Sendmail" msgstr "" @@ -9245,35 +9434,35 @@ msgstr "" msgid "Could not fork sendmail: %s: mail not sent" msgstr "" -#: camel/providers/sendmail/camel-sendmail-transport.c:165 +#: camel/providers/sendmail/camel-sendmail-transport.c:164 #, c-format msgid "Could not send message: %s" msgstr "" -#: camel/providers/sendmail/camel-sendmail-transport.c:178 +#: camel/providers/sendmail/camel-sendmail-transport.c:186 #, c-format msgid "sendmail exited with signal %s: mail not sent." msgstr "" -#: camel/providers/sendmail/camel-sendmail-transport.c:185 +#: camel/providers/sendmail/camel-sendmail-transport.c:193 #, c-format msgid "Could not execute %s: mail not sent." msgstr "" -#: camel/providers/sendmail/camel-sendmail-transport.c:190 +#: camel/providers/sendmail/camel-sendmail-transport.c:198 #, c-format msgid "sendmail exited with status %d: mail not sent." msgstr "" -#: camel/providers/sendmail/camel-sendmail-transport.c:204 +#: camel/providers/sendmail/camel-sendmail-transport.c:212 msgid "sendmail" msgstr "" -#: camel/providers/sendmail/camel-sendmail-transport.c:206 +#: camel/providers/sendmail/camel-sendmail-transport.c:214 msgid "Mail delivery via the sendmail program" msgstr "" -#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102 +#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100 msgid "SMTP" msgstr "" @@ -9381,41 +9570,40 @@ msgstr "" msgid "Authentication required" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:302 -#, c-format -msgid "Welcome response error: %s: possibly non-fatal" +#: camel/providers/smtp/camel-smtp-transport.c:299 +msgid "Welcome response error" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:337 -#: camel/providers/smtp/camel-smtp-transport.c:379 +#: camel/providers/smtp/camel-smtp-transport.c:340 +#: camel/providers/smtp/camel-smtp-transport.c:382 #, c-format msgid "Failed to connect to SMTP server %s in secure mode: %s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:338 +#: camel/providers/smtp/camel-smtp-transport.c:341 msgid "server does not appear to support SSL" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:352 +#: camel/providers/smtp/camel-smtp-transport.c:355 #, c-format msgid "STARTTLS request timed out: %s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:367 +#: camel/providers/smtp/camel-smtp-transport.c:370 msgid "STARTTLS response error" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:461 +#: camel/providers/smtp/camel-smtp-transport.c:466 #, c-format msgid "SMTP server %s does not support requested authentication type %s." msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:499 +#: camel/providers/smtp/camel-smtp-transport.c:504 #, c-format msgid "%sPlease enter the SMTP password for %s@%s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:520 +#: camel/providers/smtp/camel-smtp-transport.c:525 #, c-format msgid "" "Unable to authenticate to SMTP server.\n" @@ -9423,89 +9611,88 @@ msgid "" "\n" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:645 +#: camel/providers/smtp/camel-smtp-transport.c:658 #, c-format msgid "SMTP server %s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:647 +#: camel/providers/smtp/camel-smtp-transport.c:660 #, c-format msgid "SMTP mail delivery via %s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:665 +#: camel/providers/smtp/camel-smtp-transport.c:678 msgid "Cannot send message: sender address not valid." msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607 +#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622 msgid "Sending message" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:681 +#: camel/providers/smtp/camel-smtp-transport.c:697 msgid "Cannot send message: no recipients defined." msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:691 +#: camel/providers/smtp/camel-smtp-transport.c:707 #, fuzzy msgid "Cannot send message: one or more invalid recipients" msgstr "Can not encrypt this message: no recipients specified" -#: camel/providers/smtp/camel-smtp-transport.c:841 +#: camel/providers/smtp/camel-smtp-transport.c:861 msgid "SMTP Greeting" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:872 +#: camel/providers/smtp/camel-smtp-transport.c:892 #, c-format -msgid "HELO request timed out: %s: non-fatal" +msgid "HELO request timed out: %s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:892 -#, c-format -msgid "HELO response error: %s: non-fatal" +#: camel/providers/smtp/camel-smtp-transport.c:913 +msgid "HELO response error" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:940 +#: camel/providers/smtp/camel-smtp-transport.c:979 msgid "SMTP Authentication" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:946 +#: camel/providers/smtp/camel-smtp-transport.c:985 msgid "Error creating SASL authentication object." msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:963 -#: camel/providers/smtp/camel-smtp-transport.c:975 +#: camel/providers/smtp/camel-smtp-transport.c:1002 +#: camel/providers/smtp/camel-smtp-transport.c:1014 #, c-format msgid "AUTH request timed out: %s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:984 +#: camel/providers/smtp/camel-smtp-transport.c:1023 msgid "AUTH request failed." msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1045 +#: camel/providers/smtp/camel-smtp-transport.c:1084 msgid "Bad authentication response from server.\n" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1070 +#: camel/providers/smtp/camel-smtp-transport.c:1109 #, c-format msgid "MAIL FROM request timed out: %s: mail not sent" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1084 +#: camel/providers/smtp/camel-smtp-transport.c:1129 msgid "MAIL FROM response error" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1108 +#: camel/providers/smtp/camel-smtp-transport.c:1153 #, c-format msgid "RCPT TO request timed out: %s: mail not sent" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1124 +#: camel/providers/smtp/camel-smtp-transport.c:1175 #, c-format msgid "RCPT TO <%s> failed" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1160 +#: camel/providers/smtp/camel-smtp-transport.c:1217 #, c-format msgid "DATA request timed out: %s: mail not sent" msgstr "" @@ -9513,86 +9700,86 @@ msgstr "" #. we should have gotten instructions on how to use the DATA command: #. * 354 Enter mail, end with "." on a line by itself #. -#: camel/providers/smtp/camel-smtp-transport.c:1174 +#: camel/providers/smtp/camel-smtp-transport.c:1237 msgid "DATA response error" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1214 -#: camel/providers/smtp/camel-smtp-transport.c:1232 +#: camel/providers/smtp/camel-smtp-transport.c:1277 +#: camel/providers/smtp/camel-smtp-transport.c:1300 #, c-format msgid "DATA send timed out: message termination: %s: mail not sent" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1246 +#: camel/providers/smtp/camel-smtp-transport.c:1320 msgid "DATA termination response error" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1269 +#: camel/providers/smtp/camel-smtp-transport.c:1343 #, c-format msgid "RSET request timed out: %s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1283 +#: camel/providers/smtp/camel-smtp-transport.c:1363 msgid "RSET response error" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1306 +#: camel/providers/smtp/camel-smtp-transport.c:1386 #, c-format -msgid "QUIT request timed out: %s: non-fatal" +msgid "QUIT request timed out: %s" msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:1320 +#: camel/providers/smtp/camel-smtp-transport.c:1406 msgid "QUIT response error" msgstr "" -#: composer/e-msg-composer-attachment-bar.c:101 +#: composer/e-msg-composer-attachment-bar.c:102 msgid "1 byte" msgstr "" -#: composer/e-msg-composer-attachment-bar.c:103 +#: composer/e-msg-composer-attachment-bar.c:104 #, c-format msgid "%u bytes" msgstr "" -#: composer/e-msg-composer-attachment-bar.c:110 +#: composer/e-msg-composer-attachment-bar.c:111 #, c-format msgid "%.1fK" msgstr "" -#: composer/e-msg-composer-attachment-bar.c:114 +#: composer/e-msg-composer-attachment-bar.c:115 #, c-format msgid "%.1fM" msgstr "" -#: composer/e-msg-composer-attachment-bar.c:118 +#: composer/e-msg-composer-attachment-bar.c:119 #, c-format msgid "%.1fG" msgstr "" #. This is a filename. Translators take note. -#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152 +#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220 msgid "attachment" msgstr "" -#: composer/e-msg-composer-attachment-bar.c:506 +#: composer/e-msg-composer-attachment-bar.c:523 msgid "Remove selected items from the attachment list" msgstr "" -#: composer/e-msg-composer-attachment-bar.c:537 +#: composer/e-msg-composer-attachment-bar.c:554 msgid "Add attachment..." msgstr "" -#: composer/e-msg-composer-attachment-bar.c:538 +#: composer/e-msg-composer-attachment-bar.c:555 msgid "Attach a file to the message" msgstr "" -#: composer/e-msg-composer-attachment.c:168 -#: composer/e-msg-composer-attachment.c:184 +#: composer/e-msg-composer-attachment.c:169 +#: composer/e-msg-composer-attachment.c:185 #, c-format msgid "Cannot attach file %s: %s" msgstr "" -#: composer/e-msg-composer-attachment.c:176 +#: composer/e-msg-composer-attachment.c:177 #, c-format msgid "Cannot attach file %s: not a regular file" msgstr "" @@ -9610,188 +9797,195 @@ msgid "MIME type:" msgstr "" #: composer/e-msg-composer-attachment.glade.h:5 -#: composer/e-msg-composer-select-file.c:156 +#: composer/e-msg-composer-select-file.c:163 msgid "Suggest automatic display of attachment" msgstr "" -#: composer/e-msg-composer-hdrs.c:340 +#: composer/e-msg-composer-hdrs.c:344 msgid "Click here for the address book" msgstr "" #. -#. * From: +#. * Reply-To: +#. * +#. * Create this before we call create_from_optionmenu, +#. * because that causes from_changed to be called, which +#. * expects the reply_to fields to be initialized. #. -#: composer/e-msg-composer-hdrs.c:370 -msgid "From:" +#: composer/e-msg-composer-hdrs.c:378 +msgid "Reply-To:" msgstr "" #. -#. * Reply-To: +#. * From #. -#: composer/e-msg-composer-hdrs.c:376 -msgid "Reply-To:" +#: composer/e-msg-composer-hdrs.c:389 +msgid "From:" msgstr "" #. -#. * Subject: +#. * Subject #. -#: composer/e-msg-composer-hdrs.c:387 +#: composer/e-msg-composer-hdrs.c:395 msgid "Subject:" msgstr "" -#: composer/e-msg-composer-hdrs.c:401 +#: composer/e-msg-composer-hdrs.c:409 msgid "To:" msgstr "" -#: composer/e-msg-composer-hdrs.c:402 +#: composer/e-msg-composer-hdrs.c:410 msgid "Enter the recipients of the message" msgstr "" -#: composer/e-msg-composer-hdrs.c:405 +#: composer/e-msg-composer-hdrs.c:413 msgid "Cc:" msgstr "" -#: composer/e-msg-composer-hdrs.c:406 +#: composer/e-msg-composer-hdrs.c:414 msgid "Enter the addresses that will receive a carbon copy of the message" msgstr "" -#: composer/e-msg-composer-hdrs.c:409 +#: composer/e-msg-composer-hdrs.c:417 msgid "Bcc:" msgstr "" -#: composer/e-msg-composer-hdrs.c:410 +#: composer/e-msg-composer-hdrs.c:418 msgid "" "Enter the addresses that will receive a carbon copy of the message without " "appearing in the recipient list of the message." msgstr "" -#: composer/e-msg-composer-select-file.c:267 +#. +#. * Post-To +#. +#: composer/e-msg-composer-hdrs.c:425 +msgid "Post To:" +msgstr "" + +#: composer/e-msg-composer-select-file.c:274 #: ui/evolution-message-composer.xml.h:2 msgid "Attach a file" msgstr "" -#: composer/e-msg-composer.c:506 +#: composer/e-msg-composer.c:514 #, fuzzy msgid "Could not create a PGP signature context" msgstr "Could not close temporary folder: %s" -#: composer/e-msg-composer.c:774 +#: composer/e-msg-composer.c:782 #, c-format msgid "" "Error while reading file %s:\n" "%s" msgstr "" -#: composer/e-msg-composer.c:1026 +#: composer/e-msg-composer.c:1157 msgid "Warning!" msgstr "" -#: composer/e-msg-composer.c:1030 +#: composer/e-msg-composer.c:1161 msgid "File exists, overwrite?" msgstr "" -#: composer/e-msg-composer.c:1052 +#: composer/e-msg-composer.c:1183 #, c-format msgid "Error saving file: %s" msgstr "" -#: composer/e-msg-composer.c:1071 +#: composer/e-msg-composer.c:1203 #, c-format msgid "Error loading file: %s" msgstr "" -#: composer/e-msg-composer.c:1102 +#: composer/e-msg-composer.c:1236 #, c-format msgid "Error accessing file: %s" msgstr "" -#: composer/e-msg-composer.c:1110 +#: composer/e-msg-composer.c:1244 msgid "Unable to retrieve message from editor" msgstr "" -#: composer/e-msg-composer.c:1117 +#: composer/e-msg-composer.c:1251 #, c-format msgid "" "Unable to seek on file: %s\n" "%s" msgstr "" -#: composer/e-msg-composer.c:1124 +#: composer/e-msg-composer.c:1258 #, c-format msgid "" "Unable to truncate file: %s\n" "%s" msgstr "" -#: composer/e-msg-composer.c:1133 +#: composer/e-msg-composer.c:1267 #, c-format msgid "" "Error autosaving message: %s\n" " %s" msgstr "" -#: composer/e-msg-composer.c:1235 +#: composer/e-msg-composer.c:1367 msgid "" "Ximian Evolution has found unsaved files from a previous session.\n" "Would you like to try to recover them?" msgstr "" -#: composer/e-msg-composer.c:1381 +#: composer/e-msg-composer.c:1516 msgid "" "This message has not been sent.\n" "\n" "Do you wish to save your changes?" msgstr "" -#: composer/e-msg-composer.c:1388 +#: composer/e-msg-composer.c:1523 msgid "Warning: Modified Message" msgstr "" -#: composer/e-msg-composer.c:1420 +#: composer/e-msg-composer.c:1553 msgid "Open file" msgstr "" -#: composer/e-msg-composer.c:1569 -msgid "Insert File" -msgstr "" - -#: composer/e-msg-composer.c:1841 +#: composer/e-msg-composer.c:1925 msgid "" "Can't set default signature for this account. Maybe accounts were modified " "meanwhile?" msgstr "" -#: composer/e-msg-composer.c:1878 +#: composer/e-msg-composer.c:1962 msgid "Signature:" msgstr "" -#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211 +#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230 msgid "Autogenerated" msgstr "" -#: composer/e-msg-composer.c:1931 +#: composer/e-msg-composer.c:2015 msgid "Set as default" msgstr "" -#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742 +#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797 msgid "Compose a message" msgstr "" -#: composer/e-msg-composer.c:2759 +#: composer/e-msg-composer.c:2814 msgid "" "Could not create composer window:\n" "Unable to activate address selector control." msgstr "" -#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840 +#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895 msgid "" "Could not create composer window:\n" "Unable to activate HTML editor component." msgstr "" -#: composer/e-msg-composer.c:3665 +#: composer/e-msg-composer.c:3846 msgid "" -"<b>(The composer contains a non-text message body, which cannot be editted.)" +"<b>(The composer contains a non-text message body, which cannot be edited.)" "<b>" msgstr "" @@ -9854,19 +10048,18 @@ msgstr "" msgid "Subject does not contain" msgstr "" -#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295 -#: mail/mail-display.c:122 +#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508 +#: mail/mail-display.c:190 msgid "" "A file by that name already exists.\n" "Overwrite it?" msgstr "" -#. Remember the password? -#: e-util/e-passwords.c:363 mail/mail-session.c:269 +#: e-util/e-passwords.c:363 msgid "Remember this password" msgstr "" -#: e-util/e-passwords.c:365 mail/mail-session.c:270 +#: e-util/e-passwords.c:365 msgid "Remember this password for the remainder of this session" msgstr "" @@ -9964,242 +10157,261 @@ msgstr "" msgid "%I %p" msgstr "" -#: filter/filter-datespec.c:80 -msgid "year" -msgstr "" - -#: filter/filter-datespec.c:80 -msgid "years" +#: filter/filter-datespec.c:70 filter/filter.glade.h:24 +#: mail/mail-config.glade.h:185 +msgid "seconds" msgstr "" -#: filter/filter-datespec.c:81 -msgid "month" +#: filter/filter-datespec.c:71 +msgid "minute" msgstr "" -#: filter/filter-datespec.c:81 -msgid "months" +#: filter/filter-datespec.c:72 +msgid "hour" msgstr "" -#: filter/filter-datespec.c:82 +#: filter/filter-datespec.c:74 msgid "week" msgstr "" -#: filter/filter-datespec.c:82 +#: filter/filter-datespec.c:74 filter/filter.glade.h:29 msgid "weeks" msgstr "" -#: filter/filter-datespec.c:84 -msgid "hour" -msgstr "" - -#: filter/filter-datespec.c:85 -msgid "minute" -msgstr "" - -#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190 -msgid "seconds" -msgstr "" - -#: filter/filter-datespec.c:194 -msgid "You have forgotten to choose a date." -msgstr "" - -#: filter/filter-datespec.c:196 -msgid "You have chosen an invalid date." -msgstr "" - -#: filter/filter-datespec.c:271 -msgid "" -"The message's date will be compared against\n" -"whatever the time is when the filter is run\n" -"or vfolder is opened." -msgstr "" - -#: filter/filter-datespec.c:294 -msgid "" -"The message's date will be compared against\n" -"the time that you specify here." -msgstr "" - -#: filter/filter-datespec.c:334 -msgid "" -"The message's date will be compared against\n" -"a time relative to when the filter is run;\n" -"\"a week ago\", for example." +#: filter/filter-datespec.c:75 +msgid "month" msgstr "" -#. keep in sync with FilterDatespec_type! -#: filter/filter-datespec.c:369 -msgid "the current time" +#: filter/filter-datespec.c:75 filter/filter.glade.h:23 +msgid "months" msgstr "" -#: filter/filter-datespec.c:369 -msgid "a time you specify" +#: filter/filter-datespec.c:76 +msgid "year" msgstr "" -#: filter/filter-datespec.c:370 -msgid "a time relative to the current time" +#: filter/filter-datespec.c:76 filter/filter.glade.h:33 +msgid "years" msgstr "" -#. The dialog -#: filter/filter-datespec.c:394 -msgid "Select a time to compare against" +#: filter/filter-datespec.c:174 +msgid "You have forgotten to choose a date." msgstr "" -#. The label -#: filter/filter-datespec.c:428 -msgid "Compare against" +#: filter/filter-datespec.c:269 +msgid "<click here to select a date>" msgstr "" -#: filter/filter-datespec.c:546 filter/filter-datespec.c:725 +#: filter/filter-datespec.c:272 filter/filter-datespec.c:283 msgid "now" msgstr "" -#: filter/filter-datespec.c:575 -msgid " ago" -msgstr "" - -#: filter/filter-datespec.c:621 -msgid "ago" -msgstr "" +#. strftime for date filter display, only needs to show a day date (i.e. no time) +#: filter/filter-datespec.c:279 +#, fuzzy +msgid "%d-%b-%Y" +msgstr "%m/%d/%Y" -#: filter/filter-datespec.c:711 mail/message-list.c:1103 -msgid "%b %d %l:%M %p" +#. 1 (minute|day|...) ago (singular time ago) +#: filter/filter-datespec.c:292 filter/filter-datespec.c:295 +#, c-format +msgid "%d %s ago" msgstr "" -#: filter/filter-datespec.c:722 -msgid "<click here to select a date>" +#: filter/filter-datespec.c:407 +msgid "Select a time to compare against" msgstr "" -#: filter/filter-editor.c:132 filter/filter.glade.h:3 +#: filter/filter-editor.c:132 filter/filter.glade.h:4 msgid "Filter Rules" msgstr "" -#: filter/filter-file.c:176 +#: filter/filter-file.c:178 msgid "You must specify a file name" msgstr "" -#: filter/filter-file.c:186 +#: filter/filter-file.c:190 #, c-format msgid "File '%s' does not exist or is not a regular file." msgstr "" -#: filter/filter-file.c:286 +#: filter/filter-file.c:307 msgid "Choose a file" msgstr "" #. and now for the action area -#: filter/filter-filter.c:488 +#: filter/filter-filter.c:513 msgid "Then" msgstr "" -#: filter/filter-filter.c:502 +#: filter/filter-filter.c:527 msgid "Add action" msgstr "" -#: filter/filter-folder.c:147 +#: filter/filter-folder.c:149 msgid "" "You forgot to choose a folder.\n" "Please go back and specify a valid folder to deliver mail to." msgstr "" -#: filter/filter-folder.c:228 filter/vfolder-rule.c:366 -#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457 +#: filter/filter-folder.c:237 filter/vfolder-rule.c:391 +#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477 msgid "Select Folder" msgstr "" -#: filter/filter-input.c:198 +#: filter/filter-input.c:200 #, c-format msgid "" "Error in regular expression '%s':\n" "%s" msgstr "" -#: filter/filter-label.c:158 -msgid "You must specify a label name" +#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75 +#: mail/mail-config.glade.h:62 +msgid "Important" +msgstr "" + +#. red +#: filter/filter-label.c:137 mail/mail-config.c:76 +#: mail/mail-config.glade.h:135 +msgid "Work" +msgstr "" + +#. orange +#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85 +msgid "Personal" +msgstr "" + +#. forest green +#: filter/filter-label.c:139 mail/mail-config.c:78 +#: mail/mail-config.glade.h:126 +msgid "To Do" +msgstr "" + +#. blue +#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66 +msgid "Later" msgstr "" -#: filter/filter-part.c:518 shell/evolution-test-component.c:49 +#: filter/filter-part.c:545 shell/evolution-test-component.c:49 msgid "Test" msgstr "" -#: filter/filter-rule.c:217 +#: filter/filter-rule.c:223 msgid "You must name this filter." msgstr "" -#: filter/filter-rule.c:721 +#: filter/filter-rule.c:764 msgid "Rule name: " msgstr "" -#: filter/filter-rule.c:725 +#: filter/filter-rule.c:768 msgid "Untitled" msgstr "" -#: filter/filter-rule.c:742 +#: filter/filter-rule.c:785 msgid "If" msgstr "" -#: filter/filter-rule.c:760 +#: filter/filter-rule.c:803 msgid "Execute actions" msgstr "" -#: filter/filter-rule.c:764 +#: filter/filter-rule.c:807 msgid "if all criteria are met" msgstr "" -#: filter/filter-rule.c:769 +#: filter/filter-rule.c:812 msgid "if any criteria are met" msgstr "" -#: filter/filter-rule.c:780 +#: filter/filter-rule.c:823 msgid "Add criterion" msgstr "" -#: filter/filter-rule.c:865 +#: filter/filter-rule.c:908 msgid "incoming" msgstr "" -#: filter/filter-rule.c:865 +#: filter/filter-rule.c:908 msgid "outgoing" msgstr "" #: filter/filter.glade.h:1 -msgid "Edit Filters" +msgid "Compare against" msgstr "" #: filter/filter.glade.h:2 +msgid "Edit Filters" +msgstr "" + +#: filter/filter.glade.h:3 msgid "Edit VFolders" msgstr "" -#: filter/filter.glade.h:4 +#: filter/filter.glade.h:5 msgid "Incoming" msgstr "" -#: filter/filter.glade.h:5 +#: filter/filter.glade.h:6 msgid "Outgoing" msgstr "" -#: filter/filter.glade.h:6 filter/vfolder-editor.c:130 -msgid "Virtual Folders" +#: filter/filter.glade.h:7 +msgid "" +"The message's date will be compared against\n" +"12:00am of the date specified." +msgstr "" + +#: filter/filter.glade.h:9 +msgid "" +"The message's date will be compared against\n" +"a time relative to when filtering occurs." msgstr "" #: filter/filter.glade.h:11 +msgid "" +"The message's date will be compared against\n" +"the current time when filtering occurs." +msgstr "" + +#: filter/filter.glade.h:13 filter/vfolder-editor.c:130 +msgid "Virtual Folders" +msgstr "" + +#: filter/filter.glade.h:18 +msgid "a time relative to the current time" +msgstr "" + +#: filter/filter.glade.h:19 +msgid "ago" +msgstr "" + +#: filter/filter.glade.h:25 msgid "specific folders only" msgstr "" -#: filter/filter.glade.h:12 +#: filter/filter.glade.h:26 +msgid "the current time" +msgstr "" + +#: filter/filter.glade.h:27 +msgid "the time you specify" +msgstr "" + +#: filter/filter.glade.h:28 msgid "vFolder Sources" msgstr "" -#: filter/filter.glade.h:13 +#: filter/filter.glade.h:30 msgid "with all active remote folders" msgstr "" -#: filter/filter.glade.h:14 +#: filter/filter.glade.h:31 msgid "with all local and active remote folders" msgstr "" -#: filter/filter.glade.h:15 +#: filter/filter.glade.h:32 msgid "with all local folders" msgstr "" @@ -10225,39 +10437,39 @@ msgid "Beep" msgstr "" #: filter/libfilter-i18n.h:7 -msgid "Command" +msgid "contains" msgstr "" #: filter/libfilter-i18n.h:8 -msgid "contains" +msgid "Copy to Folder" msgstr "" #: filter/libfilter-i18n.h:9 -msgid "Copy to Folder" +msgid "Date received" msgstr "" #: filter/libfilter-i18n.h:10 -msgid "Date received" +msgid "Date sent" msgstr "" -#: filter/libfilter-i18n.h:11 -msgid "Date sent" +#: filter/libfilter-i18n.h:12 +msgid "Deleted" msgstr "" #: filter/libfilter-i18n.h:13 -msgid "Deleted" +msgid "does not contain" msgstr "" #: filter/libfilter-i18n.h:14 -msgid "does not contain" +msgid "does not end with" msgstr "" #: filter/libfilter-i18n.h:15 -msgid "does not end with" +msgid "does not exist" msgstr "" #: filter/libfilter-i18n.h:16 -msgid "does not exist" +msgid "does not return" msgstr "" #: filter/libfilter-i18n.h:17 @@ -10281,87 +10493,82 @@ msgid "ends with" msgstr "" #: filter/libfilter-i18n.h:22 -msgid "Execute Shell Command" -msgstr "" - -#: filter/libfilter-i18n.h:23 msgid "Exist" msgstr "" -#: filter/libfilter-i18n.h:24 +#: filter/libfilter-i18n.h:23 msgid "exists" msgstr "" -#: filter/libfilter-i18n.h:25 +#: filter/libfilter-i18n.h:24 msgid "Expression" msgstr "" -#: filter/libfilter-i18n.h:26 +#: filter/libfilter-i18n.h:25 msgid "Follow Up" msgstr "" -#: filter/libfilter-i18n.h:27 mail/mail-config.c:75 -#: mail/mail-config.glade.h:62 -msgid "Important" -msgstr "" - -#: filter/libfilter-i18n.h:28 +#: filter/libfilter-i18n.h:27 msgid "is" msgstr "" -#: filter/libfilter-i18n.h:29 +#: filter/libfilter-i18n.h:28 msgid "is after" msgstr "" -#: filter/libfilter-i18n.h:30 +#: filter/libfilter-i18n.h:29 msgid "is before" msgstr "" -#: filter/libfilter-i18n.h:31 +#: filter/libfilter-i18n.h:30 msgid "is Flagged" msgstr "" -#: filter/libfilter-i18n.h:32 +#: filter/libfilter-i18n.h:31 msgid "is greater than" msgstr "" -#: filter/libfilter-i18n.h:33 +#: filter/libfilter-i18n.h:32 msgid "is less than" msgstr "" -#: filter/libfilter-i18n.h:34 +#: filter/libfilter-i18n.h:33 msgid "is not" msgstr "" -#: filter/libfilter-i18n.h:35 +#: filter/libfilter-i18n.h:34 msgid "is not Flagged" msgstr "" -#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713 +#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715 msgid "Label" msgstr "" -#: filter/libfilter-i18n.h:37 +#: filter/libfilter-i18n.h:36 msgid "Mailing list" msgstr "" -#: filter/libfilter-i18n.h:38 +#: filter/libfilter-i18n.h:37 msgid "Message Body" msgstr "" -#: filter/libfilter-i18n.h:39 +#: filter/libfilter-i18n.h:38 msgid "Message Header" msgstr "" -#: filter/libfilter-i18n.h:40 +#: filter/libfilter-i18n.h:39 msgid "Move to Folder" msgstr "" +#: filter/libfilter-i18n.h:40 +msgid "Pipe Message to Shell Command" +msgstr "" + #: filter/libfilter-i18n.h:41 msgid "Play Sound" msgstr "" -#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63 +#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60 msgid "Read" msgstr "" @@ -10377,57 +10584,82 @@ msgstr "" msgid "Replied to" msgstr "" -#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206 +#: filter/libfilter-i18n.h:46 +msgid "returns" +msgstr "" + +#: filter/libfilter-i18n.h:47 +msgid "returns greater than" +msgstr "" + +#: filter/libfilter-i18n.h:48 +msgid "returns less than" +msgstr "" + +#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206 #: mail/message-list.etspec.h:10 msgid "Score" msgstr "" -#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600 +#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799 msgid "Sender" msgstr "" -#: filter/libfilter-i18n.h:48 +#: filter/libfilter-i18n.h:51 msgid "Set Status" msgstr "" -#: filter/libfilter-i18n.h:49 +#: filter/libfilter-i18n.h:52 +msgid "Shell Command" +msgstr "" + +#: filter/libfilter-i18n.h:53 msgid "Size (kB)" msgstr "" -#: filter/libfilter-i18n.h:50 +#: filter/libfilter-i18n.h:54 msgid "sounds like" msgstr "" -#: filter/libfilter-i18n.h:51 +#: filter/libfilter-i18n.h:55 msgid "Source Account" msgstr "" -#: filter/libfilter-i18n.h:52 +#: filter/libfilter-i18n.h:56 msgid "Specific header" msgstr "" -#: filter/libfilter-i18n.h:53 +#: filter/libfilter-i18n.h:57 msgid "starts with" msgstr "" -#: filter/libfilter-i18n.h:55 +#: filter/libfilter-i18n.h:59 msgid "Stop Processing" msgstr "" -#: filter/libfilter-i18n.h:56 mail/mail-format.c:917 +#: filter/libfilter-i18n.h:60 mail/mail-format.c:908 #: mail/message-list.etspec.h:13 msgid "Subject" msgstr "" -#: filter/rule-editor.c:179 +#: filter/libfilter-i18n.h:61 +msgid "Unset Status" +msgstr "" + +#: filter/rule-editor.c:180 msgid "Rules" msgstr "" -#: filter/rule-editor.c:286 +#: filter/rule-editor.c:239 filter/rule-editor.c:335 +#, c-format +msgid "Rule name '%s' is not unique, choose another" +msgstr "" + +#: filter/rule-editor.c:299 msgid "Add Rule" msgstr "" -#: filter/rule-editor.c:361 +#: filter/rule-editor.c:388 msgid "Edit Rule" msgstr "" @@ -10435,11 +10667,11 @@ msgstr "" msgid "Score Rules" msgstr "" -#: filter/vfolder-rule.c:204 +#: filter/vfolder-rule.c:206 msgid "You must name this vfolder." msgstr "" -#: filter/vfolder-rule.c:213 +#: filter/vfolder-rule.c:215 msgid "You need to to specify at least one folder as a source." msgstr "" @@ -10447,31 +10679,31 @@ msgstr "" msgid "Evolution is importing your old Elm mail" msgstr "" -#: importers/elm-importer.c:96 importers/netscape-importer.c:1221 +#: importers/elm-importer.c:96 importers/netscape-importer.c:1227 #: importers/pine-importer.c:101 msgid "Importing..." msgstr "" -#: importers/elm-importer.c:98 importers/netscape-importer.c:1223 +#: importers/elm-importer.c:98 importers/netscape-importer.c:1229 #: importers/pine-importer.c:103 msgid "Please wait" msgstr "" -#: importers/elm-importer.c:169 importers/netscape-importer.c:1801 +#: importers/elm-importer.c:169 importers/netscape-importer.c:1807 #: importers/pine-importer.c:365 #, c-format msgid "Importing %s as %s" msgstr "" -#: importers/elm-importer.c:375 importers/netscape-importer.c:1910 +#: importers/elm-importer.c:375 importers/netscape-importer.c:1916 #: importers/pine-importer.c:471 #, c-format msgid "Scanning %s" msgstr "" -#: importers/elm-importer.c:525 importers/netscape-importer.c:2121 +#: importers/elm-importer.c:525 importers/netscape-importer.c:2127 #: importers/pine-importer.c:637 mail/component-factory.c:102 -#: mail/folder-browser-ui.c:229 +#: mail/folder-browser-ui.c:327 msgid "Mail" msgstr "" @@ -10528,38 +10760,38 @@ msgid "" "contained in the message body." msgstr "" -#: importers/netscape-importer.c:1220 +#: importers/netscape-importer.c:1226 msgid "Evolution is importing your old Netscape data" msgstr "" #. Fill in the new fields -#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075 -#: shell/e-local-storage.c:179 +#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091 +#: shell/e-local-storage.c:183 msgid "Trash" msgstr "" -#: importers/netscape-importer.c:2021 +#: importers/netscape-importer.c:2027 #, fuzzy msgid "Scanning mail filters" msgstr "Synchronising folders" -#: importers/netscape-importer.c:2031 importers/pine-importer.c:570 +#: importers/netscape-importer.c:2037 importers/pine-importer.c:570 msgid "Scanning directory" msgstr "" -#: importers/netscape-importer.c:2040 +#: importers/netscape-importer.c:2046 msgid "Starting import" msgstr "" -#: importers/netscape-importer.c:2126 +#: importers/netscape-importer.c:2132 msgid "Settings" msgstr "" -#: importers/netscape-importer.c:2131 +#: importers/netscape-importer.c:2137 msgid "Mail Filters" msgstr "" -#: importers/netscape-importer.c:2154 +#: importers/netscape-importer.c:2160 msgid "" "Evolution has found Netscape mail files.\n" "Would you like them to be imported into Evolution?" @@ -10633,11 +10865,11 @@ msgstr "" msgid "Font Preferences" msgstr "" -#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68 +#: mail/GNOME_Evolution_Mail.oaf.in.h:14 msgid "Mail Accounts" msgstr "" -#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70 +#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69 msgid "Mail Preferences" msgstr "" @@ -10685,63 +10917,80 @@ msgstr "" msgid "Change this folder's properties" msgstr "" -#: mail/component-factory.c:767 +#: mail/component-factory.c:763 msgid "" "Some of your mail settings seem corrupt, please check that everything is in " "order." msgstr "" -#: mail/component-factory.c:929 +#: mail/component-factory.c:928 msgid "You have not set a mail transport method" msgstr "" -#: mail/component-factory.c:951 +#: mail/component-factory.c:950 msgid "You have unsent messages, do you wish to quit anyway?" msgstr "" -#: mail/component-factory.c:957 +#: mail/component-factory.c:956 #, fuzzy msgid "Warning: Unsent Messages" msgstr "Can not open message" -#: mail/component-factory.c:998 +#: mail/component-factory.c:997 msgid "New Mail Message" msgstr "" -#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16 +#: mail/component-factory.c:997 msgid "_Mail Message" msgstr "" -#: mail/component-factory.c:1025 +#: mail/component-factory.c:998 +msgid "Compose a new mail message" +msgstr "" + +#: mail/component-factory.c:1006 +msgid "New Message Post" +msgstr "" + +#: mail/component-factory.c:1006 +msgid "_Post Message" +msgstr "" + +#: mail/component-factory.c:1007 +#, fuzzy +msgid "Post a new mail message" +msgstr "Can not open message" + +#: mail/component-factory.c:1035 msgid "Cannot initialize Evolution's mail component." msgstr "Cannot initialise Evolution's mail component." -#: mail/component-factory.c:1034 +#: mail/component-factory.c:1044 msgid "Cannot initialize Evolution's mail config component." msgstr "Cannot initialise Evolution's mail config component." -#: mail/component-factory.c:1040 +#: mail/component-factory.c:1050 msgid "Cannot initialize Evolution's folder info component." msgstr "Cannot initialise Evolution's folder info component." -#: mail/component-factory.c:1236 mail/component-factory.c:1267 +#: mail/component-factory.c:1275 mail/component-factory.c:1305 msgid "Connecting..." msgstr "" -#: mail/component-factory.c:1277 +#: mail/component-factory.c:1316 msgid "Cannot register storage with shell" msgstr "" -#: mail/folder-browser-ui.c:344 +#: mail/folder-browser-ui.c:440 #, c-format msgid "Properties for \"%s\"" msgstr "" -#: mail/folder-browser-ui.c:346 +#: mail/folder-browser-ui.c:442 msgid "Properties" msgstr "" -#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840 +#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880 #, c-format msgid "Could not create temporary directory: %s" msgstr "" @@ -10790,125 +11039,125 @@ msgstr "" msgid "Create _Virtual Folder From Search..." msgstr "" -#: mail/folder-browser.c:1649 +#: mail/folder-browser.c:1651 msgid "VFolder on _Subject" msgstr "" -#: mail/folder-browser.c:1650 +#: mail/folder-browser.c:1652 msgid "VFolder on Se_nder" msgstr "" -#: mail/folder-browser.c:1651 +#: mail/folder-browser.c:1653 msgid "VFolder on _Recipients" msgstr "" -#: mail/folder-browser.c:1652 +#: mail/folder-browser.c:1654 msgid "VFolder on Mailing _List" msgstr "" -#: mail/folder-browser.c:1656 +#: mail/folder-browser.c:1658 msgid "Filter on Sub_ject" msgstr "" -#: mail/folder-browser.c:1657 +#: mail/folder-browser.c:1659 msgid "Filter on Sen_der" msgstr "" -#: mail/folder-browser.c:1658 +#: mail/folder-browser.c:1660 msgid "Filter on Re_cipients" msgstr "" -#: mail/folder-browser.c:1659 mail/folder-browser.c:1989 +#: mail/folder-browser.c:1661 mail/folder-browser.c:1984 msgid "Filter on _Mailing List" msgstr "" -#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96 +#: mail/folder-browser.c:1679 msgid "_Edit as New Message..." msgstr "" -#: mail/folder-browser.c:1679 +#: mail/folder-browser.c:1681 msgid "_Print" msgstr "" -#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109 +#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110 msgid "_Reply to Sender" msgstr "" -#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73 +#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75 msgid "Reply to _List" msgstr "" -#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72 +#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74 msgid "Reply to _All" msgstr "" -#: mail/folder-browser.c:1686 +#: mail/folder-browser.c:1688 msgid "_Forward" msgstr "" -#: mail/folder-browser.c:1690 +#: mail/folder-browser.c:1692 msgid "Follo_w Up..." msgstr "" -#: mail/folder-browser.c:1691 +#: mail/folder-browser.c:1693 msgid "Fla_g Completed" msgstr "" -#: mail/folder-browser.c:1692 +#: mail/folder-browser.c:1694 msgid "Cl_ear Flag" msgstr "" #. separator here? -#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43 +#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43 msgid "Mar_k as Read" msgstr "" -#: mail/folder-browser.c:1697 +#: mail/folder-browser.c:1699 msgid "Mark as _Unread" msgstr "" -#: mail/folder-browser.c:1698 +#: mail/folder-browser.c:1700 msgid "Mark as _Important" msgstr "" -#: mail/folder-browser.c:1699 +#: mail/folder-browser.c:1701 msgid "_Mark as Unimportant" msgstr "" -#: mail/folder-browser.c:1704 +#: mail/folder-browser.c:1706 msgid "U_ndelete" msgstr "" -#: mail/folder-browser.c:1708 +#: mail/folder-browser.c:1710 msgid "Mo_ve to Folder..." msgstr "" -#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35 +#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31 msgid "_Copy to Folder..." msgstr "" -#: mail/folder-browser.c:1717 +#: mail/folder-browser.c:1719 msgid "Add Sender to Address_book" msgstr "" -#: mail/folder-browser.c:1721 +#: mail/folder-browser.c:1723 msgid "Appl_y Filters" msgstr "" -#: mail/folder-browser.c:1725 +#: mail/folder-browser.c:1727 msgid "Crea_te Rule From Message" msgstr "" -#: mail/folder-browser.c:1990 +#: mail/folder-browser.c:1985 msgid "VFolder on M_ailing List" msgstr "" -#: mail/folder-browser.c:1992 +#: mail/folder-browser.c:1987 #, c-format msgid "Filter on _Mailing List (%s)" msgstr "" -#: mail/folder-browser.c:1993 +#: mail/folder-browser.c:1988 #, c-format msgid "VFolder on M_ailing List (%s)" msgstr "" @@ -10968,74 +11217,65 @@ msgstr "" msgid "mh" msgstr "" -#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106 +#: mail/mail-account-editor.c:106 msgid "You have not filled in all of the required information." msgstr "" #. give our dialog an OK button and title -#: mail/mail-account-editor-news.c:160 -msgid "Evolution News Editor" -msgstr "" - -#. give our dialog an OK button and title #: mail/mail-account-editor.c:159 msgid "Evolution Account Editor" msgstr "" -#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163 +#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159 msgid "_Host:" msgstr "" -#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133 +#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129 msgid "User_name:" msgstr "" -#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171 +#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167 msgid "_Path:" msgstr "" -#: mail/mail-account-gui.c:1818 +#: mail/mail-account-gui.c:1843 msgid "You may not create two accounts with the same name." msgstr "" -#: mail/mail-accounts.c:215 +#: mail/mail-accounts.c:224 msgid "Are you sure you want to delete this account?" msgstr "" -#: mail/mail-accounts.c:219 +#: mail/mail-accounts.c:228 msgid "Don't delete" msgstr "" -#: mail/mail-accounts.c:222 +#: mail/mail-accounts.c:231 msgid "Really delete account?" msgstr "" -#: mail/mail-accounts.c:359 mail/mail-accounts.c:393 +#: mail/mail-accounts.c:367 mail/mail-accounts.c:401 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667 #: mail/mail-composer-prefs.c:697 msgid "Disable" msgstr "" -#: mail/mail-accounts.c:361 mail/mail-accounts.c:395 +#: mail/mail-accounts.c:369 mail/mail-accounts.c:403 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665 #: mail/mail-composer-prefs.c:697 msgid "Enable" msgstr "" -#: mail/mail-accounts.c:638 mail/mail-accounts.c:642 -msgid "Are you sure you want to delete this news account?" -msgstr "" - -#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2 +#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2 #: mail/mail-config.glade.h:53 msgid "Enabled" msgstr "" -#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1 +#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1 msgid "Account name" msgstr "" -#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3 +#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3 msgid "Protocol" msgstr "" @@ -11044,30 +11284,30 @@ msgstr "" msgid "Mail to %s" msgstr "" -#: mail/mail-autofilter.c:223 +#: mail/mail-autofilter.c:242 #, c-format msgid "Subject is %s" msgstr "" -#: mail/mail-autofilter.c:239 +#: mail/mail-autofilter.c:258 #, c-format msgid "Mail from %s" msgstr "" -#: mail/mail-autofilter.c:295 +#: mail/mail-autofilter.c:275 #, c-format msgid "%s mailing list" msgstr "" -#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364 +#: mail/mail-autofilter.c:327 msgid "Add Filter Rule" msgstr "" -#: mail/mail-autofilter.c:413 +#: mail/mail-autofilter.c:376 msgid "The following filter rule(s):\n" msgstr "" -#: mail/mail-autofilter.c:419 +#: mail/mail-autofilter.c:382 #, c-format msgid "" "Used the removed folder:\n" @@ -11075,7 +11315,7 @@ msgid "" "And have been updated." msgstr "" -#: mail/mail-callbacks.c:95 +#: mail/mail-callbacks.c:101 msgid "" "You have not configured the mail client.\n" "You need to do this before you can send,\n" @@ -11083,131 +11323,127 @@ msgid "" "Would you like to configure it now?" msgstr "" -#: mail/mail-callbacks.c:144 +#: mail/mail-callbacks.c:150 msgid "" "You need to configure an identity\n" "before you can compose mail." msgstr "" -#: mail/mail-callbacks.c:158 +#: mail/mail-callbacks.c:164 msgid "" "You need to configure a mail transport\n" "before you can compose mail." msgstr "" #. FIXME: this wording sucks -#: mail/mail-callbacks.c:196 +#: mail/mail-callbacks.c:202 msgid "" "You are sending an HTML-formatted message, but the following recipients do " "not want HTML-formatted mail:\n" msgstr "" -#: mail/mail-callbacks.c:211 +#: mail/mail-callbacks.c:217 msgid "Send anyway?" msgstr "" -#: mail/mail-callbacks.c:253 +#: mail/mail-callbacks.c:259 msgid "" "This message has no subject.\n" "Really send?" msgstr "" -#: mail/mail-callbacks.c:297 +#: mail/mail-callbacks.c:303 msgid "" "Since the contact list you are sending to is configured to hide the list's " "addresses, this message will contain only Bcc recipients." msgstr "" -#: mail/mail-callbacks.c:301 +#: mail/mail-callbacks.c:307 msgid "This message contains only Bcc recipients." msgstr "" -#: mail/mail-callbacks.c:305 +#: mail/mail-callbacks.c:311 msgid "" "It is possible that the mail server may reveal the recipients by adding an " "Apparently-To header.\n" "Send anyway?" msgstr "" -#: mail/mail-callbacks.c:417 +#: mail/mail-callbacks.c:475 msgid "You must specify recipients in order to send this message." msgstr "" -#: mail/mail-callbacks.c:499 -msgid "You must configure an account before you can send this email." -msgstr "" - -#: mail/mail-callbacks.c:644 +#: mail/mail-callbacks.c:739 msgid "" "Unable to open the drafts folder for this account.\n" "Would you like to use the default drafts folder?" msgstr "" -#: mail/mail-callbacks.c:1025 +#: mail/mail-callbacks.c:1154 msgid "an unknown sender" msgstr "" -#: mail/mail-callbacks.c:1029 +#: mail/mail-callbacks.c:1158 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:" msgstr "" -#: mail/mail-callbacks.c:1481 mail/message-browser.c:131 +#: mail/mail-callbacks.c:1680 mail/message-browser.c:132 msgid "Move message(s) to" msgstr "" -#: mail/mail-callbacks.c:1483 mail/message-browser.c:133 +#: mail/mail-callbacks.c:1682 mail/message-browser.c:134 msgid "Copy message(s) to" msgstr "" -#: mail/mail-callbacks.c:2139 +#: mail/mail-callbacks.c:2352 #, c-format msgid "Are you sure you want to edit all %d messages?" msgstr "" -#: mail/mail-callbacks.c:2164 +#: mail/mail-callbacks.c:2377 msgid "" "You may only edit messages saved\n" "in the Drafts folder." msgstr "" -#: mail/mail-callbacks.c:2203 +#: mail/mail-callbacks.c:2416 msgid "" "You may only resend messages\n" "in the Sent folder." msgstr "" -#: mail/mail-callbacks.c:2217 +#: mail/mail-callbacks.c:2430 #, c-format msgid "Are you sure you want to resend all %d messages?" msgstr "" -#: mail/mail-callbacks.c:2243 +#: mail/mail-callbacks.c:2456 msgid "No Message Selected" msgstr "" -#: mail/mail-callbacks.c:2288 mail/mail-display.c:118 +#: mail/mail-callbacks.c:2501 mail/mail-display.c:186 msgid "Overwrite file?" msgstr "" -#: mail/mail-callbacks.c:2342 +#: mail/mail-callbacks.c:2555 msgid "Save Message As..." msgstr "" -#: mail/mail-callbacks.c:2344 +#: mail/mail-callbacks.c:2557 msgid "Save Messages As..." msgstr "" -#: mail/mail-callbacks.c:2415 +#: mail/mail-callbacks.c:2626 msgid "Go to next folder with unread messages?" msgstr "" -#: mail/mail-callbacks.c:2422 +#: mail/mail-callbacks.c:2633 msgid "" "There are no more new messages in this folder.\n" "Would you like to go to the next folder?" msgstr "" -#: mail/mail-callbacks.c:2665 +#: mail/mail-callbacks.c:2876 msgid "" "This operation will permanently erase all messages marked as deleted. If you " "continue, you will not be able to recover these messages.\n" @@ -11215,35 +11451,35 @@ msgid "" "Really erase these messages?" msgstr "" -#: mail/mail-callbacks.c:2778 +#: mail/mail-callbacks.c:2989 #, c-format msgid "" "Error loading filter information:\n" "%s" msgstr "" -#: mail/mail-callbacks.c:2790 +#: mail/mail-callbacks.c:3001 msgid "Filters" msgstr "" -#: mail/mail-callbacks.c:2833 +#: mail/mail-callbacks.c:3045 #, c-format msgid "Page %d of %d" msgstr "" -#: mail/mail-callbacks.c:2886 +#: mail/mail-callbacks.c:3098 msgid "Print Message" msgstr "" -#: mail/mail-callbacks.c:2913 +#: mail/mail-callbacks.c:3125 msgid "US-Letter" msgstr "" -#: mail/mail-callbacks.c:2952 +#: mail/mail-callbacks.c:3164 msgid "Printing of message failed" msgstr "" -#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179 +#: mail/mail-callbacks.c:3335 #, c-format msgid "Are you sure you want to open all %d messages in separate windows?" msgstr "" @@ -11263,7 +11499,7 @@ msgstr "" msgid "Please specify a valid script name" msgstr "" -#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835 +#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909 msgid "Unnamed" msgstr "" @@ -11282,15 +11518,14 @@ msgstr "" #: mail/mail-config-druid.c:146 msgid "" "Please enter your name and email address below. The \"optional\" fields " -"below do not need to be filled in,\n" -"unless you wish to include this information in email you send." +"below do not need to be filled in, unless you wish to include this " +"information in email you send." msgstr "" #: mail/mail-config-druid.c:148 msgid "" "Please enter information about your incoming mail server below. If you are " -"not sure, ask your system\n" -"administrator or Internet Service Provider." +"not sure, ask your system administrator or Internet Service Provider." msgstr "" #: mail/mail-config-druid.c:150 @@ -11300,56 +11535,33 @@ msgstr "" #: mail/mail-config-druid.c:152 msgid "" "Please enter information about the way you will send mail. If you are not " -"sure, ask your system\n" -"administrator or Internet Service Provider." +"sure, ask your system administrator or Internet Service Provider." msgstr "" #: mail/mail-config-druid.c:154 msgid "" "You are almost done with the mail configuration process. The identity, " -"incoming mail server and\n" -"outgoing mail transport method which you provided will be grouped together " -"to\n" -"make an Evolution mail account. Please enter a name for this account in the " -"space below.\n" -"This name will be used for display purposes only." +"incoming mail server and outgoing mail transport method which you provided " +"will be grouped together to make an Evolution mail account. Please enter a " +"name for this account in the space below. This name will be used for display " +"purposes only." msgstr "" #. set window title -#: mail/mail-config-druid.c:627 +#: mail/mail-config-druid.c:632 msgid "Evolution Account Assistant" msgstr "" -#. red -#: mail/mail-config.c:76 mail/mail-config.glade.h:139 -msgid "Work" -msgstr "" - -#. orange -#: mail/mail-config.c:77 mail/mail-config.glade.h:88 -msgid "Personal" -msgstr "" - -#. forest green -#: mail/mail-config.c:78 mail/mail-config.glade.h:130 -msgid "To Do" -msgstr "" - -#. blue -#: mail/mail-config.c:79 mail/mail-config.glade.h:66 -msgid "Later" -msgstr "" - -#: mail/mail-config.c:625 +#: mail/mail-config.c:632 #, c-format msgid "Account %d" msgstr "" -#: mail/mail-config.c:2555 +#: mail/mail-config.c:2629 msgid "Checking Service" msgstr "" -#: mail/mail-config.c:2633 mail/mail-config.c:2637 +#: mail/mail-config.c:2707 mail/mail-config.c:2711 msgid "Connecting to server..." msgstr "" @@ -11582,401 +11794,385 @@ msgstr "" msgid "Loading Images" msgstr "" -#: mail/mail-config.glade.h:69 +#: mail/mail-config.glade.h:68 msgid "Mail Configuration" msgstr "" -#: mail/mail-config.glade.h:71 +#: mail/mail-config.glade.h:70 msgid "Mailbox location" msgstr "" -#: mail/mail-config.glade.h:72 +#: mail/mail-config.glade.h:71 msgid "Message Composer" msgstr "" -#: mail/mail-config.glade.h:73 +#: mail/mail-config.glade.h:72 msgid "Message Display" msgstr "" -#: mail/mail-config.glade.h:74 +#: mail/mail-config.glade.h:73 msgid "Microsoft" msgstr "" -#: mail/mail-config.glade.h:75 -msgid "NNTP Server:" -msgstr "" - -#: mail/mail-config.glade.h:78 +#: mail/mail-config.glade.h:76 msgid "New Mail Notification" msgstr "" -#: mail/mail-config.glade.h:79 -msgid "News Servers" -msgstr "" - -#: mail/mail-config.glade.h:81 +#: mail/mail-config.glade.h:78 msgid "On Screen fonts" msgstr "" -#: mail/mail-config.glade.h:82 +#: mail/mail-config.glade.h:79 msgid "Optional Information" msgstr "" -#: mail/mail-config.glade.h:84 +#: mail/mail-config.glade.h:81 #, fuzzy msgid "Or_ganization:" msgstr "Organi_sation:" -#: mail/mail-config.glade.h:85 +#: mail/mail-config.glade.h:82 msgid "PGP/GPG _Key ID:" msgstr "" -#: mail/mail-config.glade.h:89 +#: mail/mail-config.glade.h:86 msgid "Pick a color" msgstr "Pick a colour" -#: mail/mail-config.glade.h:90 +#: mail/mail-config.glade.h:87 msgid "Pr_ompt when sending messages with only Bcc recipients defined" msgstr "" -#: mail/mail-config.glade.h:91 +#: mail/mail-config.glade.h:88 msgid "Pretty Good Privacy (PGP/GPG)" msgstr "" -#: mail/mail-config.glade.h:92 +#: mail/mail-config.glade.h:89 msgid "Printed Fonts" msgstr "" -#: mail/mail-config.glade.h:93 +#: mail/mail-config.glade.h:90 msgid "Qmail maildir " msgstr "" -#: mail/mail-config.glade.h:94 +#: mail/mail-config.glade.h:91 #, fuzzy msgid "Quote original message" msgstr "Can not open message" -#: mail/mail-config.glade.h:95 +#: mail/mail-config.glade.h:92 msgid "Quoted" msgstr "" -#: mail/mail-config.glade.h:96 +#: mail/mail-config.glade.h:93 msgid "Re_member this password" msgstr "" -#: mail/mail-config.glade.h:97 +#: mail/mail-config.glade.h:94 msgid "Re_ply-To:" msgstr "" -#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6 +#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6 msgid "Receiving Email" msgstr "" -#: mail/mail-config.glade.h:99 +#: mail/mail-config.glade.h:96 msgid "Receiving _Options" msgstr "" -#: mail/mail-config.glade.h:100 +#: mail/mail-config.glade.h:97 msgid "Remember this _password" msgstr "" -#: mail/mail-config.glade.h:101 +#: mail/mail-config.glade.h:98 msgid "Required Information" msgstr "" -#: mail/mail-config.glade.h:103 +#: mail/mail-config.glade.h:99 +msgid "Restore Defaults" +msgstr "" + +#: mail/mail-config.glade.h:101 msgid "S_ecurity" msgstr "" -#: mail/mail-config.glade.h:104 +#: mail/mail-config.glade.h:102 msgid "Secure MIME (S/MIME)" msgstr "" -#: mail/mail-config.glade.h:105 +#: mail/mail-config.glade.h:103 msgid "Select HTML fixed width font" msgstr "" -#: mail/mail-config.glade.h:106 +#: mail/mail-config.glade.h:104 msgid "Select HTML fixed width font for printing" msgstr "" -#: mail/mail-config.glade.h:107 +#: mail/mail-config.glade.h:105 msgid "Select HTML variable width font" msgstr "" -#: mail/mail-config.glade.h:108 +#: mail/mail-config.glade.h:106 msgid "Select HTML variable width font for printing" msgstr "" -#: mail/mail-config.glade.h:109 +#: mail/mail-config.glade.h:107 msgid "Select PGP program" msgstr "" -#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7 +#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7 msgid "Sending Email" msgstr "" -#: mail/mail-config.glade.h:112 +#: mail/mail-config.glade.h:110 msgid "Sent _messages folder:" msgstr "" -#: mail/mail-config.glade.h:113 +#: mail/mail-config.glade.h:111 msgid "Sent and Draft Messages" msgstr "" -#: mail/mail-config.glade.h:114 +#: mail/mail-config.glade.h:112 msgid "Ser_ver requires authentication" msgstr "" -#: mail/mail-config.glade.h:115 +#: mail/mail-config.glade.h:113 msgid "Server Configuration" msgstr "" -#: mail/mail-config.glade.h:116 +#: mail/mail-config.glade.h:114 msgid "Server _Type: " msgstr "" -#: mail/mail-config.glade.h:117 +#: mail/mail-config.glade.h:115 msgid "Shortcuts _type:" msgstr "" -#: mail/mail-config.glade.h:118 +#: mail/mail-config.glade.h:116 msgid "Signature #1" msgstr "" -#: mail/mail-config.glade.h:119 +#: mail/mail-config.glade.h:117 msgid "Signature #2" msgstr "" -#: mail/mail-config.glade.h:120 -msgid "Source" -msgstr "" - -#: mail/mail-config.glade.h:121 -msgid "Source Information" -msgstr "" - -#: mail/mail-config.glade.h:122 +#: mail/mail-config.glade.h:118 msgid "Specify _filename:" msgstr "" -#: mail/mail-config.glade.h:123 +#: mail/mail-config.glade.h:119 msgid "Spell Checking Language" msgstr "" -#: mail/mail-config.glade.h:124 +#: mail/mail-config.glade.h:120 msgid "Spell _Checking" msgstr "" -#: mail/mail-config.glade.h:125 +#: mail/mail-config.glade.h:121 msgid "Standard Unix mbox" msgstr "" -#: mail/mail-config.glade.h:126 +#: mail/mail-config.glade.h:122 msgid "" "The output of this script will be used as your\n" "signature. The name you specify will be used\n" "for display purposes only. " msgstr "" -#: mail/mail-config.glade.h:129 +#: mail/mail-config.glade.h:125 msgid "" "This page allows you to configure spell checking behavior and language. The " "list of languages here reflects only the languages for which you have a " "dictionary installed." msgstr "" -#: mail/mail-config.glade.h:131 +#: mail/mail-config.glade.h:127 msgid "" "Type the name by which you would like to refer to this account.\n" "For example: \"Work\" or \"Personal\"" msgstr "" -#: mail/mail-config.glade.h:134 +#: mail/mail-config.glade.h:130 msgid "V_ariable-width:" msgstr "" -#: mail/mail-config.glade.h:135 +#: mail/mail-config.glade.h:131 msgid "" "Welcome to the Evolution Mail Configuration Assistant.\n" "\n" "Click \"Next\" to begin. " msgstr "" -#: mail/mail-config.glade.h:140 +#: mail/mail-config.glade.h:136 msgid "XEmacs" msgstr "" -#: mail/mail-config.glade.h:142 +#: mail/mail-config.glade.h:138 msgid "_Add Signature" msgstr "" -#: mail/mail-config.glade.h:143 +#: mail/mail-config.glade.h:139 msgid "_Always load images off the net" msgstr "" -#: mail/mail-config.glade.h:144 +#: mail/mail-config.glade.h:140 msgid "_Always sign outgoing messages when using this account" msgstr "" -#: mail/mail-config.glade.h:145 +#: mail/mail-config.glade.h:141 msgid "_Authentication Type: " msgstr "" -#: mail/mail-config.glade.h:146 +#: mail/mail-config.glade.h:142 msgid "_Authentication type: " msgstr "" -#: mail/mail-config.glade.h:147 +#: mail/mail-config.glade.h:143 msgid "_Automatically check for new mail" msgstr "" -#: mail/mail-config.glade.h:148 +#: mail/mail-config.glade.h:144 msgid "_Automatically insert smiley images" msgstr "" -#: mail/mail-config.glade.h:149 +#: mail/mail-config.glade.h:145 msgid "_Beep when new mail arrives" msgstr "" -#: mail/mail-config.glade.h:150 +#: mail/mail-config.glade.h:146 msgid "_Certificate ID:" msgstr "" -#: mail/mail-config.glade.h:151 +#: mail/mail-config.glade.h:147 msgid "_Confirm when expunging a folder" msgstr "" -#: mail/mail-config.glade.h:152 +#: mail/mail-config.glade.h:148 msgid "_Default signature:" msgstr "" -#: mail/mail-config.glade.h:153 +#: mail/mail-config.glade.h:149 msgid "_Defaults" msgstr "" -#: mail/mail-config.glade.h:155 +#: mail/mail-config.glade.h:151 msgid "_Do not notify me when new mail arrives" msgstr "" -#: mail/mail-config.glade.h:157 +#: mail/mail-config.glade.h:153 msgid "_Enable" msgstr "" -#: mail/mail-config.glade.h:158 +#: mail/mail-config.glade.h:154 msgid "_Fixed-width:" msgstr "" -#: mail/mail-config.glade.h:159 +#: mail/mail-config.glade.h:155 msgid "_Forward style:" msgstr "" -#: mail/mail-config.glade.h:160 +#: mail/mail-config.glade.h:156 msgid "_Full name:" msgstr "" -#: mail/mail-config.glade.h:162 +#: mail/mail-config.glade.h:158 msgid "_HTML Mail" msgstr "" -#: mail/mail-config.glade.h:164 +#: mail/mail-config.glade.h:160 msgid "_Identity" msgstr "" -#: mail/mail-config.glade.h:165 +#: mail/mail-config.glade.h:161 msgid "_Load images if sender is in addressbook" msgstr "" -#: mail/mail-config.glade.h:166 +#: mail/mail-config.glade.h:162 msgid "_Make this my default account" msgstr "" -#: mail/mail-config.glade.h:167 +#: mail/mail-config.glade.h:163 msgid "_Mark messages as read after" msgstr "" -#: mail/mail-config.glade.h:168 +#: mail/mail-config.glade.h:164 msgid "_Name:" msgstr "" -#: mail/mail-config.glade.h:169 +#: mail/mail-config.glade.h:165 msgid "_Never load images off the net" msgstr "" -#: mail/mail-config.glade.h:170 +#: mail/mail-config.glade.h:166 msgid "_PGP binary path:" msgstr "" -#: mail/mail-config.glade.h:172 +#: mail/mail-config.glade.h:168 msgid "_Play sound file when new mail arrives" msgstr "" -#: mail/mail-config.glade.h:173 +#: mail/mail-config.glade.h:169 msgid "_Prompt when sending HTML messages to contacts that don't want them" msgstr "" -#: mail/mail-config.glade.h:174 +#: mail/mail-config.glade.h:170 msgid "_Prompt when sending messages with an empty subject line" msgstr "" -#: mail/mail-config.glade.h:175 +#: mail/mail-config.glade.h:171 msgid "_Receiving Mail" msgstr "" -#: mail/mail-config.glade.h:176 +#: mail/mail-config.glade.h:172 msgid "_Reply style:" msgstr "" -#: mail/mail-config.glade.h:177 +#: mail/mail-config.glade.h:173 msgid "_Restore defaults" msgstr "" -#: mail/mail-config.glade.h:178 +#: mail/mail-config.glade.h:174 msgid "_Script:" msgstr "" -#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54 +#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48 msgid "_Security" msgstr "" -#: mail/mail-config.glade.h:180 +#: mail/mail-config.glade.h:176 msgid "_Sending Mail" msgstr "" -#: mail/mail-config.glade.h:181 +#: mail/mail-config.glade.h:177 msgid "_Show animated images" msgstr "" -#: mail/mail-config.glade.h:182 +#: mail/mail-config.glade.h:178 msgid "_Signatures" msgstr "" -#: mail/mail-config.glade.h:183 +#: mail/mail-config.glade.h:179 msgid "_Use secure connection (SSL):" msgstr "" -#: mail/mail-config.glade.h:184 +#: mail/mail-config.glade.h:180 msgid "_Variable-width:" msgstr "" -#: mail/mail-config.glade.h:185 +#: mail/mail-config.glade.h:181 msgid "_every" msgstr "" -#: mail/mail-config.glade.h:186 +#: mail/mail-config.glade.h:182 #, fuzzy msgid "color" msgstr "Colours" -#: mail/mail-config.glade.h:187 +#: mail/mail-config.glade.h:183 msgid "description" msgstr "" -#: mail/mail-config.glade.h:189 -msgid "newswindow1" -msgstr "" - -#: mail/mail-config.glade.h:191 +#: mail/mail-config.glade.h:186 msgid "xxxxxxxxxxxxxxxxxxxx" msgstr "" @@ -12000,223 +12196,232 @@ msgstr "" msgid "Could not create a S/MIME decode context." msgstr "" -#: mail/mail-display.c:279 +#: mail/mail-display.c:319 msgid "Save Attachment" msgstr "" -#: mail/mail-display.c:344 +#: mail/mail-display.c:384 #, fuzzy, c-format msgid "Could not create temporary file '%s': %s" msgstr "Could not close temporary folder: %s" -#: mail/mail-display.c:390 -msgid "Save to Disk..." +#: mail/mail-display.c:430 +msgid "Save Attachment..." msgstr "" -#: mail/mail-display.c:391 +#: mail/mail-display.c:431 msgid "View Inline" msgstr "" -#: mail/mail-display.c:392 +#: mail/mail-display.c:432 #, c-format msgid "Open in %s..." msgstr "" -#: mail/mail-display.c:452 +#: mail/mail-display.c:492 #, c-format msgid "View Inline (via %s)" msgstr "" -#: mail/mail-display.c:456 +#: mail/mail-display.c:496 msgid "Hide" msgstr "" -#: mail/mail-display.c:477 +#: mail/mail-display.c:517 msgid "External Viewer" msgstr "" -#: mail/mail-display.c:1265 +#: mail/mail-display.c:1279 +msgid "Downloading images" +msgstr "" + +#: mail/mail-display.c:1454 msgid "Loading message content" msgstr "" -#: mail/mail-display.c:1553 +#: mail/mail-display.c:1741 msgid "Overdue:" msgstr "" -#: mail/mail-display.c:1833 +#: mail/mail-display.c:1745 +#, fuzzy +msgid "by %B %d, %Y, %l:%M %P" +msgstr "%a %d/%m/%Y %I:%M %p" + +#: mail/mail-display.c:1747 +msgid "at your earliest convenience" +msgstr "" + +#: mail/mail-display.c:2069 msgid "Open Link in Browser" msgstr "" -#: mail/mail-display.c:1834 +#: mail/mail-display.c:2070 msgid "Copy Link Location" msgstr "" -#: mail/mail-display.c:1836 +#: mail/mail-display.c:2072 msgid "Save Link as (FIXME)" msgstr "" -#: mail/mail-display.c:1838 +#: mail/mail-display.c:2074 msgid "Save Image as..." msgstr "" -#: mail/mail-format.c:631 +#: mail/mail-format.c:626 #, c-format msgid "%s attachment" msgstr "" -#: mail/mail-format.c:677 +#: mail/mail-format.c:672 msgid "Could not parse MIME message. Displaying as source." msgstr "" -#: mail/mail-format.c:760 mail/message-list.etspec.h:2 +#: mail/mail-format.c:756 mail/message-list.etspec.h:2 msgid "Date" msgstr "" -#: mail/mail-format.c:852 +#: mail/mail-format.c:843 msgid "Bad Address" msgstr "" -#: mail/mail-format.c:895 mail/message-list.etspec.h:7 +#: mail/mail-format.c:886 mail/message-list.etspec.h:7 msgid "From" msgstr "" -#: mail/mail-format.c:899 +#: mail/mail-format.c:890 msgid "Reply-To" msgstr "" -#: mail/mail-format.c:904 mail/message-list.etspec.h:14 +#: mail/mail-format.c:895 mail/message-list.etspec.h:14 msgid "To" msgstr "" -#: mail/mail-format.c:909 +#: mail/mail-format.c:900 msgid "Cc" msgstr "" -#: mail/mail-format.c:914 +#: mail/mail-format.c:905 msgid "Bcc" msgstr "" -#: mail/mail-format.c:945 +#: mail/mail-format.c:936 msgid "Mailer" msgstr "" -#: mail/mail-format.c:1736 -msgid "View messages..." -msgstr "" - -#: mail/mail-format.c:1832 +#: mail/mail-format.c:1808 msgid "" "This message is digitally signed. Click the lock icon for more information." msgstr "" -#: mail/mail-format.c:1859 +#: mail/mail-format.c:1835 #, fuzzy msgid "Could not create a PGP verfication context" msgstr "Could not close temporary folder: %s" -#: mail/mail-format.c:1868 +#: mail/mail-format.c:1844 msgid "This message is digitally signed and has been found to be authentic." msgstr "" -#: mail/mail-format.c:1876 +#: mail/mail-format.c:1852 msgid "This message is digitally signed but can not be proven to be authentic." msgstr "" -#: mail/mail-format.c:2126 +#: mail/mail-format.c:2102 #, c-format msgid "Pointer to FTP site (%s)" msgstr "" -#: mail/mail-format.c:2140 +#: mail/mail-format.c:2116 #, c-format msgid "Pointer to local file (%s) valid at site \"%s\"" msgstr "" -#: mail/mail-format.c:2145 +#: mail/mail-format.c:2121 #, c-format msgid "Pointer to local file (%s)" msgstr "" -#: mail/mail-format.c:2174 +#: mail/mail-format.c:2150 #, c-format msgid "Pointer to remote data (%s)" msgstr "" -#: mail/mail-format.c:2182 +#: mail/mail-format.c:2158 #, c-format msgid "Pointer to unknown external data (\"%s\" type)" msgstr "" -#: mail/mail-format.c:2187 +#: mail/mail-format.c:2163 msgid "Malformed external-body part." msgstr "" -#: mail/mail-local.c:538 mail/mail-local.c:540 +#: mail/mail-local.c:540 mail/mail-local.c:542 #, fuzzy, c-format msgid "Local folders/%s" msgstr "Synchronising folder failed: %s: %s" -#: mail/mail-local.c:670 +#: mail/mail-local.c:672 msgid "Reconfiguring folder" msgstr "Synchronising folder" -#: mail/mail-local.c:751 +#: mail/mail-local.c:753 #, c-format msgid "" -"Cannot save folder metainfo; you'll probably find you can't\n" +"Cannot save folder metainfo; you may find you can't\n" "open this folder anymore: %s: %s" msgstr "" -#: mail/mail-local.c:807 +#: mail/mail-local.c:809 #, c-format msgid "Cannot save folder metainfo to %s: %s" msgstr "" -#: mail/mail-local.c:859 +#: mail/mail-local.c:861 #, c-format msgid "Cannot delete folder metadata %s: %s" msgstr "" -#: mail/mail-local.c:1324 +#: mail/mail-local.c:1326 #, c-format msgid "Changing folder \"%s\" to \"%s\" format" msgstr "" -#: mail/mail-local.c:1339 +#: mail/mail-local.c:1341 #, c-format msgid "%s may not be reconfigured because it is not a local folder" msgstr "" -#: mail/mail-local.c:1361 +#: mail/mail-local.c:1363 msgid "" "If you can no longer open this mailbox, then\n" "you may need to repair it manually." msgstr "" -#: mail/mail-local.c:1450 +#: mail/mail-local.c:1452 msgid "You cannot change the format of a non-local folder." msgstr "" -#: mail/mail-local.c:1459 +#: mail/mail-local.c:1461 #, c-format msgid "Reconfigure /%s" msgstr "Synchronising \"%s\"" -#: mail/mail-mt.c:254 +#: mail/mail-mt.c:257 #, c-format msgid "" "Error while '%s':\n" "%s" msgstr "" -#: mail/mail-mt.c:257 +#: mail/mail-mt.c:260 #, c-format msgid "" "Error while performing operation:\n" "%s" msgstr "" -#: mail/mail-mt.c:901 +#: mail/mail-mt.c:904 msgid "Working" msgstr "" @@ -12224,145 +12429,140 @@ msgstr "" msgid "Filtering Folder" msgstr "" -#: mail/mail-ops.c:262 +#: mail/mail-ops.c:267 msgid "Fetching Mail" msgstr "" -#: mail/mail-ops.c:538 mail/mail-ops.c:567 +#: mail/mail-ops.c:553 mail/mail-ops.c:582 msgid "However, the message was successfully sent." msgstr "" -#: mail/mail-ops.c:603 +#: mail/mail-ops.c:618 #, c-format msgid "Sending \"%s\"" msgstr "" -#: mail/mail-ops.c:723 +#: mail/mail-ops.c:738 #, c-format msgid "Sending message %d of %d" msgstr "" -#: mail/mail-ops.c:742 +#: mail/mail-ops.c:757 #, c-format msgid "Failed on message %d of %d" msgstr "" -#: mail/mail-ops.c:744 mail/mail-send-recv.c:538 +#: mail/mail-ops.c:759 mail/mail-send-recv.c:544 msgid "Complete." msgstr "" -#: mail/mail-ops.c:838 +#: mail/mail-ops.c:853 msgid "Saving message to folder" msgstr "" -#: mail/mail-ops.c:918 +#: mail/mail-ops.c:934 #, c-format msgid "Moving messages to %s" msgstr "" -#: mail/mail-ops.c:918 +#: mail/mail-ops.c:934 #, c-format msgid "Copying messages to %s" msgstr "" -#: mail/mail-ops.c:1025 +#: mail/mail-ops.c:1041 #, c-format msgid "Scanning folders in \"%s\"" msgstr "" -#: mail/mail-ops.c:1208 +#: mail/mail-ops.c:1224 msgid "Forwarded messages" msgstr "" -#: mail/mail-ops.c:1251 +#: mail/mail-ops.c:1267 #, c-format msgid "Opening folder %s" msgstr "" -#: mail/mail-ops.c:1323 +#: mail/mail-ops.c:1339 #, c-format msgid "Opening store %s" msgstr "" -#: mail/mail-ops.c:1392 +#: mail/mail-ops.c:1412 #, c-format msgid "Removing folder %s" msgstr "" -#: mail/mail-ops.c:1486 +#: mail/mail-ops.c:1506 #, c-format msgid "Storing folder '%s'" msgstr "Synchronising \"%s\"" -#: mail/mail-ops.c:1537 +#: mail/mail-ops.c:1557 msgid "Refreshing folder" msgstr "" -#: mail/mail-ops.c:1573 +#: mail/mail-ops.c:1593 msgid "Expunging folder" msgstr "" -#: mail/mail-ops.c:1622 +#: mail/mail-ops.c:1642 #, c-format msgid "Retrieving message %s" msgstr "" -#: mail/mail-ops.c:1689 +#: mail/mail-ops.c:1714 #, c-format msgid "Retrieving %d message(s)" msgstr "" -#: mail/mail-ops.c:1775 +#: mail/mail-ops.c:1800 #, c-format msgid "Saving %d messsage(s)" msgstr "" -#: mail/mail-ops.c:1887 +#: mail/mail-ops.c:1912 #, c-format msgid "" "Unable to create output file: %s\n" " %s" msgstr "" -#: mail/mail-ops.c:1915 +#: mail/mail-ops.c:1940 #, c-format msgid "" "Error saving messages to: %s:\n" " %s" msgstr "" -#: mail/mail-ops.c:1989 +#: mail/mail-ops.c:2014 msgid "Saving attachment" msgstr "" -#: mail/mail-ops.c:2006 +#: mail/mail-ops.c:2031 #, c-format msgid "" "Cannot create output file: %s:\n" " %s" msgstr "" -#: mail/mail-ops.c:2036 +#: mail/mail-ops.c:2061 #, c-format msgid "Could not write data: %s" msgstr "" -#: mail/mail-ops.c:2184 +#: mail/mail-ops.c:2209 #, c-format msgid "Disconnecting from %s" msgstr "" -#: mail/mail-ops.c:2184 +#: mail/mail-ops.c:2209 #, c-format msgid "Reconnecting to %s" msgstr "" -#: mail/mail-ops.c:2265 -#, c-format -msgid "Executing shell command: %s" -msgstr "" - -#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506 +#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513 msgid "_Search" msgstr "" @@ -12417,32 +12617,40 @@ msgstr "" msgid "Type: %s" msgstr "" -#: mail/mail-send-recv.c:287 +#: mail/mail-send-recv.c:293 msgid "Send & Receive Mail" msgstr "" -#: mail/mail-send-recv.c:289 +#: mail/mail-send-recv.c:295 msgid "Cancel All" msgstr "" -#: mail/mail-send-recv.c:349 +#: mail/mail-send-recv.c:355 msgid "Updating..." msgstr "" -#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403 +#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409 msgid "Waiting..." msgstr "" -#: mail/mail-session.c:222 +#: mail/mail-session.c:223 msgid "User canceled operation." msgstr "" -#: mail/mail-session.c:321 +#: mail/mail-session.c:276 +msgid "_Remember this password" +msgstr "" + +#: mail/mail-session.c:277 +msgid "_Remember this password for the remainder of this session" +msgstr "" + +#: mail/mail-session.c:334 #, c-format msgid "Enter Password for %s" msgstr "" -#: mail/mail-session.c:324 +#: mail/mail-session.c:337 msgid "Enter Password" msgstr "" @@ -12466,7 +12674,7 @@ msgstr "" msgid "Type the name by which you would like to refer to this signature." msgstr "" -#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879 +#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875 msgid "Name:" msgstr "" @@ -12494,7 +12702,7 @@ msgstr "" msgid "Forwarded message" msgstr "" -#: mail/mail-tools.c:399 +#: mail/mail-tools.c:403 msgid "Forwarded Message" msgstr "" @@ -12508,7 +12716,7 @@ msgstr "" msgid "Updating vfolders for uri: %s" msgstr "" -#: mail/mail-vfolder.c:418 +#: mail/mail-vfolder.c:447 #, c-format msgid "" "The following vFolder(s):\n" @@ -12517,94 +12725,97 @@ msgid "" "And have been updated." msgstr "" -#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259 -#: my-evolution/e-summary-mail.c:733 +#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731 msgid "VFolders" msgstr "" -#: mail/mail-vfolder.c:784 +#: mail/mail-vfolder.c:819 msgid "vFolders" msgstr "" -#: mail/mail-vfolder.c:824 +#: mail/mail-vfolder.c:861 msgid "Edit VFolder" msgstr "" -#: mail/mail-vfolder.c:840 +#: mail/mail-vfolder.c:877 #, c-format msgid "Trying to edit a vfolder '%s' which doesn't exist." msgstr "" -#: mail/mail-vfolder.c:894 +#: mail/mail-vfolder.c:931 msgid "New VFolder" msgstr "" -#: mail/message-browser.c:209 +#: mail/message-browser.c:210 msgid "(No subject)" msgstr "" -#: mail/message-browser.c:211 +#: mail/message-browser.c:212 #, c-format msgid "%s - Message" msgstr "" -#: mail/message-list.c:720 +#: mail/message-list.c:733 msgid "Unseen" msgstr "" -#: mail/message-list.c:721 +#: mail/message-list.c:734 msgid "Seen" msgstr "" -#: mail/message-list.c:722 +#: mail/message-list.c:735 msgid "Answered" msgstr "" -#: mail/message-list.c:723 +#: mail/message-list.c:736 msgid "Multiple Unseen Messages" msgstr "" -#: mail/message-list.c:724 +#: mail/message-list.c:737 msgid "Multiple Messages" msgstr "" -#: mail/message-list.c:728 +#: mail/message-list.c:741 msgid "Lowest" msgstr "" -#: mail/message-list.c:729 +#: mail/message-list.c:742 msgid "Lower" msgstr "" -#: mail/message-list.c:733 +#: mail/message-list.c:746 msgid "Higher" msgstr "" -#: mail/message-list.c:734 +#: mail/message-list.c:747 msgid "Highest" msgstr "" -#: mail/message-list.c:1067 +#: mail/message-list.c:1063 msgid "?" msgstr "" -#: mail/message-list.c:1074 +#: mail/message-list.c:1070 msgid "Today %l:%M %p" msgstr "" -#: mail/message-list.c:1083 +#: mail/message-list.c:1079 msgid "Yesterday %l:%M %p" msgstr "" -#: mail/message-list.c:1095 +#: mail/message-list.c:1091 msgid "%a %l:%M %p" msgstr "" -#: mail/message-list.c:1105 +#: mail/message-list.c:1099 +msgid "%b %d %l:%M %p" +msgstr "" + +#: mail/message-list.c:1101 msgid "%b %d %Y" msgstr "" -#: mail/message-list.c:2537 +#: mail/message-list.c:2555 msgid "Generating message list" msgstr "" @@ -12637,43 +12848,43 @@ msgstr "" msgid "Size" msgstr "" -#: mail/message-tag-followup.c:57 +#: mail/message-tag-followup.c:54 msgid "Call" msgstr "" -#: mail/message-tag-followup.c:58 +#: mail/message-tag-followup.c:55 msgid "Do Not Forward" msgstr "" -#: mail/message-tag-followup.c:59 +#: mail/message-tag-followup.c:56 msgid "Follow-Up" msgstr "" -#: mail/message-tag-followup.c:60 +#: mail/message-tag-followup.c:57 msgid "For Your Information" msgstr "" -#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36 +#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36 msgid "Forward" msgstr "" -#: mail/message-tag-followup.c:62 +#: mail/message-tag-followup.c:59 msgid "No Response Necessary" msgstr "" -#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70 +#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72 msgid "Reply" msgstr "" -#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71 +#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73 msgid "Reply to All" msgstr "" -#: mail/message-tag-followup.c:66 +#: mail/message-tag-followup.c:63 msgid "Review" msgstr "" -#: mail/message-tag-followup.c:315 +#: mail/message-tag-followup.c:246 msgid "Flag to Follow Up" msgstr "" @@ -12697,16 +12908,16 @@ msgstr "" msgid "Unsubscribing to folder \"%s\"" msgstr "" -#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1 +#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1 #: shell/e-storage-set-view.etspec.h:2 msgid "Folder" msgstr "" -#: mail/subscribe-dialog.c:1520 +#: mail/subscribe-dialog.c:1515 msgid "No server has been selected" msgstr "" -#: mail/subscribe-dialog.c:1581 +#: mail/subscribe-dialog.c:1576 msgid "Please select a server." msgstr "" @@ -17183,11 +17394,11 @@ msgid "Kushiro Airport" msgstr "" #: my-evolution/Locations.h:1147 -msgid "Kyyiv/Boryspil" +msgid "Kyiv/Boryspil" msgstr "" #: my-evolution/Locations.h:1148 -msgid "Kyyiv/Zhulyany" +msgid "Kyiv/Zhulyany" msgstr "" #: my-evolution/Locations.h:1149 @@ -22609,8 +22820,8 @@ msgstr "" msgid "Mail summary" msgstr "" -#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407 -#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022 +#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734 +#: shell/e-local-storage.c:1126 msgid "Local Folders" msgstr "" @@ -22628,15 +22839,15 @@ msgstr "" msgid "Dictionary.com Word of the Day" msgstr "" -#: my-evolution/e-summary-preferences.c:599 +#: my-evolution/e-summary-preferences.c:596 msgid "Quotes of the Day" msgstr "" -#: my-evolution/e-summary-preferences.c:867 +#: my-evolution/e-summary-preferences.c:863 msgid "Add a news feed" msgstr "" -#: my-evolution/e-summary-preferences.c:875 +#: my-evolution/e-summary-preferences.c:871 msgid "Enter the URL of the news feed you wish to add" msgstr "" @@ -22648,24 +22859,24 @@ msgstr "" msgid "News Feed" msgstr "" -#: my-evolution/e-summary-shown.c:536 +#: my-evolution/e-summary-shown.c:541 msgid "All" msgstr "" #. Fixme: nice GFX version -#: my-evolution/e-summary-shown.c:545 +#: my-evolution/e-summary-shown.c:553 msgid "Add" msgstr "" -#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58 +#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58 msgid "Shown" msgstr "" -#: my-evolution/e-summary-tasks.c:251 +#: my-evolution/e-summary-tasks.c:300 msgid "No tasks" msgstr "" -#: my-evolution/e-summary-tasks.c:291 +#: my-evolution/e-summary-tasks.c:343 msgid "(No Description)" msgstr "" @@ -23937,7 +24148,7 @@ msgid "Tasks " msgstr "" #: my-evolution/my-evolution.glade.h:17 -msgid "Weather settings" +msgid "Weather Settings" msgstr "" #: my-evolution/my-evolution.glade.h:18 @@ -23993,7 +24204,7 @@ msgstr "" msgid "Cancel Operation" msgstr "" -#: shell/e-folder-dnd-bridge.c:52 +#: shell/e-folder-dnd-bridge.c:53 #, fuzzy, c-format msgid "" "Cannot transfer folder:\n" @@ -24004,20 +24215,20 @@ msgstr "Can not get folder: %s: %s" msgid "Add a Folder" msgstr "" -#: shell/e-local-storage.c:174 +#: shell/e-local-storage.c:178 msgid "Drafts" msgstr "" -#: shell/e-local-storage.c:175 shell/e-shell-view.c:385 -#: shell/e-shortcuts.c:1033 +#: shell/e-local-storage.c:179 shell/e-shell-view.c:397 +#: shell/e-shortcuts.c:1055 msgid "Inbox" msgstr "" -#: shell/e-local-storage.c:176 +#: shell/e-local-storage.c:180 msgid "Outbox" msgstr "" -#: shell/e-local-storage.c:177 +#: shell/e-local-storage.c:181 msgid "Sent" msgstr "" @@ -24215,20 +24426,14 @@ msgid "" msgstr "" #: shell/e-shell-folder-creation-dialog.c:291 -msgid "Evolution - Create new folder" -msgstr "" - -#: shell/e-shell-folder-selection-dialog.c:97 -msgid "" -"The type of the selected folder is not valid for\n" -"the requested operation." +msgid "Create New Folder" msgstr "" -#: shell/e-shell-folder-selection-dialog.c:374 +#: shell/e-shell-folder-selection-dialog.c:376 msgid "New..." msgstr "" -#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714 +#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636 msgid "(Untitled)" msgstr "" @@ -24245,7 +24450,7 @@ msgid "" "to work it out." msgstr "" -#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803 +#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809 msgid "Please select the information that you would like to import:" msgstr "" @@ -24270,103 +24475,99 @@ msgstr "" msgid "Select importer" msgstr "" -#: shell/e-shell-importer.c:498 +#: shell/e-shell-importer.c:497 #, c-format msgid "File %s does not exist" msgstr "" -#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509 -#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575 +#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515 +#: shell/e-shell-importer.c:565 msgid "Evolution Error" msgstr "" -#: shell/e-shell-importer.c:509 -msgid "You may only import to local folders" -msgstr "" - -#: shell/e-shell-importer.c:524 +#: shell/e-shell-importer.c:514 #, c-format msgid "" "There is no importer that is able to handle\n" "%s" msgstr "" -#: shell/e-shell-importer.c:534 +#: shell/e-shell-importer.c:524 msgid "Importing" msgstr "" -#: shell/e-shell-importer.c:542 +#: shell/e-shell-importer.c:532 #, c-format msgid "" "Importing %s.\n" "Starting %s" msgstr "" -#: shell/e-shell-importer.c:555 +#: shell/e-shell-importer.c:545 #, c-format msgid "Error starting %s" msgstr "" -#: shell/e-shell-importer.c:574 +#: shell/e-shell-importer.c:564 #, c-format msgid "Error loading %s" msgstr "" -#: shell/e-shell-importer.c:591 +#: shell/e-shell-importer.c:581 #, c-format msgid "" "Importing %s\n" "Importing item 1." msgstr "" -#: shell/e-shell-importer.c:645 +#: shell/e-shell-importer.c:635 msgid "Automatic" msgstr "" -#: shell/e-shell-importer.c:696 +#: shell/e-shell-importer.c:686 msgid "Filename:" msgstr "" -#: shell/e-shell-importer.c:701 +#: shell/e-shell-importer.c:691 msgid "Select a file" msgstr "" -#: shell/e-shell-importer.c:711 +#: shell/e-shell-importer.c:701 msgid "File type:" msgstr "" -#: shell/e-shell-importer.c:736 +#: shell/e-shell-importer.c:726 msgid "Import data and settings from older programs" msgstr "" -#: shell/e-shell-importer.c:740 +#: shell/e-shell-importer.c:730 msgid "Import a single file" msgstr "" -#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632 +#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638 msgid "" "Please wait...\n" "Scanning for existing setups" msgstr "" -#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635 +#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641 msgid "Starting Intelligent Importers" msgstr "" -#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758 +#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764 #, c-format msgid "From %s:" msgstr "" -#: shell/e-shell-importer.c:1100 +#: shell/e-shell-importer.c:1090 msgid "Select folder" msgstr "" -#: shell/e-shell-importer.c:1101 +#: shell/e-shell-importer.c:1091 msgid "Select a destination folder for importing this data" msgstr "" -#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193 +#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193 msgid "Import" msgstr "" @@ -24411,8 +24612,13 @@ msgstr "Synchronising folders" msgid "in \"%s\" ..." msgstr "" -#: shell/e-shell-shared-folder-picker-dialog.c:523 -msgid "Cannot find open the specified shared folder." +#: shell/e-shell-shared-folder-picker-dialog.c:470 +#, fuzzy, c-format +msgid "Could not open shared folder: %s." +msgstr "Could not close temporary folder: %s" + +#: shell/e-shell-shared-folder-picker-dialog.c:542 +msgid "Cannot find the specified shared folder." msgstr "" #: shell/e-shell-startup-wizard.c:159 @@ -24427,8 +24633,8 @@ msgstr "Cannot initialise Evolution's Mail Wizard interface" msgid "Could not start the Evolution Mailer Assistant interface\n" msgstr "Cannot initialise Evolution's Mail Wizard interface" -#: shell/e-shell-user-creatable-items-handler.c:537 -#: shell/e-shell-user-creatable-items-handler.c:582 +#: shell/e-shell-user-creatable-items-handler.c:579 +#: shell/e-shell-user-creatable-items-handler.c:633 #: widgets/misc/e-charset-picker.c:104 msgid "New" msgstr "" @@ -24470,54 +24676,54 @@ msgstr "" msgid "Select the folder that you want to open" msgstr "" -#: shell/e-shell-view-menu.c:594 -msgid "Create a new shortcut" +#: shell/e-shell-view-menu.c:595 +msgid "Create New Shortcut" msgstr "" -#: shell/e-shell-view-menu.c:595 +#: shell/e-shell-view-menu.c:596 msgid "Select the folder you want the shortcut to point to:" msgstr "" -#: shell/e-shell-view-menu.c:762 +#: shell/e-shell-view-menu.c:763 msgid "_Work Online" msgstr "" -#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58 +#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63 msgid "_Work Offline" msgstr "" -#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34 +#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39 msgid "Work Offline" msgstr "" -#: shell/e-shell-view.c:224 +#: shell/e-shell-view.c:225 msgid "(No folder displayed)" msgstr "" -#: shell/e-shell-view.c:1818 +#: shell/e-shell-view.c:1841 #, c-format msgid "%s (%d)" msgstr "" -#: shell/e-shell-view.c:1820 +#: shell/e-shell-view.c:1843 msgid "(None)" msgstr "" -#: shell/e-shell-view.c:1867 +#: shell/e-shell-view.c:1890 msgid "" "Ximian Evolution is currently online. Click on this button to work offline." msgstr "" -#: shell/e-shell-view.c:1874 +#: shell/e-shell-view.c:1897 msgid "Ximian Evolution is in the process of going offline." msgstr "" -#: shell/e-shell-view.c:1880 +#: shell/e-shell-view.c:1903 msgid "" "Ximian Evolution is currently offline. Click on this button to work online." msgstr "" -#: shell/e-shell.c:171 +#: shell/e-shell.c:175 #, c-format msgid "" "Cannot activate component %s :\n" @@ -24525,12 +24731,12 @@ msgid "" "%s" msgstr "" -#: shell/e-shell.c:765 +#: shell/e-shell.c:731 #, c-format msgid "Cannot set up local storage -- %s" msgstr "" -#: shell/e-shell.c:1853 +#: shell/e-shell.c:1821 #, c-format msgid "" "The Evolution component that handles folders of type \"%s\"\n" @@ -24538,138 +24744,146 @@ msgid "" "in order to access that data again." msgstr "" -#: shell/e-shell.c:2156 +#: shell/e-shell.c:2122 msgid "Invalid arguments" msgstr "" -#: shell/e-shell.c:2158 +#: shell/e-shell.c:2124 msgid "Cannot register on OAF" msgstr "" -#: shell/e-shell.c:2160 +#: shell/e-shell.c:2126 msgid "Configuration Database not found" msgstr "" -#: shell/e-shell.c:2162 shell/e-storage.c:487 +#: shell/e-shell.c:2128 shell/e-storage.c:488 msgid "Generic error" msgstr "" -#: shell/e-shortcuts-view.c:74 +#: shell/e-shortcuts-view.c:76 msgid "Create new shortcut group" msgstr "" -#: shell/e-shortcuts-view.c:75 +#: shell/e-shortcuts-view.c:77 msgid "Group name:" msgstr "" -#: shell/e-shortcuts-view.c:175 +#: shell/e-shortcuts-view.c:173 #, c-format msgid "" "Do you really want to remove group\n" "`%s' from the shortcut bar?" msgstr "" -#: shell/e-shortcuts-view.c:180 +#: shell/e-shortcuts-view.c:178 msgid "Don't remove" msgstr "" -#: shell/e-shortcuts-view.c:210 +#: shell/e-shortcuts-view.c:208 msgid "Rename Shortcut Group" msgstr "" -#: shell/e-shortcuts-view.c:211 +#: shell/e-shortcuts-view.c:209 msgid "Rename selected shortcut group to:" msgstr "" -#: shell/e-shortcuts-view.c:232 +#: shell/e-shortcuts-view.c:241 msgid "_Small Icons" msgstr "" -#: shell/e-shortcuts-view.c:233 +#: shell/e-shortcuts-view.c:242 msgid "Show the shortcuts as small icons" msgstr "" -#: shell/e-shortcuts-view.c:235 +#: shell/e-shortcuts-view.c:244 msgid "_Large Icons" msgstr "" -#: shell/e-shortcuts-view.c:236 +#: shell/e-shortcuts-view.c:245 msgid "Show the shortcuts as large icons" msgstr "" -#: shell/e-shortcuts-view.c:247 +#: shell/e-shortcuts-view.c:256 msgid "_New Group..." msgstr "" -#: shell/e-shortcuts-view.c:248 +#: shell/e-shortcuts-view.c:257 msgid "Create a new shortcut group" msgstr "" -#: shell/e-shortcuts-view.c:250 +#: shell/e-shortcuts-view.c:259 msgid "_Remove this Group..." msgstr "" -#: shell/e-shortcuts-view.c:251 +#: shell/e-shortcuts-view.c:260 msgid "Remove this shortcut group" msgstr "" -#: shell/e-shortcuts-view.c:253 +#: shell/e-shortcuts-view.c:262 msgid "Re_name this Group..." msgstr "" -#: shell/e-shortcuts-view.c:254 +#: shell/e-shortcuts-view.c:263 msgid "Rename this shortcut group" msgstr "" -#: shell/e-shortcuts-view.c:259 +#: shell/e-shortcuts-view.c:268 msgid "_Hide the Shortcut Bar" msgstr "" -#: shell/e-shortcuts-view.c:260 +#: shell/e-shortcuts-view.c:269 msgid "Hide the shortcut bar" msgstr "" -#: shell/e-shortcuts-view.c:379 +#: shell/e-shortcuts-view.c:274 +msgid "Create _Default Shortcuts" +msgstr "" + +#: shell/e-shortcuts-view.c:275 +msgid "Create Default Shortcuts" +msgstr "" + +#: shell/e-shortcuts-view.c:394 msgid "Rename shortcut" msgstr "" -#: shell/e-shortcuts-view.c:380 +#: shell/e-shortcuts-view.c:395 msgid "Rename selected shortcut to:" msgstr "" -#: shell/e-shortcuts-view.c:392 +#: shell/e-shortcuts-view.c:408 msgid "Open the folder linked to this shortcut" msgstr "" -#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21 +#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24 msgid "Open in New _Window" msgstr "" -#: shell/e-shortcuts-view.c:394 +#: shell/e-shortcuts-view.c:410 msgid "Open the folder linked to this shortcut in a new window" msgstr "" -#: shell/e-shortcuts-view.c:397 +#: shell/e-shortcuts-view.c:413 msgid "_Rename" msgstr "" -#: shell/e-shortcuts-view.c:397 +#: shell/e-shortcuts-view.c:413 msgid "Rename this shortcut" msgstr "" -#: shell/e-shortcuts-view.c:399 +#: shell/e-shortcuts-view.c:415 msgid "Re_move" msgstr "" -#: shell/e-shortcuts-view.c:399 +#: shell/e-shortcuts-view.c:415 msgid "Remove this shortcut from the shortcut bar" msgstr "" -#: shell/e-shortcuts.c:621 +#: shell/e-shortcuts.c:641 msgid "Error saving shortcuts." msgstr "" -#: shell/e-shortcuts.c:1024 +#: shell/e-shortcuts.c:1080 msgid "Shortcuts" msgstr "" @@ -24677,55 +24891,55 @@ msgstr "" msgid "Checkbox" msgstr "" -#: shell/e-storage.c:485 +#: shell/e-storage.c:486 msgid "No error" msgstr "" -#: shell/e-storage.c:489 +#: shell/e-storage.c:490 msgid "A folder with the same name already exists" msgstr "" -#: shell/e-storage.c:491 +#: shell/e-storage.c:492 msgid "The specified folder type is not valid" msgstr "" -#: shell/e-storage.c:493 +#: shell/e-storage.c:494 msgid "I/O error" msgstr "" -#: shell/e-storage.c:495 +#: shell/e-storage.c:496 msgid "Not enough space to create the folder" msgstr "" -#: shell/e-storage.c:497 +#: shell/e-storage.c:498 msgid "The folder is not empty" msgstr "" -#: shell/e-storage.c:499 +#: shell/e-storage.c:500 msgid "The specified folder was not found" msgstr "" -#: shell/e-storage.c:501 +#: shell/e-storage.c:502 msgid "Function not implemented in this storage" msgstr "" -#: shell/e-storage.c:505 +#: shell/e-storage.c:506 msgid "Operation not supported" msgstr "" -#: shell/e-storage.c:507 +#: shell/e-storage.c:508 msgid "The specified type is not supported in this storage" msgstr "" -#: shell/e-storage.c:509 +#: shell/e-storage.c:510 msgid "The specified folder cannot be modified or removed" msgstr "" -#: shell/e-storage.c:511 +#: shell/e-storage.c:512 msgid "Cannot make a folder a child of one of its descendants" msgstr "" -#: shell/e-storage.c:513 +#: shell/e-storage.c:514 #, fuzzy msgid "Cannot create a folder with that name" msgstr "Can not create folder lock on %s: %s" @@ -24770,63 +24984,63 @@ msgid "" "%s" msgstr "" -#: shell/evolution-shell-component.c:1083 +#: shell/evolution-shell-component.c:1094 msgid "CORBA error" msgstr "" -#: shell/evolution-shell-component.c:1085 +#: shell/evolution-shell-component.c:1096 msgid "Interrupted" msgstr "" -#: shell/evolution-shell-component.c:1087 +#: shell/evolution-shell-component.c:1098 msgid "Invalid argument" msgstr "" -#: shell/evolution-shell-component.c:1089 +#: shell/evolution-shell-component.c:1100 msgid "Already has an owner" msgstr "" -#: shell/evolution-shell-component.c:1091 +#: shell/evolution-shell-component.c:1102 msgid "No owner" msgstr "" -#: shell/evolution-shell-component.c:1093 +#: shell/evolution-shell-component.c:1104 msgid "Not found" msgstr "" -#: shell/evolution-shell-component.c:1095 +#: shell/evolution-shell-component.c:1106 msgid "Unsupported type" msgstr "" -#: shell/evolution-shell-component.c:1097 +#: shell/evolution-shell-component.c:1108 msgid "Unsupported schema" msgstr "" -#: shell/evolution-shell-component.c:1099 +#: shell/evolution-shell-component.c:1110 msgid "Unsupported operation" msgstr "" -#: shell/evolution-shell-component.c:1101 +#: shell/evolution-shell-component.c:1112 msgid "Internal error" msgstr "" -#: shell/evolution-shell-component.c:1105 +#: shell/evolution-shell-component.c:1116 msgid "Exists" msgstr "" -#: shell/evolution-shell-component.c:1107 +#: shell/evolution-shell-component.c:1118 msgid "Invalid URI" msgstr "" -#: shell/evolution-shell-component.c:1111 +#: shell/evolution-shell-component.c:1122 msgid "Has subfolders" msgstr "" -#: shell/evolution-shell-component.c:1113 +#: shell/evolution-shell-component.c:1124 msgid "No space left" msgstr "" -#: shell/evolution-shell-component.c:1115 +#: shell/evolution-shell-component.c:1126 msgid "Old owner has died" msgstr "" @@ -24850,6 +25064,23 @@ msgstr "" msgid "The following connections are currently active:" msgstr "" +#: shell/glade/e-shell-config-default-folders.glade.h:1 +msgid "C_alendar:" +msgstr "" + +#: shell/glade/e-shell-config-default-folders.glade.h:2 +#, fuzzy +msgid "_Contacts:" +msgstr "_Other Organiser" + +#: shell/glade/e-shell-config-default-folders.glade.h:3 +msgid "_Mail:" +msgstr "" + +#: shell/glade/e-shell-config-default-folders.glade.h:4 +msgid "_Tasks:" +msgstr "" + #: shell/glade/e-shell-folder-creation-dialog.glade.h:1 msgid "Folder name:" msgstr "" @@ -24862,6 +25093,30 @@ msgstr "" msgid "Specify where to create the folder:" msgstr "" +#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1 +msgid "Blah blah." +msgstr "" + +#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2 +msgid "Insert some explanatory text here." +msgstr "" + +#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3 +msgid "Open Other User's Folder" +msgstr "" + +#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4 +msgid "_Folder Name:" +msgstr "" + +#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5 +msgid "_Server:" +msgstr "" + +#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6 +msgid "_User:" +msgstr "" + #: shell/glade/evolution-startup-wizard.glade.h:3 msgid "Evolution Setup Assistant" msgstr "" @@ -24946,15 +25201,15 @@ msgstr "" msgid "Evolution can import data from the following files:" msgstr "" -#: shell/main.c:91 +#: shell/main.c:92 msgid "Evolution" msgstr "" -#: shell/main.c:97 +#: shell/main.c:98 msgid "Evolution is now exiting ..." msgstr "" -#: shell/main.c:222 +#: shell/main.c:223 #, no-c-format msgid "" "Hi. Thanks for taking the time to download this preview release\n" @@ -24974,50 +25229,50 @@ msgid "" "eagerly await your contributions!\n" msgstr "" -#: shell/main.c:245 +#: shell/main.c:246 #, fuzzy msgid "" "Thanks\n" "The Ximian Evolution Team\n" msgstr "Can not initialise the Ximian Evolution shell." -#: shell/main.c:254 +#: shell/main.c:255 msgid "Don't tell me again" msgstr "" -#: shell/main.c:347 +#: shell/main.c:348 msgid "Cannot access the Ximian Evolution shell." msgstr "Can not initialise the Ximian Evolution shell." -#: shell/main.c:356 +#: shell/main.c:357 #, c-format msgid "Cannot initialize the Ximian Evolution shell: %s" msgstr "Can not initialise the Ximian Evolution shell." -#: shell/main.c:437 +#: shell/main.c:438 msgid "Disable splash screen" msgstr "" -#: shell/main.c:438 +#: shell/main.c:439 msgid "Start in offline mode" msgstr "" -#: shell/main.c:439 +#: shell/main.c:440 msgid "Start in online mode" msgstr "" -#: shell/main.c:440 +#: shell/main.c:441 msgid "Send the debugging output of all components to a file." msgstr "" -#: shell/main.c:458 +#: shell/main.c:459 #, c-format msgid "" "%s: --online and --offline cannot be used together.\n" " Use %s --help for more information.\n" msgstr "" -#: shell/main.c:488 +#: shell/main.c:490 msgid "Cannot initialize the Bonobo component system." msgstr "Can not initialise the Bonobo component system." @@ -25052,113 +25307,107 @@ msgstr "" msgid "Copy to Folder..." msgstr "" -#: ui/evolution-addressbook.xml.h:6 -msgid "Create new contact" -msgstr "" - -#: ui/evolution-addressbook.xml.h:7 -msgid "Create new contact list" -msgstr "" - -#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3 +#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3 msgid "Cut the selection" msgstr "" -#: ui/evolution-addressbook.xml.h:11 +#: ui/evolution-addressbook.xml.h:9 msgid "Delete selected contacts" msgstr "" -#: ui/evolution-addressbook.xml.h:13 +#: ui/evolution-addressbook.xml.h:11 msgid "Move Contact(s) to Another Folder..." msgstr "" -#: ui/evolution-addressbook.xml.h:14 +#: ui/evolution-addressbook.xml.h:12 msgid "Move to Folder..." msgstr "" -#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14 +#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14 msgid "Paste the clipboard" msgstr "" -#: ui/evolution-addressbook.xml.h:17 +#: ui/evolution-addressbook.xml.h:15 msgid "Previews the contacts to be printed" msgstr "" -#: ui/evolution-addressbook.xml.h:20 +#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16 +#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68 +#: ui/evolution-tasks.xml.h:12 +msgid "Print Pre_view" +msgstr "" + +#: ui/evolution-addressbook.xml.h:18 msgid "Print selected contacts" msgstr "" -#: ui/evolution-addressbook.xml.h:22 +#: ui/evolution-addressbook.xml.h:20 msgid "Save selected contacts as a VCard." msgstr "" -#: ui/evolution-addressbook.xml.h:23 +#: ui/evolution-addressbook.xml.h:21 msgid "Select All" msgstr "" -#: ui/evolution-addressbook.xml.h:24 +#: ui/evolution-addressbook.xml.h:22 msgid "Select all contacts" msgstr "" -#: ui/evolution-addressbook.xml.h:25 +#: ui/evolution-addressbook.xml.h:23 msgid "Send a mess to the selected contacts." msgstr "" -#: ui/evolution-addressbook.xml.h:26 +#: ui/evolution-addressbook.xml.h:24 msgid "Send message to contact" msgstr "" -#: ui/evolution-addressbook.xml.h:27 +#: ui/evolution-addressbook.xml.h:25 msgid "Send selected contacts to another person." msgstr "" -#: ui/evolution-addressbook.xml.h:28 +#: ui/evolution-addressbook.xml.h:26 msgid "Stop" msgstr "" -#: ui/evolution-addressbook.xml.h:29 +#: ui/evolution-addressbook.xml.h:27 msgid "Stop Loading" msgstr "" -#: ui/evolution-addressbook.xml.h:30 +#: ui/evolution-addressbook.xml.h:28 msgid "View the current contact" msgstr "" -#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25 +#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11 #: ui/evolution-contact-list-editor.xml.h:10 -#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14 -#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91 +#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16 +#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9 -#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37 +#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42 msgid "_Actions" msgstr "" -#: ui/evolution-addressbook.xml.h:33 -msgid "_Contact List" -msgstr "" - -#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13 +#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13 msgid "_Forward Contact..." msgstr "" -#: ui/evolution-addressbook.xml.h:38 +#: ui/evolution-addressbook.xml.h:35 msgid "_Move to Folder..." msgstr "" -#: ui/evolution-addressbook.xml.h:42 +#: ui/evolution-addressbook.xml.h:39 msgid "_Save as VCard" msgstr "" -#: ui/evolution-addressbook.xml.h:43 +#: ui/evolution-addressbook.xml.h:40 msgid "_Search for Contacts" msgstr "" -#: ui/evolution-addressbook.xml.h:44 +#: ui/evolution-addressbook.xml.h:41 msgid "_Select All" msgstr "" -#: ui/evolution-addressbook.xml.h:45 +#: ui/evolution-addressbook.xml.h:42 msgid "_Send Message to Contact..." msgstr "" @@ -25202,11 +25451,6 @@ msgstr "" msgid "Previews the calendar to be printed" msgstr "" -#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9 -#: ui/evolution-tasks.xml.h:12 -msgid "Print Pre_view" -msgstr "" - #: ui/evolution-calendar.xml.h:17 msgid "Print this calendar" msgstr "" @@ -25239,7 +25483,7 @@ msgstr "" #: ui/evolution-contact-list-editor.xml.h:1 #: ui/evolution-mail-messagedisplay.xml.h:1 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1 -#: ui/evolution.xml.h:4 +#: ui/evolution.xml.h:5 msgid "Close" msgstr "" @@ -25252,7 +25496,7 @@ msgid "Delete this item" msgstr "" #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5 -#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16 +#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19 msgid "Main toolbar" msgstr "" @@ -25264,8 +25508,8 @@ msgstr "" msgid "Print this item" msgstr "" -#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19 -#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233 +#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16 +#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154 msgid "Save" msgstr "" @@ -25290,9 +25534,9 @@ msgstr "" #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12 #: ui/evolution-contact-list-editor.xml.h:11 #: ui/evolution-mail-messagedisplay.xml.h:7 -#: ui/evolution-message-composer.xml.h:48 -#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11 -#: ui/evolution.xml.h:42 +#: ui/evolution-message-composer.xml.h:42 +#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11 +#: ui/evolution.xml.h:46 msgid "_File" msgstr "" @@ -25302,7 +25546,7 @@ msgstr "" #: ui/evolution-contact-editor.xml.h:7 #: ui/evolution-contact-list-editor.xml.h:5 -#: ui/evolution-message-composer.xml.h:21 +#: ui/evolution-message-composer.xml.h:18 msgid "Save _As..." msgstr "" @@ -25316,8 +25560,8 @@ msgstr "" #: ui/evolution-contact-editor.xml.h:15 #: ui/evolution-contact-list-editor.xml.h:12 -#: ui/evolution-message-composer.xml.h:53 -#: ui/evolution-signature-editor.xml.h:14 +#: ui/evolution-message-composer.xml.h:47 +#: ui/evolution-signature-editor.xml.h:15 msgid "_Save" msgstr "" @@ -25414,26 +25658,36 @@ msgid "Permanently remove all deleted messages from all folders" msgstr "" #: ui/evolution-mail-global.xml.h:11 +#, fuzzy +msgid "Post New Message" +msgstr "Can not open message" + +#: ui/evolution-mail-global.xml.h:12 +#, fuzzy +msgid "Post a message to a Public folder" +msgstr "Can not append message to maildir folder: %s: %s" + +#: ui/evolution-mail-global.xml.h:13 msgid "Show message preview window" msgstr "" -#: ui/evolution-mail-global.xml.h:12 +#: ui/evolution-mail-global.xml.h:14 msgid "Subscribe or unsubscribe to folders on remote servers" msgstr "" -#: ui/evolution-mail-global.xml.h:13 +#: ui/evolution-mail-global.xml.h:15 msgid "Virtual Folder _Editor..." msgstr "" -#: ui/evolution-mail-global.xml.h:15 +#: ui/evolution-mail-global.xml.h:17 msgid "_Filters..." msgstr "" -#: ui/evolution-mail-global.xml.h:17 +#: ui/evolution-mail-global.xml.h:18 msgid "_Preview Pane" msgstr "" -#: ui/evolution-mail-global.xml.h:18 +#: ui/evolution-mail-global.xml.h:19 msgid "_Subscribe to Folders..." msgstr "" @@ -25530,7 +25784,7 @@ msgstr "" msgid "_Expunge" msgstr "" -#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43 +#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47 msgid "_Folder" msgstr "" @@ -25775,174 +26029,187 @@ msgid "P_revious Unread Message" msgstr "" #: ui/evolution-mail-message.xml.h:62 -msgid "Pr_evious Important Message" +msgid "Post a Reply" msgstr "" #: ui/evolution-mail-message.xml.h:63 +#, fuzzy +msgid "Post a reply to a message message in a Public folder" +msgstr "You can not copy messages from this rubbish bin." + +#: ui/evolution-mail-message.xml.h:64 +msgid "Pr_evious Important Message" +msgstr "" + +#: ui/evolution-mail-message.xml.h:65 msgid "Preview the message to be printed" msgstr "" -#: ui/evolution-mail-message.xml.h:64 +#: ui/evolution-mail-message.xml.h:66 msgid "Previous" msgstr "" -#: ui/evolution-mail-message.xml.h:67 +#: ui/evolution-mail-message.xml.h:69 msgid "Print this message" msgstr "" -#: ui/evolution-mail-message.xml.h:68 +#: ui/evolution-mail-message.xml.h:70 msgid "Re_direct" msgstr "" -#: ui/evolution-mail-message.xml.h:69 +#: ui/evolution-mail-message.xml.h:71 msgid "Redirect (bounce) the selected message to someone" msgstr "" -#: ui/evolution-mail-message.xml.h:74 +#: ui/evolution-mail-message.xml.h:76 msgid "Reset the text to its original size" msgstr "" -#: ui/evolution-mail-message.xml.h:75 +#: ui/evolution-mail-message.xml.h:77 msgid "S_earch Message..." msgstr "" -#: ui/evolution-mail-message.xml.h:76 +#: ui/evolution-mail-message.xml.h:78 msgid "S_maller" msgstr "" -#: ui/evolution-mail-message.xml.h:77 +#: ui/evolution-mail-message.xml.h:79 msgid "Save the message as a text file" msgstr "" -#: ui/evolution-mail-message.xml.h:78 +#: ui/evolution-mail-message.xml.h:80 msgid "Search for text in the body of the displayed message" msgstr "" -#: ui/evolution-mail-message.xml.h:79 +#: ui/evolution-mail-message.xml.h:81 msgid "Setup the page settings for your current printer" msgstr "" -#: ui/evolution-mail-message.xml.h:80 +#: ui/evolution-mail-message.xml.h:82 msgid "Show Email _Source" msgstr "" -#: ui/evolution-mail-message.xml.h:81 +#: ui/evolution-mail-message.xml.h:83 msgid "Show Full _Headers" msgstr "" -#: ui/evolution-mail-message.xml.h:82 +#: ui/evolution-mail-message.xml.h:84 msgid "Show message in the normal style" msgstr "" -#: ui/evolution-mail-message.xml.h:83 +#: ui/evolution-mail-message.xml.h:85 msgid "Show message with all email headers" msgstr "" -#: ui/evolution-mail-message.xml.h:84 +#: ui/evolution-mail-message.xml.h:86 msgid "Show the raw email source of the message" msgstr "" -#: ui/evolution-mail-message.xml.h:85 +#: ui/evolution-mail-message.xml.h:87 msgid "Text Si_ze" msgstr "" -#: ui/evolution-mail-message.xml.h:86 +#: ui/evolution-mail-message.xml.h:88 msgid "Un-delete the selected messages" msgstr "" -#: ui/evolution-mail-message.xml.h:87 +#: ui/evolution-mail-message.xml.h:89 msgid "VFolder on Mailing _List..." msgstr "" -#: ui/evolution-mail-message.xml.h:88 +#: ui/evolution-mail-message.xml.h:90 msgid "VFolder on Se_nder..." msgstr "" -#: ui/evolution-mail-message.xml.h:89 +#: ui/evolution-mail-message.xml.h:91 msgid "VFolder on _Recipients..." msgstr "" -#: ui/evolution-mail-message.xml.h:90 +#: ui/evolution-mail-message.xml.h:92 msgid "VFolder on _Subject..." msgstr "" -#: ui/evolution-mail-message.xml.h:92 +#: ui/evolution-mail-message.xml.h:94 msgid "_Attached" msgstr "" -#: ui/evolution-mail-message.xml.h:93 +#: ui/evolution-mail-message.xml.h:95 msgid "_Copy to Folder" msgstr "" -#: ui/evolution-mail-message.xml.h:94 +#: ui/evolution-mail-message.xml.h:96 msgid "_Create Filter From Message" msgstr "" -#: ui/evolution-mail-message.xml.h:97 +#: ui/evolution-mail-message.xml.h:98 msgid "_Forward Message" msgstr "" -#: ui/evolution-mail-message.xml.h:98 +#: ui/evolution-mail-message.xml.h:99 msgid "_Go To" msgstr "" -#: ui/evolution-mail-message.xml.h:99 +#: ui/evolution-mail-message.xml.h:100 msgid "_Inline" msgstr "" -#: ui/evolution-mail-message.xml.h:100 +#: ui/evolution-mail-message.xml.h:101 msgid "_Larger" msgstr "" -#: ui/evolution-mail-message.xml.h:101 +#: ui/evolution-mail-message.xml.h:102 msgid "_Message Display" msgstr "" -#: ui/evolution-mail-message.xml.h:102 +#: ui/evolution-mail-message.xml.h:103 msgid "_Move to Folder" msgstr "" -#: ui/evolution-mail-message.xml.h:103 +#: ui/evolution-mail-message.xml.h:104 msgid "_Next Message" msgstr "" -#: ui/evolution-mail-message.xml.h:104 +#: ui/evolution-mail-message.xml.h:105 msgid "_Normal Display" msgstr "" -#: ui/evolution-mail-message.xml.h:105 +#: ui/evolution-mail-message.xml.h:106 msgid "_Open Message" msgstr "" -#: ui/evolution-mail-message.xml.h:106 +#: ui/evolution-mail-message.xml.h:107 msgid "_Previous Message" msgstr "" -#: ui/evolution-mail-message.xml.h:108 +#: ui/evolution-mail-message.xml.h:109 msgid "_Quoted" msgstr "" -#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56 +#: ui/evolution-mail-message.xml.h:111 +msgid "_Resend..." +msgstr "" + +#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61 msgid "_Tools" msgstr "" -#: ui/evolution-mail-message.xml.h:112 +#: ui/evolution-mail-message.xml.h:114 msgid "_Undelete" msgstr "" -#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5 +#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6 msgid "Close this window" msgstr "" #: ui/evolution-mail-messagedisplay.xml.h:5 -#: ui/evolution-message-composer.xml.h:45 -#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9 -#: ui/evolution.xml.h:38 +#: ui/evolution-message-composer.xml.h:39 +#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9 +#: ui/evolution.xml.h:43 msgid "_Close" msgstr "" #: ui/evolution-mail-messagedisplay.xml.h:8 -#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57 +#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62 msgid "_View" msgstr "" @@ -25970,169 +26237,157 @@ msgstr "" msgid "For_mat" msgstr "" -#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4 -msgid "H_TML" +#: ui/evolution-message-composer.xml.h:9 +msgid "HT_ML" msgstr "" #: ui/evolution-message-composer.xml.h:10 -msgid "Inline Text _File..." -msgstr "" - -#: ui/evolution-message-composer.xml.h:11 -msgid "Insert a file as text into the message" -msgstr "" - -#: ui/evolution-message-composer.xml.h:12 -msgid "Insert text file..." -msgstr "" - -#: ui/evolution-message-composer.xml.h:13 msgid "Open" msgstr "" -#: ui/evolution-message-composer.xml.h:14 +#: ui/evolution-message-composer.xml.h:11 msgid "Open a file" msgstr "" -#: ui/evolution-message-composer.xml.h:15 +#: ui/evolution-message-composer.xml.h:12 msgid "PGP Encrypt" msgstr "" -#: ui/evolution-message-composer.xml.h:16 +#: ui/evolution-message-composer.xml.h:13 msgid "PGP Sign" msgstr "" -#: ui/evolution-message-composer.xml.h:17 +#: ui/evolution-message-composer.xml.h:14 msgid "S/MIME Encrypt" msgstr "" -#: ui/evolution-message-composer.xml.h:18 +#: ui/evolution-message-composer.xml.h:15 msgid "S/MIME Sign" msgstr "" -#: ui/evolution-message-composer.xml.h:20 +#: ui/evolution-message-composer.xml.h:17 msgid "Save As" msgstr "" -#: ui/evolution-message-composer.xml.h:22 +#: ui/evolution-message-composer.xml.h:19 msgid "Save _Draft" msgstr "" -#: ui/evolution-message-composer.xml.h:23 +#: ui/evolution-message-composer.xml.h:20 msgid "Save in folder..." msgstr "" -#: ui/evolution-message-composer.xml.h:24 +#: ui/evolution-message-composer.xml.h:21 #: ui/evolution-signature-editor.xml.h:7 msgid "Save the current file" msgstr "" -#: ui/evolution-message-composer.xml.h:25 +#: ui/evolution-message-composer.xml.h:22 msgid "Save the current file with a different name" msgstr "" -#: ui/evolution-message-composer.xml.h:26 +#: ui/evolution-message-composer.xml.h:23 msgid "Save the message in a specified folder" msgstr "" -#: ui/evolution-message-composer.xml.h:27 +#: ui/evolution-message-composer.xml.h:24 msgid "Send" msgstr "" -#: ui/evolution-message-composer.xml.h:28 -msgid "Send _Later" -msgstr "" - -#: ui/evolution-message-composer.xml.h:29 -msgid "Send _later" -msgstr "" - -#: ui/evolution-message-composer.xml.h:30 -#: ui/evolution-signature-editor.xml.h:8 +#: ui/evolution-message-composer.xml.h:25 +#: ui/evolution-signature-editor.xml.h:9 msgid "Send the mail in HTML format" msgstr "" -#: ui/evolution-message-composer.xml.h:31 -msgid "Send the message later" -msgstr "" - -#: ui/evolution-message-composer.xml.h:32 -msgid "Send this message now" +#: ui/evolution-message-composer.xml.h:26 +msgid "Send this message" msgstr "" -#: ui/evolution-message-composer.xml.h:33 +#: ui/evolution-message-composer.xml.h:27 msgid "Show / hide attachments" msgstr "" -#: ui/evolution-message-composer.xml.h:34 +#: ui/evolution-message-composer.xml.h:28 msgid "Show _attachments" msgstr "" -#: ui/evolution-message-composer.xml.h:35 +#: ui/evolution-message-composer.xml.h:29 msgid "Show attachments" msgstr "" -#: ui/evolution-message-composer.xml.h:36 +#: ui/evolution-message-composer.xml.h:30 msgid "Sign this message with your PGP key" msgstr "" -#: ui/evolution-message-composer.xml.h:37 +#: ui/evolution-message-composer.xml.h:31 msgid "Sign this message with your S/MIME Signature Certificate" msgstr "" -#: ui/evolution-message-composer.xml.h:38 +#: ui/evolution-message-composer.xml.h:32 msgid "Toggles whether the BCC field is displayed" msgstr "" -#: ui/evolution-message-composer.xml.h:39 +#: ui/evolution-message-composer.xml.h:33 msgid "Toggles whether the CC field is displayed" msgstr "" -#: ui/evolution-message-composer.xml.h:40 +#: ui/evolution-message-composer.xml.h:34 msgid "Toggles whether the From chooser is displayed" msgstr "" -#: ui/evolution-message-composer.xml.h:41 +#: ui/evolution-message-composer.xml.h:35 msgid "Toggles whether the Reply-To field is displayed" msgstr "" -#: ui/evolution-message-composer.xml.h:42 +#: ui/evolution-message-composer.xml.h:36 msgid "_Attachment..." msgstr "" -#: ui/evolution-message-composer.xml.h:43 +#: ui/evolution-message-composer.xml.h:37 msgid "_Bcc Field" msgstr "" -#: ui/evolution-message-composer.xml.h:44 +#: ui/evolution-message-composer.xml.h:38 msgid "_Cc Field" msgstr "" -#: ui/evolution-message-composer.xml.h:46 +#: ui/evolution-message-composer.xml.h:40 msgid "_Delete all" msgstr "" -#: ui/evolution-message-composer.xml.h:49 +#: ui/evolution-message-composer.xml.h:43 msgid "_From Field" msgstr "" -#: ui/evolution-message-composer.xml.h:50 -#: ui/evolution-signature-editor.xml.h:13 +#: ui/evolution-message-composer.xml.h:44 +#: ui/evolution-signature-editor.xml.h:14 msgid "_Insert" msgstr "" -#: ui/evolution-message-composer.xml.h:51 +#: ui/evolution-message-composer.xml.h:45 msgid "_Open..." msgstr "" -#: ui/evolution-message-composer.xml.h:52 +#: ui/evolution-message-composer.xml.h:46 msgid "_Reply-To Field" msgstr "" -#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46 +#: ui/evolution-signature-editor.xml.h:4 +msgid "H_TML" +msgstr "" + +#: ui/evolution-signature-editor.xml.h:8 +msgid "Save the current file and close the window" +msgstr "" + +#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51 msgid "_Help" msgstr "" +#: ui/evolution-signature-editor.xml.h:16 +msgid "_Signature editor" +msgstr "" + #: ui/evolution-subscribe.xml.h:1 msgid "Add folder to your list of subscribed folders" msgstr "" @@ -26226,167 +26481,191 @@ msgid "Add to _Shortcut Bar" msgstr "" #: ui/evolution.xml.h:3 +msgid "Change Evolution's settings" +msgstr "" + +#: ui/evolution.xml.h:4 msgid "Change the name of this folder" msgstr "" -#: ui/evolution.xml.h:6 +#: ui/evolution.xml.h:7 msgid "Copy this folder" msgstr "" -#: ui/evolution.xml.h:7 +#: ui/evolution.xml.h:8 msgid "Create _New Folder..." msgstr "" -#: ui/evolution.xml.h:8 +#: ui/evolution.xml.h:9 msgid "Create a link to this folder in the shortcut bar" msgstr "" -#: ui/evolution.xml.h:9 +#: ui/evolution.xml.h:10 msgid "Create a new folder" msgstr "" -#: ui/evolution.xml.h:10 +#: ui/evolution.xml.h:11 +msgid "Create a new shortcut" +msgstr "" + +#: ui/evolution.xml.h:12 +msgid "Create a new window displaying this folder" +msgstr "" + +#: ui/evolution.xml.h:13 msgid "Delete this folder" msgstr "" -#: ui/evolution.xml.h:11 +#: ui/evolution.xml.h:14 msgid "Display a different folder" msgstr "" -#: ui/evolution.xml.h:12 +#: ui/evolution.xml.h:15 msgid "E_xit" msgstr "" -#: ui/evolution.xml.h:13 +#: ui/evolution.xml.h:16 msgid "Evolution _Window" msgstr "" -#: ui/evolution.xml.h:14 +#: ui/evolution.xml.h:17 msgid "Exit the program" msgstr "" -#: ui/evolution.xml.h:15 +#: ui/evolution.xml.h:18 msgid "Import data from other programs" msgstr "" -#: ui/evolution.xml.h:17 +#: ui/evolution.xml.h:20 msgid "Move this folder to another place" msgstr "" -#: ui/evolution.xml.h:18 +#: ui/evolution.xml.h:21 msgid "Open Other _User's Folder..." msgstr "" -#: ui/evolution.xml.h:19 +#: ui/evolution.xml.h:22 msgid "Open a folder that is made available by some other user on the server" msgstr "" -#: ui/evolution.xml.h:20 +#: ui/evolution.xml.h:23 msgid "Open in New Window" msgstr "" -#: ui/evolution.xml.h:22 +#: ui/evolution.xml.h:25 msgid "Open this folder in an other window" msgstr "" -#: ui/evolution.xml.h:23 +#: ui/evolution.xml.h:26 +msgid "Pi_lot Settings..." +msgstr "" + +#: ui/evolution.xml.h:27 msgid "Send / Receive" msgstr "" -#: ui/evolution.xml.h:24 +#: ui/evolution.xml.h:28 msgid "Send queued items and retrieve new items" msgstr "" -#: ui/evolution.xml.h:25 +#: ui/evolution.xml.h:29 +msgid "Set up Pilot configuration" +msgstr "" + +#: ui/evolution.xml.h:30 msgid "Show information about Ximian Evolution" msgstr "" -#: ui/evolution.xml.h:26 +#: ui/evolution.xml.h:31 msgid "Submit Bug Report" msgstr "" -#: ui/evolution.xml.h:27 +#: ui/evolution.xml.h:32 msgid "Submit _Bug Report" msgstr "" -#: ui/evolution.xml.h:28 +#: ui/evolution.xml.h:33 msgid "Submit a bug report using Bug Buddy" msgstr "" -#: ui/evolution.xml.h:29 +#: ui/evolution.xml.h:34 msgid "Toggle" msgstr "" -#: ui/evolution.xml.h:30 +#: ui/evolution.xml.h:35 msgid "Toggle whether to show the folder bar" msgstr "" -#: ui/evolution.xml.h:31 +#: ui/evolution.xml.h:36 msgid "Toggle whether to show the shortcut bar" msgstr "" -#: ui/evolution.xml.h:32 +#: ui/evolution.xml.h:37 msgid "Toggle whether we are working offline." msgstr "" -#: ui/evolution.xml.h:33 +#: ui/evolution.xml.h:38 msgid "View the selected folder" msgstr "" -#: ui/evolution.xml.h:35 +#: ui/evolution.xml.h:40 msgid "Ximian Evolution _FAQ" msgstr "" -#: ui/evolution.xml.h:36 +#: ui/evolution.xml.h:41 msgid "_About Ximian Evolution..." msgstr "" -#: ui/evolution.xml.h:40 +#: ui/evolution.xml.h:44 msgid "_Copy..." msgstr "" -#: ui/evolution.xml.h:44 +#: ui/evolution.xml.h:48 msgid "_Folder Bar" msgstr "" -#: ui/evolution.xml.h:45 +#: ui/evolution.xml.h:49 +msgid "_Folder..." +msgstr "" + +#: ui/evolution.xml.h:50 msgid "_Go to Folder..." msgstr "" -#: ui/evolution.xml.h:47 +#: ui/evolution.xml.h:52 msgid "_Import..." msgstr "" -#: ui/evolution.xml.h:48 +#: ui/evolution.xml.h:53 msgid "_Move..." msgstr "" -#: ui/evolution.xml.h:49 +#: ui/evolution.xml.h:54 msgid "_New" msgstr "" -#: ui/evolution.xml.h:50 +#: ui/evolution.xml.h:55 msgid "_New Folder" msgstr "" -#: ui/evolution.xml.h:51 -msgid "_Pilot Settings..." +#: ui/evolution.xml.h:56 +msgid "_Preferences..." msgstr "" -#: ui/evolution.xml.h:52 +#: ui/evolution.xml.h:57 msgid "_Rename..." msgstr "" -#: ui/evolution.xml.h:53 +#: ui/evolution.xml.h:58 msgid "_Send / Receive" msgstr "" -#: ui/evolution.xml.h:54 -msgid "_Shortcut" +#: ui/evolution.xml.h:59 +msgid "_Shortcut Bar" msgstr "" -#: ui/evolution.xml.h:55 -msgid "_Shortcut Bar" +#: ui/evolution.xml.h:60 +msgid "_Shortcut..." msgstr "" #: ui/my-evolution.xml.h:3 @@ -26402,15 +26681,31 @@ msgid "Reload the view" msgstr "" #: views/addressbook/galview.xml.h:1 -msgid "Address Cards" +msgid "By _Company" msgstr "" #: views/addressbook/galview.xml.h:2 -msgid "By Company" +msgid "_Address Cards" msgstr "" #: views/addressbook/galview.xml.h:3 -msgid "Phone List" +msgid "_Phone List" +msgstr "" + +#: views/calendar/galview.xml.h:1 +msgid "W_eek View" +msgstr "" + +#: views/calendar/galview.xml.h:2 +msgid "_Day View" +msgstr "" + +#: views/calendar/galview.xml.h:3 +msgid "_Month View" +msgstr "" + +#: views/calendar/galview.xml.h:4 +msgid "_Work Week View" msgstr "" #: views/mail/galview.xml.h:1 @@ -26437,13 +26732,17 @@ msgstr "" msgid "Messages" msgstr "" +#: views/tasks/galview.xml.h:1 +msgid "With _Category" +msgstr "" + #: views/tasks/galview.xml.h:2 -msgid "With Category" +msgid "_Tasks" msgstr "" #. Check for UTC. -#: widgets/e-timezone-dialog/e-timezone-dialog.c:207 -#: widgets/e-timezone-dialog/e-timezone-dialog.c:700 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:209 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:702 msgid "UTC" msgstr "" @@ -26592,11 +26891,11 @@ msgstr "" msgid "..." msgstr "" -#: widgets/misc/e-filter-bar.c:146 +#: widgets/misc/e-filter-bar.c:188 msgid "Search Editor" msgstr "" -#: widgets/misc/e-filter-bar.c:162 +#: widgets/misc/e-filter-bar.c:210 msgid "Save Search" msgstr "" @@ -26633,19 +26932,19 @@ msgstr "" msgid "Don't show this message again." msgstr "" -#: widgets/misc/e-search-bar.c:512 +#: widgets/misc/e-search-bar.c:519 msgid "_Find Now" msgstr "" -#: widgets/misc/e-search-bar.c:513 +#: widgets/misc/e-search-bar.c:520 msgid "_Clear" msgstr "" -#: widgets/misc/e-search-bar.c:875 +#: widgets/misc/e-search-bar.c:893 msgid "Clear" msgstr "" -#: widgets/misc/e-search-bar.c:877 +#: widgets/misc/e-search-bar.c:895 msgid "Find Now" msgstr "" @@ -26659,15 +26958,15 @@ msgstr "" msgid "The Personal Calendar Server; calendar factory" msgstr "" -#: wombat/wombat.c:200 +#: wombat/wombat.c:199 msgid "setup_vfs(): could not initialize GNOME-VFS" msgstr "Could not initialise GNOME-VFS" -#: wombat/wombat.c:212 +#: wombat/wombat.c:211 msgid "init_corba(): could not initialize GNOME" msgstr "Could not initialise GNOME" -#: wombat/wombat.c:225 +#: wombat/wombat.c:224 msgid "init_bonobo(): could not initialize Bonobo" msgstr "Could not initialise Bonobo" |