diff options
| author | Adam Weinberger <adamw@src.gnome.org> | 2004-09-22 01:39:24 +0800 |
|---|---|---|
| committer | Adam Weinberger <adamw@src.gnome.org> | 2004-09-22 01:39:24 +0800 |
| commit | fc67e299211369cb086dde9389b229fab7e10a0a (patch) | |
| tree | 2f1277c660229bb5b60f854595544397305e8d2e | |
| parent | c54cde7cd6faf8a1fa1622e45d92bb8f98d400e9 (diff) | |
| download | gsoc2013-evolution-fc67e299211369cb086dde9389b229fab7e10a0a.tar gsoc2013-evolution-fc67e299211369cb086dde9389b229fab7e10a0a.tar.gz gsoc2013-evolution-fc67e299211369cb086dde9389b229fab7e10a0a.tar.bz2 gsoc2013-evolution-fc67e299211369cb086dde9389b229fab7e10a0a.tar.lz gsoc2013-evolution-fc67e299211369cb086dde9389b229fab7e10a0a.tar.xz gsoc2013-evolution-fc67e299211369cb086dde9389b229fab7e10a0a.tar.zst gsoc2013-evolution-fc67e299211369cb086dde9389b229fab7e10a0a.zip | |
Updated Canadian English translation.
* en_CA.po: Updated Canadian English translation.
svn path=/trunk/; revision=27324
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/en_CA.po | 2181 |
2 files changed, 1089 insertions, 1096 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index dd0da85bdc..e58bbda626 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2004-09-21 Adam Weinberger <adamw@gnome.org> + + * en_CA.po: Updated Canadian English translation. + 2004-09-21 Roozbeh Pournader <roozbeh@sharif.edu> * fa.po: Updated Persian translation by Meelad Zakaria diff --git a/po/en_CA.po b/po/en_CA.po index 4f08898a23..2b004ecb68 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: evolution\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-09-10 17:50-0400\n" -"PO-Revision-Date: 2004-09-10 19:18-0400\n" +"POT-Creation-Date: 2004-09-21 13:34-0400\n" +"PO-Revision-Date: 2004-09-21 19:18-0400\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: Canadian English <adamw@FreeBSD.org>\n" "MIME-Version: 1.0\n" @@ -345,7 +345,7 @@ msgstr "Migrating `%s':" #: addressbook/gui/component/addressbook-migrate.c:493 #: calendar/gui/migration.c:450 calendar/gui/migration.c:532 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198 -#: mail/mail-component.c:249 mail/mail-vfolder.c:218 +#: mail/mail-component.c:251 mail/mail-vfolder.c:218 msgid "On This Computer" msgstr "On This Computer" @@ -357,7 +357,7 @@ msgstr "On This Computer" #: addressbook/gui/contact-editor/contact-editor.glade.h:34 #: calendar/gui/migration.c:458 calendar/gui/migration.c:540 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78 -#: mail/mail-config.glade.h:109 +#: mail/mail-config.glade.h:99 msgid "Personal" msgstr "Personal" @@ -546,8 +546,7 @@ msgstr "Add Address Book" msgid "Address Book Properties" msgstr "Address Book Properties" -#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79 -#: mail/mail-config.glade.h:42 +#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:86 msgid "Always" msgstr "Always" @@ -584,7 +583,8 @@ msgstr "Find Possible Search Bases" #: addressbook/gui/component/ldap-config.glade.h:23 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 -#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27 +#: mail/em-folder-properties.c:212 mail/mail-config.glade.h:82 +#: smime/gui/smime-ui.glade.h:27 msgid "General" msgstr "General" @@ -592,8 +592,7 @@ msgstr "General" msgid "Lo_gin:" msgstr "Lo_gin:" -#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81 -#: mail/mail-config.glade.h:102 +#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:88 msgid "Never" msgstr "Never" @@ -717,8 +716,7 @@ msgstr "Using distinguished name (DN)" msgid "Using email address" msgstr "Using email address" -#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80 -#: mail/mail-config.glade.h:156 +#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:87 msgid "Whenever Possible" msgstr "Whenever Possible" @@ -739,7 +737,7 @@ msgid "_Log in method:" msgstr "_Log in method:" #: addressbook/gui/component/ldap-config.glade.h:47 -#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171 +#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:158 msgid "_Name:" msgstr "_Name:" @@ -770,7 +768,6 @@ msgstr "cards" #: addressbook/gui/component/ldap-config.glade.h:54 #: calendar/gui/dialogs/alarm-dialog.glade.h:27 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15 -#: mail/mail-config.glade.h:183 msgid "minutes" msgstr "minutes" @@ -1025,7 +1022,7 @@ msgstr "Web Log:" #: addressbook/gui/contact-editor/e-contact-editor-im.c:244 #: addressbook/gui/contact-editor/e-contact-editor.c:201 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77 -#: mail/mail-config.glade.h:157 +#: mail/mail-config.glade.h:143 msgid "Work" msgstr "Work" @@ -1042,7 +1039,7 @@ msgid "_File under:" msgstr "_File under:" #: addressbook/gui/contact-editor/contact-editor.glade.h:47 -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13 msgid "_Where:" msgstr "_Where:" @@ -2113,19 +2110,19 @@ msgstr "Writable Fields" msgid "Changed" msgstr "Changed" -#: addressbook/gui/contact-editor/e-contact-editor.c:2456 +#: addressbook/gui/contact-editor/e-contact-editor.c:2457 msgid "This contact belongs to these categories:" msgstr "This contact belongs to these categories:" -#: addressbook/gui/contact-editor/e-contact-editor.c:2549 +#: addressbook/gui/contact-editor/e-contact-editor.c:2550 msgid "Please select an image for this contact" msgstr "Please select an image for this contact" -#: addressbook/gui/contact-editor/e-contact-editor.c:2550 +#: addressbook/gui/contact-editor/e-contact-editor.c:2551 msgid "No image" msgstr "No image" -#: addressbook/gui/contact-editor/e-contact-editor.c:2778 +#: addressbook/gui/contact-editor/e-contact-editor.c:2779 msgid "" "The contact data is invalid:\n" "\n" @@ -2133,7 +2130,7 @@ msgstr "" "The contact data is invalid:\n" "\n" -#: addressbook/gui/contact-editor/e-contact-editor.c:2806 +#: addressbook/gui/contact-editor/e-contact-editor.c:2807 msgid "Invalid contact." msgstr "Invalid contact." @@ -2146,7 +2143,7 @@ msgid "_Edit Full" msgstr "_Edit Full" #: addressbook/gui/contact-editor/e-contact-quick-add.c:301 -#: mail/mail-config.glade.h:166 +#: mail/mail-config.glade.h:153 msgid "_Full Name:" msgstr "_Full Name:" @@ -2296,39 +2293,39 @@ msgid "Add an email to the List" msgstr "Add an email to the List" #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813 +msgid "Contact List Editor" +msgstr "Contact List Editor" + +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6 msgid "Insert email adresses from Adress Book" msgstr "Insert email addresses from Address Book" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714 msgid "Members" msgstr "Members" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8 msgid "Remove an email address from the List" msgstr "Remove an email address from the List" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9 msgid "Select" msgstr "Select" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10 msgid "_Hide addresses when sending mail to this list" msgstr "_Hide addresses when sending mail to this list" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11 msgid "_List name:" msgstr "_List name:" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12 msgid "_Type an email address or drag a contact into the list below:" msgstr "_Type an email address or drag a contact into the list below:" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13 -#: smime/gui/smime-ui.glade.h:48 -msgid "dialog1" -msgstr "dialog1" - #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:165 #: addressbook/gui/widgets/e-addressbook-model.c:295 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378 @@ -2348,10 +2345,6 @@ msgstr "Is New List" msgid "Required Participants" msgstr "Required Participants" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813 -msgid "Contact List Editor" -msgstr "Contact List Editor" - #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1 msgid "Changed Contact:" msgstr "Changed Contact:" @@ -2905,8 +2898,8 @@ msgstr "Protocol not supported" #: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349 #: camel/camel-service.c:724 camel/camel-service.c:762 #: camel/camel-service.c:846 camel/camel-service.c:886 -#: camel/providers/pop3/camel-pop3-store.c:456 -#: camel/providers/pop3/camel-pop3-store.c:537 +#: camel/providers/pop3/camel-pop3-store.c:457 +#: camel/providers/pop3/camel-pop3-store.c:538 msgid "Cancelled" msgstr "Canceled" @@ -3307,6 +3300,11 @@ msgid "Number of columns:" msgstr "Number of columns:" #: addressbook/printing/e-contact-print.glade.h:23 +#: camel/providers/groupwise/camel-groupwise-provider.c:59 +#: camel/providers/imap/camel-imap-provider.c:64 +#: camel/providers/local/camel-local-provider.c:43 +#: camel/providers/local/camel-local-provider.c:79 +#: camel/providers/local/camel-local-provider.c:99 msgid "Options" msgstr "Options" @@ -3484,7 +3482,7 @@ msgstr "Input File" msgid "No filename provided." msgstr "No filename provided." -#: addressbook/util/e-destination.c:577 +#: addressbook/util/e-destination.c:578 msgid "Unnamed List" msgstr "Unnamed List" @@ -3776,15 +3774,15 @@ msgstr "Enter password" msgid "Split Multi-Day Events:" msgstr "Split Multi-Day Events:" -#: calendar/conduits/calendar/calendar-conduit.c:1356 -#: calendar/conduits/calendar/calendar-conduit.c:1357 +#: calendar/conduits/calendar/calendar-conduit.c:1359 +#: calendar/conduits/calendar/calendar-conduit.c:1360 #: calendar/conduits/todo/todo-conduit.c:879 #: calendar/conduits/todo/todo-conduit.c:880 msgid "Could not start evolution-data-server" msgstr "Could not start evolution-data-server" -#: calendar/conduits/calendar/calendar-conduit.c:1465 #: calendar/conduits/calendar/calendar-conduit.c:1468 +#: calendar/conduits/calendar/calendar-conduit.c:1471 msgid "Could not read pilot's Calendar application block" msgstr "Could not read pilot's Calendar application block" @@ -3885,24 +3883,24 @@ msgstr "_Edit appointment" msgid "_Snooze" msgstr "_Snooze" -#: calendar/gui/alarm-notify/alarm-queue.c:904 +#: calendar/gui/alarm-notify/alarm-queue.c:893 #: ui/evolution-message-composer.xml.h:10 msgid "Open" msgstr "Open" -#: calendar/gui/alarm-notify/alarm-queue.c:906 +#: calendar/gui/alarm-notify/alarm-queue.c:895 msgid "Dismiss" msgstr "Dismiss" -#: calendar/gui/alarm-notify/alarm-queue.c:908 +#: calendar/gui/alarm-notify/alarm-queue.c:897 msgid "Dismiss All" msgstr "Dismiss All" -#: calendar/gui/alarm-notify/alarm-queue.c:973 +#: calendar/gui/alarm-notify/alarm-queue.c:962 msgid "No description available." msgstr "No description available." -#: calendar/gui/alarm-notify/alarm-queue.c:992 +#: calendar/gui/alarm-notify/alarm-queue.c:981 #, c-format msgid "" "Alarm on %s\n" @@ -3915,12 +3913,12 @@ msgstr "" "Starting at %s\n" "Ending at %s" -#: calendar/gui/alarm-notify/alarm-queue.c:1092 -#: calendar/gui/alarm-notify/alarm-queue.c:1116 +#: calendar/gui/alarm-notify/alarm-queue.c:1081 +#: calendar/gui/alarm-notify/alarm-queue.c:1105 msgid "Warning" msgstr "Warning" -#: calendar/gui/alarm-notify/alarm-queue.c:1096 +#: calendar/gui/alarm-notify/alarm-queue.c:1085 msgid "" "Evolution does not support calendar reminders with\n" "email notifications yet, but this reminder was\n" @@ -3932,7 +3930,7 @@ msgstr "" "configured to send an email. Evolution will display\n" "a normal reminder dialog box instead." -#: calendar/gui/alarm-notify/alarm-queue.c:1122 +#: calendar/gui/alarm-notify/alarm-queue.c:1111 #, c-format msgid "" "An Evolution Calendar reminder is about to trigger. This reminder is " @@ -3949,7 +3947,7 @@ msgstr "" "\n" "Are you sure you want to run this program?" -#: calendar/gui/alarm-notify/alarm-queue.c:1136 +#: calendar/gui/alarm-notify/alarm-queue.c:1125 msgid "Do not ask me about this program again." msgstr "Do not ask me about this program again." @@ -4109,13 +4107,13 @@ msgstr "Comment contains" msgid "Location contains" msgstr "Location contains" -#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327 +#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:328 msgid "Unmatched" msgstr "Unmatched" #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564 #: calendar/gui/dialogs/select-source-dialog.c:112 -#: calendar/gui/gnome-cal.c:1859 +#: calendar/gui/gnome-cal.c:1910 #: camel/providers/groupwise/camel-gw-listener.c:331 #: camel/providers/groupwise/camel-gw-listener.c:361 msgid "Calendar" @@ -4428,8 +4426,8 @@ msgstr "Alarms" #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which #. has "activatable" set. -#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466 -#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905 +#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:481 +#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:937 msgid "Enabled" msgstr "Enabled" @@ -4443,19 +4441,19 @@ msgstr "Don't Remove" #: calendar/gui/dialogs/cal-prefs-dialog.c:778 #: calendar/gui/dialogs/cal-prefs-dialog.c:811 -#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288 -#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372 -#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654 -#: mail/em-composer-prefs.c:684 +#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:328 +#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:387 +#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655 +#: mail/em-composer-prefs.c:685 msgid "Disable" msgstr "Disable" #: calendar/gui/dialogs/cal-prefs-dialog.c:778 #: calendar/gui/dialogs/cal-prefs-dialog.c:811 -#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288 -#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374 -#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654 -#: mail/em-composer-prefs.c:684 +#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:328 +#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:389 +#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655 +#: mail/em-composer-prefs.c:685 msgid "Enable" msgstr "Enable" @@ -4524,7 +4522,7 @@ msgid "Display" msgstr "Display" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 -#: mail/mail-config.glade.h:76 +#: mail/mail-config.glade.h:72 msgid "E_nable" msgstr "E_nable" @@ -4644,7 +4642,7 @@ msgstr "_Day begins:" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 #: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10 -#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34 +#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:34 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6 #: ui/evolution-message-composer.xml.h:43 @@ -4733,7 +4731,7 @@ msgstr "Add Task List" msgid "C_olor:" msgstr "C_olour:" -#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110 +#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:100 msgid "Pick a color" msgstr "Pick a colour" @@ -5119,11 +5117,10 @@ msgstr "_Start time:" #: calendar/gui/dialogs/meeting-page.c:316 #: calendar/gui/dialogs/meeting-page.glade.h:5 #: calendar/gui/e-cal-model-tasks.c:648 calendar/gui/e-itip-control.c:1111 -#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877 -#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933 -#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1968 -#: mail/mail-config.glade.h:103 -#: widgets/e-timezone-dialog/e-timezone-dialog.c:192 +#: composer/e-msg-composer.c:2098 filter/filter-rule.c:877 +#: mail/em-account-prefs.c:442 mail/em-folder-view.c:955 +#: mail/mail-account-gui.c:1578 mail/mail-account-gui.c:2023 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:193 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595 msgid "None" @@ -5141,12 +5138,12 @@ msgstr "An organizer is required." msgid "At least one attendee is required." msgstr "At least one attendee is required." -#: calendar/gui/dialogs/meeting-page.c:793 +#: calendar/gui/dialogs/meeting-page.c:795 msgid "_Delegate To..." msgstr "_Delegate To..." -#: calendar/gui/dialogs/meeting-page.c:797 -#: composer/e-msg-composer-attachment-bar.c:453 +#: calendar/gui/dialogs/meeting-page.c:799 +#: composer/e-msg-composer-attachment-bar.c:440 msgid "_Remove" msgstr "_Remove" @@ -5422,7 +5419,7 @@ msgstr "Completed" #: calendar/gui/dialogs/task-details-page.glade.h:5 #: calendar/gui/e-cal-component-preview.c:249 -#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012 +#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1013 msgid "High" msgstr "High" @@ -5436,13 +5433,13 @@ msgstr "In Progress" #: calendar/gui/dialogs/task-details-page.glade.h:7 #: calendar/gui/e-cal-component-preview.c:253 -#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010 +#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1011 msgid "Low" msgstr "Low" #: calendar/gui/dialogs/task-details-page.glade.h:8 #: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943 -#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011 +#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1012 msgid "Normal" msgstr "Normal" @@ -5488,11 +5485,11 @@ msgstr "Task" msgid "Assignment" msgstr "Assignment" -#: calendar/gui/dialogs/task-page.c:496 +#: calendar/gui/dialogs/task-page.c:496 calendar/gui/dialogs/task-page.c:553 msgid "Due date is wrong" msgstr "Due date is wrong" -#: calendar/gui/dialogs/task-page.c:831 +#: calendar/gui/dialogs/task-page.c:840 #, c-format msgid "Unable to open tasks in '%s'." msgstr "Unable to open tasks in '%s'." @@ -5640,7 +5637,7 @@ msgstr "%s at %s" msgid "%s for an unknown trigger type" msgstr "%s for an unknown trigger type" -#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385 +#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2417 #, c-format msgid "Click to open %s" msgstr "Click to open %s" @@ -5675,7 +5672,7 @@ msgstr "Priority:" #: calendar/gui/e-cal-component-preview.c:268 #: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.glade.h:6 -#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71 +#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:67 msgid "Description:" msgstr "Description:" @@ -5825,7 +5822,7 @@ msgstr "Updating objects" #: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084 #: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512 -#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37 +#: mail/em-folder-view.c:921 ui/evolution-addressbook.xml.h:37 msgid "_Open" msgstr "_Open" @@ -5835,7 +5832,7 @@ msgstr "Open _Web Page" #: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090 #: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518 -#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807 +#: mail/em-folder-view.c:923 mail/em-popup.c:496 #: ui/evolution-mail-message.xml.h:128 msgid "_Save As..." msgstr "_Save As..." @@ -5858,7 +5855,7 @@ msgstr "C_ut" #: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077 #: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480 -#: mail/em-folder-tree.c:1013 mail/message-list.c:1702 +#: mail/em-folder-tree.c:1020 mail/message-list.c:1709 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109 #: ui/evolution-tasks.xml.h:20 @@ -5892,7 +5889,7 @@ msgstr "_Mark Selected Tasks as Complete" #. FIXME: need to disable for undeletable folders #: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081 #: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484 -#: mail/em-folder-tree.c:2710 mail/em-folder-view.c:924 +#: mail/em-folder-tree.c:2728 mail/em-folder-view.c:946 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21 @@ -5904,7 +5901,7 @@ msgid "_Delete Selected Tasks" msgstr "_Delete Selected Tasks" #: calendar/gui/e-calendar-table.c:1199 calendar/gui/e-calendar-view.c:1060 -#: composer/e-msg-composer.c:1178 +#: composer/e-msg-composer.c:1179 msgid "Save as..." msgstr "Save as..." @@ -5919,7 +5916,7 @@ msgid "% Complete" msgstr "% Complete" #: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178 -#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615 +#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:616 msgid "Complete" msgstr "Complete" @@ -6460,7 +6457,7 @@ msgid "Send Latest Information" msgstr "Send Latest Information" #: calendar/gui/e-itip-control.c:2380 calendar/gui/itip-utils.c:442 -#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464 +#: mail/mail-send-recv.c:411 mail/mail-send-recv.c:465 #: ui/evolution-mail-global.xml.h:1 msgid "Cancel" msgstr "Cancel" @@ -6660,7 +6657,7 @@ msgstr "Required people and _one resource" msgid "Enter the password for %s" msgstr "Enter the password for %s" -#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2262 +#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2313 #, c-format msgid "" "Error on %s:\n" @@ -6690,26 +6687,26 @@ msgstr "Deleting selected objects..." msgid "Expunging" msgstr "Expunging" -#: calendar/gui/gnome-cal.c:705 +#: calendar/gui/gnome-cal.c:722 msgid "Updating query" msgstr "Updating query" -#: calendar/gui/gnome-cal.c:2039 +#: calendar/gui/gnome-cal.c:2090 #, c-format msgid "Loading appointments at %s" msgstr "Loading appointments at %s" -#: calendar/gui/gnome-cal.c:2058 +#: calendar/gui/gnome-cal.c:2109 #, c-format msgid "Loading tasks at %s" msgstr "Loading tasks at %s" -#: calendar/gui/gnome-cal.c:2151 +#: calendar/gui/gnome-cal.c:2202 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: calendar/gui/gnome-cal.c:3120 +#: calendar/gui/gnome-cal.c:3171 msgid "Purging" msgstr "Purging" @@ -7116,7 +7113,7 @@ msgid_plural "%d tasks" msgstr[0] "%d task" msgstr[1] "%d tasks" -#: calendar/gui/tasks-component.c:417 mail/mail-component.c:502 +#: calendar/gui/tasks-component.c:417 mail/mail-component.c:522 #, c-format msgid ", %d selected" msgid_plural ", %d selected" @@ -7769,7 +7766,7 @@ msgstr "America/Montserrat" msgid "America/Nassau" msgstr "America/Nassau" -#: calendar/zones.h:138 +#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4 msgid "America/New_York" msgstr "America/New_York" @@ -8769,56 +8766,56 @@ msgstr "Pacific/Wallis" msgid "Pacific/Yap" msgstr "Pacific/Yap" -#: camel/camel-cipher-context.c:102 +#: camel/camel-cipher-context.c:103 msgid "Signing is not supported by this cipher" msgstr "Signing is not supported by this cipher" -#: camel/camel-cipher-context.c:128 +#: camel/camel-cipher-context.c:129 msgid "Signing message" msgstr "Signing message" -#: camel/camel-cipher-context.c:145 +#: camel/camel-cipher-context.c:146 msgid "Verifying is not supported by this cipher" msgstr "Verifying is not supported by this cipher" -#: camel/camel-cipher-context.c:171 +#: camel/camel-cipher-context.c:172 msgid "Verifying message" msgstr "Verifying message" -#: camel/camel-cipher-context.c:189 +#: camel/camel-cipher-context.c:190 msgid "Encryption is not supported by this cipher" msgstr "Encryption is not supported by this cipher" -#: camel/camel-cipher-context.c:215 +#: camel/camel-cipher-context.c:216 msgid "Encrypting message" msgstr "Encrypting message" -#: camel/camel-cipher-context.c:232 +#: camel/camel-cipher-context.c:233 msgid "Decryption is not supported by this cipher" msgstr "Decryption is not supported by this cipher" -#: camel/camel-cipher-context.c:254 +#: camel/camel-cipher-context.c:255 msgid "Decrypting message" msgstr "Decrypting message" -#: camel/camel-cipher-context.c:271 +#: camel/camel-cipher-context.c:272 msgid "You may not import keys with this cipher" msgstr "You may not import keys with this cipher" -#: camel/camel-cipher-context.c:301 +#: camel/camel-cipher-context.c:302 msgid "You may not export keys with this cipher" msgstr "You may not export keys with this cipher" -#: camel/camel-data-cache.c:133 +#: camel/camel-data-cache.c:134 msgid "Unable to create cache path" msgstr "Unable to create cache path" -#: camel/camel-data-cache.c:375 +#: camel/camel-data-cache.c:376 #, c-format msgid "Could not remove cache entry: %s: %s" msgstr "Could not remove cache entry: %s: %s" -#: camel/camel-disco-diary.c:194 +#: camel/camel-disco-diary.c:195 #, c-format msgid "" "Could not write log entry: %s\n" @@ -8829,7 +8826,7 @@ msgstr "" "Further operations on this server will not be replayed when you\n" "reconnect to the network." -#: camel/camel-disco-diary.c:257 +#: camel/camel-disco-diary.c:258 #, c-format msgid "" "Could not open `%s':\n" @@ -8840,24 +8837,24 @@ msgstr "" "%s\n" "Changes made to this folder will not be resynchronized." -#: camel/camel-disco-diary.c:293 +#: camel/camel-disco-diary.c:294 msgid "Resynchronizing with server" msgstr "Resynchronizing with server" -#: camel/camel-disco-folder.c:41 +#: camel/camel-disco-folder.c:42 msgid "Copy folder content locally for offline operation" msgstr "Copy folder content locally for offline operation" -#: camel/camel-disco-folder.c:103 +#: camel/camel-disco-folder.c:104 msgid "Downloading new messages for offline mode" msgstr "Downloading new messages for offline mode" -#: camel/camel-disco-folder.c:466 +#: camel/camel-disco-folder.c:467 #, c-format msgid "Preparing folder '%s' for offline" msgstr "Preparing folder '%s' for offline" -#: camel/camel-disco-store.c:404 +#: camel/camel-disco-store.c:405 msgid "You must be working online to complete this operation" msgstr "You must be working online to complete this operation" @@ -8950,7 +8947,7 @@ msgstr "Failed to create create child process '%s': %s" msgid "Error executing filter search: %s: %s" msgstr "Error executing filter search: %s: %s" -#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476 +#: camel/camel-folder-search.c:356 camel/camel-folder-search.c:477 #, c-format msgid "" "Cannot parse search expression: %s:\n" @@ -8959,7 +8956,7 @@ msgstr "" "Cannot parse search expression: %s:\n" "%s" -#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486 +#: camel/camel-folder-search.c:366 camel/camel-folder-search.c:487 #, c-format msgid "" "Error executing search expression: %s:\n" @@ -8968,63 +8965,63 @@ msgstr "" "Error executing search expression: %s:\n" "%s" -#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705 +#: camel/camel-folder-search.c:673 camel/camel-folder-search.c:706 msgid "(match-all) requires a single bool result" msgstr "(match-all) requires a single bool result" -#: camel/camel-folder-search.c:755 +#: camel/camel-folder-search.c:756 msgid "(match-threads) not allowed inside match-all" msgstr "(match-threads) not allowed inside match-all" -#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762 +#: camel/camel-folder-search.c:759 camel/camel-folder-search.c:763 msgid "(match-threads) requires a match type string" msgstr "(match-threads) requires a match type string" -#: camel/camel-folder-search.c:784 +#: camel/camel-folder-search.c:785 msgid "(match-threads) expects an array result" msgstr "(match-threads) expects an array result" -#: camel/camel-folder-search.c:790 +#: camel/camel-folder-search.c:791 msgid "(match-threads) requires the folder set" msgstr "(match-threads) requires the folder set" -#: camel/camel-folder-search.c:879 +#: camel/camel-folder-search.c:880 #, c-format msgid "Performing query on unknown header: %s" msgstr "Performing query on unknown header: %s" -#: camel/camel-folder.c:653 +#: camel/camel-folder.c:651 #, c-format msgid "Unsupported operation: append message: for %s" msgstr "Unsupported operation: append message: for %s" -#: camel/camel-folder.c:1262 +#: camel/camel-folder.c:1260 #, c-format msgid "Unsupported operation: search by expression: for %s" msgstr "Unsupported operation: search by expression: for %s" -#: camel/camel-folder.c:1302 +#: camel/camel-folder.c:1300 #, c-format msgid "Unsupported operation: search by uids: for %s" msgstr "Unsupported operation: search by uids: for %s" -#: camel/camel-folder.c:1416 +#: camel/camel-folder.c:1414 msgid "Moving messages" msgstr "Moving messages" -#: camel/camel-folder.c:1416 +#: camel/camel-folder.c:1414 msgid "Copying messages" msgstr "Copying messages" -#: camel/camel-folder.c:1665 +#: camel/camel-folder.c:1663 msgid "Learning junk" msgstr "Learning junk" -#: camel/camel-folder.c:1682 +#: camel/camel-folder.c:1680 msgid "Learning non-junk" msgstr "Learning non-junk" -#: camel/camel-folder.c:1701 +#: camel/camel-folder.c:1699 msgid "Filtering new message(s)" msgstr "Filtering new message(s)" @@ -9059,8 +9056,8 @@ msgstr "" #: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314 #: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589 #: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1234 -#: camel/providers/nntp/camel-nntp-store.c:1332 mail/mail-ops.c:705 -#: mail/mail-send-recv.c:611 +#: camel/providers/nntp/camel-nntp-store.c:1332 mail/mail-ops.c:706 +#: mail/mail-send-recv.c:612 msgid "Cancelled." msgstr "Canceled." @@ -9093,7 +9090,7 @@ msgstr "" msgid "Failed to GPG %s: %s\n" msgstr "Failed to GPG %s: %s\n" -#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:419 +#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:420 #, c-format msgid "Could not generate signing data: %s" msgstr "Could not generate signing data: %s" @@ -9116,8 +9113,8 @@ msgid "This is a digitally signed message part" msgstr "This is a digitally signed message part" #: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437 -#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:721 -#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739 +#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:723 +#: camel/camel-smime-context.c:734 camel/camel-smime-context.c:741 msgid "Cannot verify message signature: Incorrect message format" msgstr "Cannot verify message signature: Incorrect message format" @@ -9135,7 +9132,7 @@ msgstr "Could not generate encrypting data: %s" msgid "This is a digitally encrypted message part" msgstr "This is a digitally encrypted message part" -#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:995 +#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:997 msgid "Encrypted content" msgstr "Encrypted content" @@ -9183,69 +9180,69 @@ msgstr "Failed to get lock using fcntl(2): %s" msgid "Failed to get lock using flock(2): %s" msgstr "Failed to get lock using flock(2): %s" -#: camel/camel-movemail.c:107 +#: camel/camel-movemail.c:106 #, c-format msgid "Could not check mail file %s: %s" msgstr "Could not check mail file %s: %s" -#: camel/camel-movemail.c:120 +#: camel/camel-movemail.c:119 #, c-format msgid "Could not open mail file %s: %s" msgstr "Could not open mail file %s: %s" -#: camel/camel-movemail.c:128 +#: camel/camel-movemail.c:127 #, c-format msgid "Could not open temporary mail file %s: %s" msgstr "Could not open temporary mail file %s: %s" -#: camel/camel-movemail.c:157 +#: camel/camel-movemail.c:156 #, c-format msgid "Failed to store mail in temp file %s: %s" msgstr "Failed to store mail in temp file %s: %s" -#: camel/camel-movemail.c:187 +#: camel/camel-movemail.c:186 #, c-format msgid "Could not create pipe: %s" msgstr "Could not create pipe: %s" -#: camel/camel-movemail.c:199 +#: camel/camel-movemail.c:198 #, c-format msgid "Could not fork: %s" msgstr "Could not fork: %s" -#: camel/camel-movemail.c:237 +#: camel/camel-movemail.c:236 #, c-format msgid "Movemail program failed: %s" msgstr "Movemail program failed: %s" -#: camel/camel-movemail.c:238 +#: camel/camel-movemail.c:237 msgid "(Unknown error)" msgstr "(Unknown error)" -#: camel/camel-movemail.c:261 +#: camel/camel-movemail.c:260 #, c-format msgid "Error reading mail file: %s" msgstr "Error reading mail file: %s" -#: camel/camel-movemail.c:272 +#: camel/camel-movemail.c:271 #, c-format msgid "Error writing mail temp file: %s" msgstr "Error writing mail temp file: %s" -#: camel/camel-movemail.c:465 camel/camel-movemail.c:532 +#: camel/camel-movemail.c:464 camel/camel-movemail.c:531 #, c-format msgid "Error copying mail temp file: %s" msgstr "Error copying mail temp file: %s" -#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244 +#: camel/camel-multipart-encrypted.c:230 camel/camel-multipart-encrypted.c:245 msgid "Failed to decrypt MIME part: protocol error" msgstr "Failed to decrypt MIME part: protocol error" -#: camel/camel-multipart-encrypted.c:257 +#: camel/camel-multipart-encrypted.c:258 msgid "Failed to decrypt MIME part: invalid structure" msgstr "Failed to decrypt MIME part: invalid structure" -#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724 +#: camel/camel-multipart-signed.c:674 camel/camel-multipart-signed.c:725 msgid "parse error" msgstr "parse error" @@ -9272,7 +9269,7 @@ msgstr "Could not load %s: %s" msgid "Could not load %s: No initialization code in module." msgstr "Could not load %s: No initialization code in module." -#: camel/camel-provider.c:356 camel/camel-session.c:160 +#: camel/camel-provider.c:356 camel/camel-session.c:161 #, c-format msgid "No provider available for protocol `%s'" msgstr "No provider available for protocol `%s'" @@ -9285,7 +9282,7 @@ msgstr "Anonymous" msgid "This option will connect to the server using an anonymous login." msgstr "This option will connect to the server using an anonymous login." -#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87 +#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88 msgid "Authentication failed." msgstr "Authentication failed." @@ -9316,11 +9313,11 @@ msgstr "" "Invalid trace information:\n" "%s" -#: camel/camel-sasl-cram-md5.c:35 +#: camel/camel-sasl-cram-md5.c:36 msgid "CRAM-MD5" msgstr "CRAM-MD5" -#: camel/camel-sasl-cram-md5.c:37 +#: camel/camel-sasl-cram-md5.c:38 msgid "" "This option will connect to the server using a secure CRAM-MD5 password, if " "the server supports it." @@ -9328,11 +9325,11 @@ msgstr "" "This option will connect to the server using a secure CRAM-MD5 password, if " "the server supports it." -#: camel/camel-sasl-digest-md5.c:48 +#: camel/camel-sasl-digest-md5.c:49 msgid "DIGEST-MD5" msgstr "DIGEST-MD5" -#: camel/camel-sasl-digest-md5.c:50 +#: camel/camel-sasl-digest-md5.c:51 msgid "" "This option will connect to the server using a secure DIGEST-MD5 password, " "if the server supports it." @@ -9340,27 +9337,27 @@ msgstr "" "This option will connect to the server using a secure DIGEST-MD5 password, " "if the server supports it." -#: camel/camel-sasl-digest-md5.c:813 +#: camel/camel-sasl-digest-md5.c:814 msgid "Server challenge too long (>2048 octets)\n" msgstr "Server challenge too long (>2048 octets)\n" -#: camel/camel-sasl-digest-md5.c:822 +#: camel/camel-sasl-digest-md5.c:823 msgid "Server challenge invalid\n" msgstr "Server challenge invalid\n" -#: camel/camel-sasl-digest-md5.c:828 +#: camel/camel-sasl-digest-md5.c:829 msgid "Server challenge contained invalid \"Quality of Protection\" token\n" msgstr "Server challenge contained invalid \"Quality of Protection\" token\n" -#: camel/camel-sasl-digest-md5.c:850 +#: camel/camel-sasl-digest-md5.c:851 msgid "Server response did not contain authorization data\n" msgstr "Server response did not contain authorization data\n" -#: camel/camel-sasl-digest-md5.c:868 +#: camel/camel-sasl-digest-md5.c:869 msgid "Server response contained incomplete authorization data\n" msgstr "Server response contained incomplete authorization data\n" -#: camel/camel-sasl-digest-md5.c:878 +#: camel/camel-sasl-digest-md5.c:879 msgid "Server response does not match\n" msgstr "Server response does not match\n" @@ -9436,7 +9433,7 @@ msgstr "The referenced credentials have expired." #: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242 #: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293 #: camel/camel-sasl-kerberos4.c:219 -#: camel/providers/imap/camel-imap-store.c:1236 +#: camel/providers/imap/camel-imap-store.c:1234 msgid "Bad authentication response from server." msgstr "Bad authentication response from server." @@ -9467,23 +9464,23 @@ msgstr "" "Could not get Kerberos ticket:\n" "%s" -#: camel/camel-sasl-login.c:32 +#: camel/camel-sasl-login.c:33 msgid "Login" msgstr "Login" -#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34 +#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35 msgid "This option will connect to the server using a simple password." msgstr "This option will connect to the server using a simple password." -#: camel/camel-sasl-login.c:127 +#: camel/camel-sasl-login.c:128 msgid "Unknown authentication state." msgstr "Unknown authentication state." -#: camel/camel-sasl-ntlm.c:31 +#: camel/camel-sasl-ntlm.c:32 msgid "NTLM / SPA" msgstr "NTLM / SPA" -#: camel/camel-sasl-ntlm.c:33 +#: camel/camel-sasl-ntlm.c:34 msgid "" "This option will connect to a Windows-based server using NTLM / Secure " "Password Authentication." @@ -9491,31 +9488,31 @@ msgstr "" "This option will connect to a Windows-based server using NTLM / Secure " "Password Authentication." -#: camel/camel-sasl-plain.c:32 +#: camel/camel-sasl-plain.c:33 msgid "PLAIN" msgstr "PLAIN" -#: camel/camel-sasl-popb4smtp.c:36 +#: camel/camel-sasl-popb4smtp.c:37 msgid "POP before SMTP" msgstr "POP before SMTP" -#: camel/camel-sasl-popb4smtp.c:38 +#: camel/camel-sasl-popb4smtp.c:39 msgid "This option will authorise a POP connection before attempting SMTP" msgstr "This option will authorise a POP connection before attempting SMTP" -#: camel/camel-sasl-popb4smtp.c:103 +#: camel/camel-sasl-popb4smtp.c:104 msgid "POP Source URI" msgstr "POP Source URI" -#: camel/camel-sasl-popb4smtp.c:106 +#: camel/camel-sasl-popb4smtp.c:107 msgid "POP Before SMTP auth using an unknown transport" msgstr "POP Before SMTP auth using an unknown transport" -#: camel/camel-sasl-popb4smtp.c:111 +#: camel/camel-sasl-popb4smtp.c:112 msgid "POP Before SMTP auth using a non-pop source" msgstr "POP Before SMTP auth using a non-pop source" -#: camel/camel-search-private.c:114 +#: camel/camel-search-private.c:151 #, c-format msgid "Regular expression compilation failed: %s: %s" msgstr "Regular expression compilation failed: %s: %s" @@ -9572,7 +9569,7 @@ msgstr "Host lookup failed: host not found" msgid "Host lookup failed: unknown reason" msgstr "Host lookup failed: unknown reason" -#: camel/camel-session.c:282 +#: camel/camel-session.c:283 #, c-format msgid "" "Could not create directory %s:\n" @@ -9581,252 +9578,252 @@ msgstr "" "Could not create directory %s:\n" "%s" -#: camel/camel-smime-context.c:104 +#: camel/camel-smime-context.c:105 #, c-format msgid "Enter security pass-phrase for `%s'" -msgstr "Enter security pass-phrase for `%s'" +msgstr "Enter security passphrase for `%s'" -#: camel/camel-smime-context.c:261 +#: camel/camel-smime-context.c:262 #, c-format msgid "Cannot find certificate for '%s'" msgstr "Cannot find certificate for '%s'" -#: camel/camel-smime-context.c:267 +#: camel/camel-smime-context.c:268 msgid "Cannot create CMS message" msgstr "Cannot create CMS message" -#: camel/camel-smime-context.c:272 -msgid "Cannot create CMS signedData" -msgstr "Cannot create CMS signedData" +#: camel/camel-smime-context.c:273 +msgid "Cannot create CMS signed data" +msgstr "Cannot create CMS signed data" -#: camel/camel-smime-context.c:278 -msgid "Cannot attach CMS signedData" -msgstr "Cannot attach CMS signedData" +#: camel/camel-smime-context.c:279 +msgid "Cannot attach CMS signed data" +msgstr "Cannot attach CMS signed data" -#: camel/camel-smime-context.c:285 +#: camel/camel-smime-context.c:286 msgid "Cannot attach CMS data" msgstr "Cannot attach CMS data" -#: camel/camel-smime-context.c:291 -msgid "Cannot create CMS SignerInfo" -msgstr "Cannot create CMS SignerInfo" +#: camel/camel-smime-context.c:292 +msgid "Cannot create CMS Signer information" +msgstr "Cannot create CMS Signer information" -#: camel/camel-smime-context.c:297 -msgid "Cannot find cert chain" +#: camel/camel-smime-context.c:298 +msgid "Cannot find certificate chain" msgstr "Cannot find certificate chain" -#: camel/camel-smime-context.c:303 -msgid "Cannot add CMS SigningTime" -msgstr "Cannot add CMS SigningTime" +#: camel/camel-smime-context.c:304 +msgid "Cannot add CMS Signing time" +msgstr "Cannot add CMS Signing time" -#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337 +#: camel/camel-smime-context.c:326 camel/camel-smime-context.c:338 #, c-format -msgid "Encryption cert for '%s' does not exist" -msgstr "Encryption cert for '%s' does not exist" +msgid "Encryption certificate for '%s' does not exist" +msgstr "Encryption certificate for '%s' does not exist" -#: camel/camel-smime-context.c:344 +#: camel/camel-smime-context.c:345 msgid "Cannot add SMIMEEncKeyPrefs attribute" msgstr "Cannot add SMIMEEncKeyPrefs attribute" -#: camel/camel-smime-context.c:349 +#: camel/camel-smime-context.c:350 msgid "Cannot add MS SMIMEEncKeyPrefs attribute" msgstr "Cannot add MS SMIMEEncKeyPrefs attribute" -#: camel/camel-smime-context.c:354 +#: camel/camel-smime-context.c:355 msgid "Cannot add encryption certificate" msgstr "Cannot add encryption certificate" -#: camel/camel-smime-context.c:360 -msgid "Cannot add CMS SignerInfo" -msgstr "Cannot add CMS SignerInfo" +#: camel/camel-smime-context.c:361 +msgid "Cannot add CMS Signer information" +msgstr "Cannot add CMS Signer information" -#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877 +#: camel/camel-smime-context.c:431 camel/camel-smime-context.c:879 msgid "Cannot create encoder context" msgstr "Cannot create encoder context" -#: camel/camel-smime-context.c:436 +#: camel/camel-smime-context.c:437 msgid "Failed to add data to CMS encoder" msgstr "Failed to add data to CMS encoder" -#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894 +#: camel/camel-smime-context.c:442 camel/camel-smime-context.c:896 msgid "Failed to encode data" msgstr "Failed to encode data" -#: camel/camel-smime-context.c:514 +#: camel/camel-smime-context.c:515 msgid "Unverified" msgstr "Unverified" -#: camel/camel-smime-context.c:516 +#: camel/camel-smime-context.c:517 msgid "Good signature" msgstr "Good signature" -#: camel/camel-smime-context.c:518 +#: camel/camel-smime-context.c:519 msgid "Bad signature" msgstr "Bad signature" -#: camel/camel-smime-context.c:520 +#: camel/camel-smime-context.c:521 msgid "Content tampered with or altered in transit" msgstr "Content tampered with or altered in transit" -#: camel/camel-smime-context.c:522 +#: camel/camel-smime-context.c:523 msgid "Signing certificate not found" msgstr "Signing certificate not found" -#: camel/camel-smime-context.c:524 +#: camel/camel-smime-context.c:525 msgid "Signing certificate not trusted" msgstr "Signing certificate not trusted" -#: camel/camel-smime-context.c:526 +#: camel/camel-smime-context.c:527 msgid "Signature algorithm unknown" msgstr "Signature algorithm unknown" -#: camel/camel-smime-context.c:528 +#: camel/camel-smime-context.c:529 msgid "Signature algorithm unsupported" msgstr "Siganture algorithm unsupported" -#: camel/camel-smime-context.c:530 +#: camel/camel-smime-context.c:531 msgid "Malformed signature" msgstr "Malformed signature" -#: camel/camel-smime-context.c:532 +#: camel/camel-smime-context.c:533 msgid "Processing error" msgstr "Processing error" -#: camel/camel-smime-context.c:569 -msgid "No signedData in signature" -msgstr "No signedData in signature" +#: camel/camel-smime-context.c:570 +msgid "No signed data in signature" +msgstr "No signed data in signature" -#: camel/camel-smime-context.c:576 +#: camel/camel-smime-context.c:577 msgid "Digests missing from enveloped data" msgstr "Digests missing from enveloped data" -#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599 +#: camel/camel-smime-context.c:590 camel/camel-smime-context.c:600 msgid "Cannot calculate digests" msgstr "Cannot calculate digests" -#: camel/camel-smime-context.c:604 +#: camel/camel-smime-context.c:605 msgid "Cannot set message digests" msgstr "Cannot set message digests" -#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619 +#: camel/camel-smime-context.c:615 camel/camel-smime-context.c:620 msgid "Certificate import failed" msgstr "Certificate import failed" -#: camel/camel-smime-context.c:628 -msgid "Certificate only message, cannot verify certificates" -msgstr "Certificate only message, cannot verify certificates" +#: camel/camel-smime-context.c:630 +msgid "Certificate is the only message, cannot verify certificates" +msgstr "Certificate is the only message; cannot verify certificates" -#: camel/camel-smime-context.c:631 -msgid "Certificate only message, certificates imported and verified" -msgstr "Certificate only message, certificates imported and verified" +#: camel/camel-smime-context.c:633 +msgid "Certificate is the only message, certificates imported and verified" +msgstr "Certificate is the only message; certificates imported and verified" -#: camel/camel-smime-context.c:635 +#: camel/camel-smime-context.c:637 msgid "Cannot find signature digests" msgstr "Cannot find signature digests" -#: camel/camel-smime-context.c:651 +#: camel/camel-smime-context.c:653 #, c-format msgid "Signer: %s <%s>: %s\n" msgstr "Signer: %s <%s>: %s\n" -#: camel/camel-smime-context.c:752 +#: camel/camel-smime-context.c:754 msgid "Decoder failed" msgstr "Decoder failed" -#: camel/camel-smime-context.c:804 +#: camel/camel-smime-context.c:806 #, c-format msgid "Cannot find certificate for `%s'" msgstr "Cannot find certificate for `%s'" -#: camel/camel-smime-context.c:811 +#: camel/camel-smime-context.c:813 msgid "Cannot find common bulk encryption algorithm" msgstr "Cannot find common bulk encryption algorithm" #. PORT_GetError(); ?? -#: camel/camel-smime-context.c:820 +#: camel/camel-smime-context.c:822 msgid "Cannot allocate slot for encryption bulk key" msgstr "Cannot allocate slot for encryption bulk key" -#: camel/camel-smime-context.c:831 +#: camel/camel-smime-context.c:833 msgid "Cannot create CMS Message" msgstr "Cannot create CMS Message" -#: camel/camel-smime-context.c:837 -msgid "Cannot create CMS EnvelopedData" -msgstr "Cannot create CMS EnvelopedData" +#: camel/camel-smime-context.c:839 +msgid "Cannot create CMS Enveloped data" +msgstr "Cannot create CMS Enveloped data" -#: camel/camel-smime-context.c:843 -msgid "Cannot attach CMS EnvelopedData" -msgstr "Cannot attach CMS EnvelopedData" +#: camel/camel-smime-context.c:845 +msgid "Cannot attach CMS Enveloped data" +msgstr "Cannot attach CMS Enveloped data" -#: camel/camel-smime-context.c:849 +#: camel/camel-smime-context.c:851 msgid "Cannot attach CMS data object" msgstr "Cannot attach CMS data object" -#: camel/camel-smime-context.c:858 -msgid "Cannot create CMS RecipientInfo" -msgstr "Cannot create CMS RecipientInfo" +#: camel/camel-smime-context.c:860 +msgid "Cannot create CMS Recipient information" +msgstr "Cannot create CMS Recipient information" -#: camel/camel-smime-context.c:863 -msgid "Cannot add CMS RecipientInfo" -msgstr "Cannot add CMS RecipientInfo" +#: camel/camel-smime-context.c:865 +msgid "Cannot add CMS Recipient information" +msgstr "Cannot add CMS Recipient information" -#: camel/camel-smime-context.c:888 +#: camel/camel-smime-context.c:890 msgid "Failed to add data to encoder" msgstr "Failed to add data to encoder" -#: camel/camel-smime-context.c:975 +#: camel/camel-smime-context.c:977 #, c-format msgid "Decoder failed, error %d" msgstr "Decoder failed, error %d" -#: camel/camel-smime-context.c:982 +#: camel/camel-smime-context.c:984 msgid "S/MIME Decrypt: No encrypted content found" msgstr "S/MIME Decrypt: No encrypted content found" -#: camel/camel-smime-context.c:1009 +#: camel/camel-smime-context.c:1011 msgid "import keys: unimplemented" msgstr "import keys: unimplemented" -#: camel/camel-smime-context.c:1017 +#: camel/camel-smime-context.c:1019 msgid "export keys: unimplemented" msgstr "export keys: unimplemented" -#: camel/camel-store.c:213 +#: camel/camel-store.c:214 msgid "Cannot get folder: Invalid operation on this store" msgstr "Cannot get folder: Invalid operation on this store" -#: camel/camel-store.c:243 +#: camel/camel-store.c:244 #, c-format msgid "Cannot create folder `%s': folder exists" msgstr "Cannot create folder `%s': folder exists" -#: camel/camel-store.c:297 +#: camel/camel-store.c:298 msgid "Cannot create folder: Invalid operation on this store" msgstr "Cannot create folder: Invalid operation on this store" -#: camel/camel-store.c:325 +#: camel/camel-store.c:326 #, c-format msgid "Cannot create folder: %s: folder exists" msgstr "Cannot create folder: %s: folder exists" -#: camel/camel-store.c:389 camel/camel-vee-store.c:351 +#: camel/camel-store.c:390 camel/camel-vee-store.c:352 #, c-format msgid "Cannot delete folder: %s: Invalid operation" msgstr "Cannot delete folder: %s: Invalid operation" -#: camel/camel-store.c:439 camel/camel-vee-store.c:388 -#: camel/providers/local/camel-maildir-store.c:232 +#: camel/camel-store.c:440 camel/camel-vee-store.c:389 +#: camel/providers/local/camel-maildir-store.c:233 #, c-format msgid "Cannot rename folder: %s: Invalid operation" msgstr "Cannot rename folder: %s: Invalid operation" -#: camel/camel-store.c:777 +#: camel/camel-store.c:778 msgid "Trash" msgstr "Trash" -#: camel/camel-store.c:779 mail/em-filter-i18n.h:35 -#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48 +#: camel/camel-store.c:780 mail/em-filter-i18n.h:35 +#: mail/mail-config.glade.h:90 ui/evolution-mail-message.xml.h:48 msgid "Junk" msgstr "Junk" @@ -9946,7 +9943,7 @@ msgstr "Key usage does not support certificate signing" msgid "Error in application verification" msgstr "Error in application verification" -#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826 +#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827 #, c-format msgid "" "Issuer: %s\n" @@ -9959,11 +9956,11 @@ msgstr "" "Fingerprint: %s\n" "Signature: %s" -#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832 +#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833 msgid "GOOD" msgstr "GOOD" -#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832 +#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833 msgid "BAD" msgstr "BAD" @@ -9987,7 +9984,7 @@ msgstr "" "Do you wish to accept anyway?" #. construct our user prompt -#: camel/camel-tcp-stream-ssl.c:836 +#: camel/camel-tcp-stream-ssl.c:837 #, c-format msgid "" "SSL Certificate check for %s:\n" @@ -10002,7 +9999,7 @@ msgstr "" "\n" "Do you wish to accept?" -#: camel/camel-tcp-stream-ssl.c:880 +#: camel/camel-tcp-stream-ssl.c:881 #, c-format msgid "" "Certificate problem: %s\n" @@ -10011,7 +10008,7 @@ msgstr "" "Certificate problem: %s\n" "Issuer: %s" -#: camel/camel-tcp-stream-ssl.c:932 +#: camel/camel-tcp-stream-ssl.c:933 #, c-format msgid "" "Bad certificate domain: %s\n" @@ -10020,7 +10017,7 @@ msgstr "" "Bad certificate domain: %s\n" "Issuer: %s" -#: camel/camel-tcp-stream-ssl.c:950 +#: camel/camel-tcp-stream-ssl.c:951 #, c-format msgid "" "Certificate expired: %s\n" @@ -10029,7 +10026,7 @@ msgstr "" "Certificate expired: %s\n" "Issuer: %s" -#: camel/camel-tcp-stream-ssl.c:967 +#: camel/camel-tcp-stream-ssl.c:968 #, c-format msgid "" "Certificate revocation list expired: %s\n" @@ -10038,109 +10035,109 @@ msgstr "" "Certificate revocation list expired: %s\n" "Issuer: %s" -#: camel/camel-url.c:292 +#: camel/camel-url.c:293 #, c-format msgid "Could not parse URL `%s'" msgstr "Could not parse URL `%s'" -#: camel/camel-vee-folder.c:633 +#: camel/camel-vee-folder.c:634 #, c-format msgid "Error storing `%s': %s" msgstr "Error storing `%s': %s" -#: camel/camel-vee-folder.c:675 +#: camel/camel-vee-folder.c:676 #, c-format msgid "No such message %s in %s" msgstr "No such message %s in %s" -#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847 +#: camel/camel-vee-folder.c:842 camel/camel-vee-folder.c:848 msgid "Cannot copy or move messages into a Virtual Folder" msgstr "Cannot copy or move messages into a Virtual Folder" -#: camel/camel-vee-store.c:374 +#: camel/camel-vee-store.c:375 #, c-format msgid "Cannot delete folder: %s: No such folder" msgstr "Cannot delete folder: %s: No such folder" -#: camel/camel-vee-store.c:396 +#: camel/camel-vee-store.c:397 #, c-format msgid "Cannot rename folder: %s: No such folder" msgstr "Cannot rename folder: %s: No such folder" -#: camel/camel-vtrash-folder.c:44 +#: camel/camel-vtrash-folder.c:45 msgid "Cannot copy messages to the Trash folder" msgstr "Cannot copy messages to the Trash folder" -#: camel/camel-vtrash-folder.c:46 +#: camel/camel-vtrash-folder.c:47 msgid "Cannot copy messages to the Junk folder" msgstr "Cannot copy messages to the Junk folder" -#: camel/providers/groupwise/camel-groupwise-provider.c:53 +#: camel/providers/groupwise/camel-groupwise-provider.c:54 #: camel/providers/imap4/camel-imap4-provider.c:35 msgid "Checking for new mail" msgstr "Checking for new mail" -#: camel/providers/groupwise/camel-groupwise-provider.c:55 -#: camel/providers/imap/camel-imap-provider.c:45 +#: camel/providers/groupwise/camel-groupwise-provider.c:56 +#: camel/providers/imap/camel-imap-provider.c:46 #: camel/providers/imap4/camel-imap4-provider.c:37 msgid "Check for new messages in all folders" msgstr "Check for new messages in all folders" -#: camel/providers/groupwise/camel-groupwise-provider.c:59 +#: camel/providers/groupwise/camel-groupwise-provider.c:61 msgid "Apply filters to new messages in Inbox on this server" msgstr "Apply filters to new messages in Inbox on this server" -#: camel/providers/groupwise/camel-groupwise-provider.c:61 -#: camel/providers/imap/camel-imap-provider.c:66 +#: camel/providers/groupwise/camel-groupwise-provider.c:63 +#: camel/providers/imap/camel-imap-provider.c:68 msgid "Check new messages for Junk contents" msgstr "Check new messages for Junk contents" -#: camel/providers/groupwise/camel-groupwise-provider.c:63 -#: camel/providers/imap/camel-imap-provider.c:68 +#: camel/providers/groupwise/camel-groupwise-provider.c:65 +#: camel/providers/imap/camel-imap-provider.c:70 msgid "Only check for Junk messages in the INBOX folder" msgstr "Only check for Junk messages in the INBOX folder" -#: camel/providers/groupwise/camel-groupwise-provider.c:65 -#: camel/providers/imap/camel-imap-provider.c:70 +#: camel/providers/groupwise/camel-groupwise-provider.c:67 +#: camel/providers/imap/camel-imap-provider.c:72 msgid "Automatically synchronize remote mail locally" msgstr "Automatically synchronize remote mail locally" -#: camel/providers/groupwise/camel-groupwise-provider.c:69 +#: camel/providers/groupwise/camel-groupwise-provider.c:72 msgid "Address Book and Calendar" msgstr "Address Book and Calendar" -#: camel/providers/groupwise/camel-groupwise-provider.c:72 +#: camel/providers/groupwise/camel-groupwise-provider.c:75 msgid "Post Office Agent:" msgstr "Post Office Agent:" -#: camel/providers/groupwise/camel-groupwise-provider.c:75 +#: camel/providers/groupwise/camel-groupwise-provider.c:78 msgid "Post Office Agent SOAP Port:" msgstr "Post Office Agent SOAP Port:" -#: camel/providers/groupwise/camel-groupwise-provider.c:78 +#: camel/providers/groupwise/camel-groupwise-provider.c:81 msgid "Use Secure Connection (SSL)" msgstr "Use Secure Connection (SSL)" -#: camel/providers/groupwise/camel-groupwise-provider.c:92 +#: camel/providers/groupwise/camel-groupwise-provider.c:94 msgid "Novell GroupWise" msgstr "Novell GroupWise" -#: camel/providers/groupwise/camel-groupwise-provider.c:94 +#: camel/providers/groupwise/camel-groupwise-provider.c:96 msgid "For accessing Novell Groupwise servers" msgstr "For accessing Novell Groupwise servers" -#: camel/providers/groupwise/camel-groupwise-provider.c:109 -#: camel/providers/imap/camel-imap-provider.c:93 +#: camel/providers/groupwise/camel-groupwise-provider.c:111 +#: camel/providers/imap/camel-imap-provider.c:96 #: camel/providers/imap4/camel-imap4-provider.c:70 -#: camel/providers/imapp/camel-imapp-provider.c:65 -#: camel/providers/nntp/camel-nntp-provider.c:71 -#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108 +#: camel/providers/imapp/camel-imapp-provider.c:66 +#: camel/providers/nntp/camel-nntp-provider.c:72 +#: camel/providers/pop3/camel-pop3-provider.c:72 msgid "Password" msgstr "Password" -#: camel/providers/groupwise/camel-groupwise-provider.c:111 -#: camel/providers/imap/camel-imap-provider.c:95 -#: camel/providers/imapp/camel-imapp-provider.c:67 +#: camel/providers/groupwise/camel-groupwise-provider.c:113 +#: camel/providers/imap/camel-imap-provider.c:98 +#: camel/providers/imapp/camel-imapp-provider.c:68 msgid "This option will connect to the IMAP server using a plaintext password." msgstr "" "This option will connect to the IMAP server using a plaintext password." @@ -10152,12 +10149,12 @@ msgstr "Checklist" #: camel/providers/imap/camel-imap-command.c:218 #: camel/providers/imap/camel-imap-command.c:257 #: camel/providers/imap/camel-imap-command.c:447 -#: camel/providers/imap/camel-imap-store.c:3220 +#: camel/providers/imap/camel-imap-store.c:3218 msgid "Operation cancelled" msgstr "Operation canceled" #: camel/providers/imap/camel-imap-command.c:302 -#: camel/providers/imap/camel-imap-store.c:3223 +#: camel/providers/imap/camel-imap-store.c:3221 #, c-format msgid "Server unexpectedly disconnected: %s" msgstr "Server unexpectedly disconnected: %s" @@ -10165,9 +10162,9 @@ msgstr "Server unexpectedly disconnected: %s" #: camel/providers/imap/camel-imap-command.c:303 #: camel/providers/imap/camel-imap-command.c:400 #: camel/providers/imap4/camel-imap4-store.c:283 -#: camel/providers/pop3/camel-pop3-store.c:543 -#: camel/providers/pop3/camel-pop3-store.c:550 -#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1226 +#: camel/providers/pop3/camel-pop3-store.c:544 +#: camel/providers/pop3/camel-pop3-store.c:551 +#: camel/providers/pop3/camel-pop3-store.c:557 shell/e-shell.c:1230 msgid "Unknown error" msgstr "Unknown error" @@ -10239,9 +10236,9 @@ msgstr "" " %s" #: camel/providers/imap/camel-imap-folder.c:1975 -#: camel/providers/local/camel-maildir-folder.c:244 -#: camel/providers/local/camel-mbox-folder.c:418 -#: camel/providers/local/camel-mh-folder.c:202 +#: camel/providers/local/camel-maildir-folder.c:245 +#: camel/providers/local/camel-mbox-folder.c:419 +#: camel/providers/local/camel-mh-folder.c:203 msgid "No such message" msgstr "No such message" @@ -10277,159 +10274,159 @@ msgstr "" msgid "Could not find message body in FETCH response." msgstr "Could not find message body in FETCH response." -#: camel/providers/imap/camel-imap-message-cache.c:155 +#: camel/providers/imap/camel-imap-message-cache.c:156 #, c-format msgid "Could not open cache directory: %s" msgstr "Could not open cache directory: %s" -#: 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 +#: camel/providers/imap/camel-imap-message-cache.c:253 +#: camel/providers/imap/camel-imap-message-cache.c:310 +#: camel/providers/imap/camel-imap-message-cache.c:341 +#: camel/providers/imap/camel-imap-message-cache.c:373 #, c-format msgid "Failed to cache message %s: %s" msgstr "Failed to cache message %s: %s" -#: camel/providers/imap/camel-imap-message-cache.c:417 +#: camel/providers/imap/camel-imap-message-cache.c:418 #, c-format msgid "Failed to cache %s: %s" msgstr "Failed to cache %s: %s" -#: camel/providers/imap/camel-imap-provider.c:43 +#: camel/providers/imap/camel-imap-provider.c:44 msgid "Checking for New Mail" msgstr "Checking for New Mail" -#: camel/providers/imap/camel-imap-provider.c:48 +#: camel/providers/imap/camel-imap-provider.c:49 msgid "Connection to Server" msgstr "Connection to Server" -#: camel/providers/imap/camel-imap-provider.c:50 +#: camel/providers/imap/camel-imap-provider.c:51 msgid "Use custom command to connect to server" msgstr "Use custom command to connect to server" -#: camel/providers/imap/camel-imap-provider.c:52 +#: camel/providers/imap/camel-imap-provider.c:53 msgid "Command:" msgstr "Command:" -#: camel/providers/imap/camel-imap-provider.c:55 +#: camel/providers/imap/camel-imap-provider.c:56 #: camel/providers/imap4/camel-imap4-provider.c:40 -#: camel/providers/nntp/camel-nntp-provider.c:41 +#: camel/providers/nntp/camel-nntp-provider.c:42 msgid "Folders" msgstr "Folders" -#: camel/providers/imap/camel-imap-provider.c:57 +#: camel/providers/imap/camel-imap-provider.c:58 #: camel/providers/imap4/camel-imap4-provider.c:42 msgid "Show only subscribed folders" msgstr "Show only subscribed folders" -#: camel/providers/imap/camel-imap-provider.c:59 +#: camel/providers/imap/camel-imap-provider.c:60 #: camel/providers/imap4/camel-imap4-provider.c:44 msgid "Override server-supplied folder namespace" msgstr "Override server-supplied folder namespace" -#: camel/providers/imap/camel-imap-provider.c:61 +#: camel/providers/imap/camel-imap-provider.c:62 #: camel/providers/imap4/camel-imap4-provider.c:46 msgid "Namespace" msgstr "Namespace" -#: camel/providers/imap/camel-imap-provider.c:64 +#: camel/providers/imap/camel-imap-provider.c:66 msgid "Apply filters to new messages in INBOX on this server" msgstr "Apply filters to new messages in INBOX on this server" -#: camel/providers/imap/camel-imap-provider.c:76 +#: camel/providers/imap/camel-imap-provider.c:79 msgid "IMAP" msgstr "IMAP" -#: camel/providers/imap/camel-imap-provider.c:78 +#: camel/providers/imap/camel-imap-provider.c:81 msgid "For reading and storing mail on IMAP servers." msgstr "For reading and storing mail on IMAP servers." -#: camel/providers/imap/camel-imap-store.c:424 +#: camel/providers/imap/camel-imap-store.c:422 #: camel/providers/imap4/camel-imap4-store.c:177 #, c-format msgid "IMAP server %s" msgstr "IMAP server %s" -#: camel/providers/imap/camel-imap-store.c:426 +#: camel/providers/imap/camel-imap-store.c:424 #: camel/providers/imap4/camel-imap4-store.c:179 #, c-format msgid "IMAP service for %s on %s" msgstr "IMAP service for %s on %s" -#: camel/providers/imap/camel-imap-store.c:547 -#: camel/providers/imap/camel-imap-store.c:567 +#: camel/providers/imap/camel-imap-store.c:545 +#: camel/providers/imap/camel-imap-store.c:565 #: camel/providers/imap4/camel-imap4-store.c:214 #: camel/providers/imap4/camel-imap4-store.c:230 -#: camel/providers/imapp/camel-imapp-store.c:231 +#: camel/providers/imapp/camel-imapp-store.c:232 #: camel/providers/nntp/camel-nntp-store.c:209 -#: camel/providers/pop3/camel-pop3-store.c:175 +#: camel/providers/pop3/camel-pop3-store.c:176 #: camel/providers/smtp/camel-smtp-transport.c:269 #: camel/providers/smtp/camel-smtp-transport.c:285 #, c-format msgid "Could not connect to %s (port %d): %s" msgstr "Could not connect to %s (port %d): %s" -#: camel/providers/imap/camel-imap-store.c:549 +#: camel/providers/imap/camel-imap-store.c:547 #: camel/providers/imap4/camel-imap4-store.c:216 -#: camel/providers/pop3/camel-pop3-store.c:177 +#: camel/providers/pop3/camel-pop3-store.c:178 #: camel/providers/smtp/camel-smtp-transport.c:271 msgid "SSL unavailable" msgstr "SSL unavailable" -#: camel/providers/imap/camel-imap-store.c:564 -#: camel/providers/imap/camel-imap-store.c:841 +#: camel/providers/imap/camel-imap-store.c:562 +#: camel/providers/imap/camel-imap-store.c:839 #: camel/providers/imap4/camel-imap4-store.c:227 -#: camel/providers/imapp/camel-imapp-store.c:228 +#: camel/providers/imapp/camel-imapp-store.c:229 #: camel/providers/nntp/camel-nntp-store.c:206 #: camel/providers/nntp/camel-nntp-store.c:224 -#: camel/providers/pop3/camel-pop3-store.c:192 +#: camel/providers/pop3/camel-pop3-store.c:193 msgid "Connection cancelled" msgstr "Connection canceled" -#: camel/providers/imap/camel-imap-store.c:675 -#: camel/providers/imap/camel-imap-store.c:706 +#: camel/providers/imap/camel-imap-store.c:673 +#: camel/providers/imap/camel-imap-store.c:704 #: camel/providers/imap4/camel-imap4-store.c:282 #, c-format msgid "Failed to connect to IMAP server %s in secure mode: %s" msgstr "Failed to connect to IMAP server %s in secure mode: %s" -#: camel/providers/imap/camel-imap-store.c:676 -#: camel/providers/pop3/camel-pop3-store.c:233 +#: camel/providers/imap/camel-imap-store.c:674 +#: camel/providers/pop3/camel-pop3-store.c:234 msgid "SSL/TLS extension not supported." msgstr "SSL/TLS extension not supported." -#: camel/providers/imap/camel-imap-store.c:707 -#: camel/providers/pop3/camel-pop3-store.c:274 +#: camel/providers/imap/camel-imap-store.c:705 +#: camel/providers/pop3/camel-pop3-store.c:275 msgid "SSL negotiations failed" msgstr "SSL negotiations failed" -#: camel/providers/imap/camel-imap-store.c:844 +#: camel/providers/imap/camel-imap-store.c:842 #, c-format msgid "Could not connect with command \"%s\": %s" msgstr "Could not connect with command \"%s\": %s" -#: camel/providers/imap/camel-imap-store.c:1268 +#: camel/providers/imap/camel-imap-store.c:1266 #, c-format msgid "IMAP server %s does not support requested authentication type %s" msgstr "IMAP server %s does not support requested authentication type %s" -#: camel/providers/imap/camel-imap-store.c:1278 +#: camel/providers/imap/camel-imap-store.c:1276 #: camel/providers/smtp/camel-smtp-transport.c:486 #, c-format msgid "No support for authentication type %s" msgstr "No support for authentication type %s" -#: camel/providers/imap/camel-imap-store.c:1301 -#: camel/providers/imapp/camel-imapp-store.c:344 +#: camel/providers/imap/camel-imap-store.c:1299 +#: camel/providers/imapp/camel-imapp-store.c:345 #, c-format msgid "%sPlease enter the IMAP password for %s@%s" msgstr "%sPlease enter the IMAP password for %s@%s" -#: camel/providers/imap/camel-imap-store.c:1315 +#: camel/providers/imap/camel-imap-store.c:1313 msgid "You didn't enter a password." msgstr "You didn't enter a password." -#: camel/providers/imap/camel-imap-store.c:1344 +#: camel/providers/imap/camel-imap-store.c:1342 #, c-format msgid "" "Unable to authenticate to IMAP server.\n" @@ -10440,14 +10437,14 @@ msgstr "" "%s\n" "\n" -#: camel/providers/imap/camel-imap-store.c:1863 -#: camel/providers/imap/camel-imap-store.c:2053 +#: camel/providers/imap/camel-imap-store.c:1861 +#: camel/providers/imap/camel-imap-store.c:2051 #, c-format msgid "No such folder %s" msgstr "No such folder %s" -#: camel/providers/imap/camel-imap-store.c:1881 -#: camel/providers/imap/camel-imap-store.c:2259 +#: camel/providers/imap/camel-imap-store.c:1879 +#: camel/providers/imap/camel-imap-store.c:2257 #: camel/providers/imap4/camel-imap4-store.c:764 #, c-format msgid "" @@ -10455,20 +10452,20 @@ msgid "" msgstr "" "The folder name \"%s\" is invalid because it contains the character \"%c\"" -#: camel/providers/imap/camel-imap-store.c:1939 -#: camel/providers/imap/camel-imap-store.c:2320 +#: camel/providers/imap/camel-imap-store.c:1937 +#: camel/providers/imap/camel-imap-store.c:2318 msgid "The parent folder is not allowed to contain subfolders" msgstr "The parent folder is not allowed to contain subfolders" -#: camel/providers/imap/camel-imap-store.c:1994 -#: camel/providers/local/camel-maildir-store.c:139 -#: camel/providers/local/camel-mbox-store.c:212 -#: camel/providers/local/camel-mh-store.c:236 +#: camel/providers/imap/camel-imap-store.c:1992 +#: camel/providers/local/camel-maildir-store.c:140 +#: camel/providers/local/camel-mbox-store.c:213 +#: camel/providers/local/camel-mh-store.c:237 #, c-format msgid "Cannot create folder `%s': folder exists." msgstr "Cannot create folder `%s': folder exists." -#: camel/providers/imap/camel-imap-store.c:2270 +#: camel/providers/imap/camel-imap-store.c:2268 #, c-format msgid "Unknown parent folder: %s" msgstr "Unknown parent folder: %s" @@ -10695,16 +10692,16 @@ msgstr "No data" msgid "IMAP server %s unexpectedly disconnected: %s" msgstr "IMAP server %s unexpectedly disconnected: %s" -#: camel/providers/imapp/camel-imapp-provider.c:39 -#: camel/providers/pop3/camel-pop3-provider.c:38 +#: camel/providers/imapp/camel-imapp-provider.c:40 +#: camel/providers/pop3/camel-pop3-provider.c:39 msgid "Message storage" msgstr "Message storage" -#: camel/providers/imapp/camel-imapp-provider.c:47 +#: camel/providers/imapp/camel-imapp-provider.c:48 msgid "IMAP+" msgstr "IMAP+" -#: camel/providers/imapp/camel-imapp-provider.c:49 +#: camel/providers/imapp/camel-imapp-provider.c:50 msgid "" "Experimental IMAP 4(.1) client\n" "This is untested and unsupported code, you want to use plain imap instead.\n" @@ -10716,51 +10713,51 @@ msgstr "" "\n" " !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n" -#: camel/providers/imapp/camel-imapp-store.c:328 +#: camel/providers/imapp/camel-imapp-store.c:329 #, c-format msgid "Could not connect to POP server on %s" msgstr "Could not connect to POP server on %s" -#: camel/providers/local/camel-local-folder.c:179 +#: camel/providers/local/camel-local-folder.c:180 msgid "Index message body data" msgstr "Index message body data" #. $HOME relative path + protocol string -#: camel/providers/local/camel-local-folder.c:388 +#: camel/providers/local/camel-local-folder.c:392 #, c-format msgid "~%s (%s)" msgstr "~%s (%s)" #. /var/spool/mail relative path + protocol -#: camel/providers/local/camel-local-folder.c:392 -#: camel/providers/local/camel-local-folder.c:395 +#: camel/providers/local/camel-local-folder.c:396 +#: camel/providers/local/camel-local-folder.c:399 #, c-format msgid "mailbox:%s (%s)" msgstr "mailbox:%s (%s)" #. a full path + protocol -#: camel/providers/local/camel-local-folder.c:399 +#: camel/providers/local/camel-local-folder.c:403 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: camel/providers/local/camel-local-provider.c:43 +#: camel/providers/local/camel-local-provider.c:45 msgid "Use the `.folders' folder summary file (exmh)" msgstr "Use the `.folders' folder summary file (exmh)" -#: camel/providers/local/camel-local-provider.c:49 +#: camel/providers/local/camel-local-provider.c:52 msgid "MH-format mail directories" msgstr "MH-format mail directories" -#: camel/providers/local/camel-local-provider.c:50 +#: camel/providers/local/camel-local-provider.c:53 msgid "For storing local mail in MH-like mail directories." msgstr "For storing local mail in MH-like mail directories." -#: camel/providers/local/camel-local-provider.c:65 +#: camel/providers/local/camel-local-provider.c:68 msgid "Local delivery" msgstr "Local delivery" -#: camel/providers/local/camel-local-provider.c:66 +#: camel/providers/local/camel-local-provider.c:69 msgid "" "For retrieving (moving) local mail from standard mbox formated spools into " "folders managed by Evolution." @@ -10768,28 +10765,28 @@ msgstr "" "For retrieving (moving) local mail from standard mbox formated spools into " "folders managed by Evolution." -#: camel/providers/local/camel-local-provider.c:77 -#: camel/providers/local/camel-local-provider.c:94 +#: camel/providers/local/camel-local-provider.c:81 +#: camel/providers/local/camel-local-provider.c:100 msgid "Apply filters to new messages in INBOX" msgstr "Apply filters to new messages in INBOX" -#: camel/providers/local/camel-local-provider.c:83 +#: camel/providers/local/camel-local-provider.c:88 msgid "Maildir-format mail directories" msgstr "Maildir-format mail directories" -#: camel/providers/local/camel-local-provider.c:84 +#: camel/providers/local/camel-local-provider.c:89 msgid "For storing local mail in maildir directories." msgstr "For storing local mail in maildir directories." -#: camel/providers/local/camel-local-provider.c:95 +#: camel/providers/local/camel-local-provider.c:101 msgid "Store status headers in Elm/Pine/Mutt format" msgstr "Store status headers in Elm/Pine/Mutt format" -#: camel/providers/local/camel-local-provider.c:101 +#: camel/providers/local/camel-local-provider.c:108 msgid "Standard Unix mbox spool or directory" msgstr "Standard Unix mbox spool or directory" -#: camel/providers/local/camel-local-provider.c:102 +#: camel/providers/local/camel-local-provider.c:109 msgid "" "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." @@ -10797,99 +10794,99 @@ msgstr "" "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." -#: camel/providers/local/camel-local-store.c:142 -#: camel/providers/local/camel-local-store.c:253 -#: camel/providers/local/camel-mbox-store.c:355 -#: camel/providers/local/camel-spool-store.c:116 +#: camel/providers/local/camel-local-store.c:143 +#: camel/providers/local/camel-local-store.c:254 +#: camel/providers/local/camel-mbox-store.c:356 +#: camel/providers/local/camel-spool-store.c:117 #, c-format msgid "Store root %s is not an absolute path" msgstr "Store root %s is not an absolute path" -#: camel/providers/local/camel-local-store.c:149 +#: camel/providers/local/camel-local-store.c:150 #, c-format msgid "Store root %s is not a regular directory" msgstr "Store root %s is not a regular directory" -#: camel/providers/local/camel-local-store.c:158 -#: camel/providers/local/camel-local-store.c:166 -#: camel/providers/local/camel-local-store.c:264 +#: camel/providers/local/camel-local-store.c:159 +#: camel/providers/local/camel-local-store.c:167 +#: camel/providers/local/camel-local-store.c:265 #, c-format msgid "Cannot get folder: %s: %s" msgstr "Cannot get folder: %s: %s" -#: camel/providers/local/camel-local-store.c:178 +#: camel/providers/local/camel-local-store.c:179 msgid "Local stores do not have an inbox" msgstr "Local stores do not have an inbox" -#: camel/providers/local/camel-local-store.c:224 +#: camel/providers/local/camel-local-store.c:225 #, c-format msgid "Local mail file %s" msgstr "Local mail file %s" -#: camel/providers/local/camel-local-store.c:333 +#: camel/providers/local/camel-local-store.c:334 #, c-format msgid "Could not rename folder %s to %s: %s" msgstr "Could not rename folder %s to %s: %s" -#: camel/providers/local/camel-local-store.c:398 +#: camel/providers/local/camel-local-store.c:399 #, c-format msgid "Could not rename '%s': %s" msgstr "Could not rename '%s': %s" -#: camel/providers/local/camel-local-store.c:423 -#: camel/providers/local/camel-mbox-store.c:284 +#: camel/providers/local/camel-local-store.c:424 +#: camel/providers/local/camel-mbox-store.c:285 #, c-format msgid "Could not delete folder summary file `%s': %s" msgstr "Could not delete folder summary file `%s': %s" -#: camel/providers/local/camel-local-store.c:433 -#: camel/providers/local/camel-mbox-store.c:296 +#: camel/providers/local/camel-local-store.c:434 +#: camel/providers/local/camel-mbox-store.c:297 #, c-format msgid "Could not delete folder index file `%s': %s" msgstr "Could not delete folder index file `%s': %s" -#: camel/providers/local/camel-local-store.c:456 -#: camel/providers/local/camel-mbox-store.c:320 +#: camel/providers/local/camel-local-store.c:457 +#: camel/providers/local/camel-mbox-store.c:321 #, c-format msgid "Could not delete folder meta file `%s': %s" msgstr "Could not delete folder meta file `%s': %s" -#: camel/providers/local/camel-local-summary.c:405 +#: camel/providers/local/camel-local-summary.c:406 #, c-format msgid "Could not save summary: %s: %s" msgstr "Could not save summary: %s: %s" -#: camel/providers/local/camel-local-summary.c:464 +#: camel/providers/local/camel-local-summary.c:465 msgid "Unable to add message to summary: unknown reason" msgstr "Unable to add message to summary: unknown reason" #. Inbox is always first -#: camel/providers/local/camel-maildir-folder.c:74 -#: camel/providers/local/camel-maildir-store.c:232 -#: camel/providers/local/camel-maildir-store.c:248 +#: camel/providers/local/camel-maildir-folder.c:75 +#: camel/providers/local/camel-maildir-store.c:233 +#: camel/providers/local/camel-maildir-store.c:249 #: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214 msgid "Inbox" msgstr "Inbox" -#: camel/providers/local/camel-maildir-folder.c:214 +#: camel/providers/local/camel-maildir-folder.c:215 msgid "Maildir append message cancelled" msgstr "Maildir append message canceled" -#: camel/providers/local/camel-maildir-folder.c:217 +#: camel/providers/local/camel-maildir-folder.c:218 #, c-format msgid "Cannot append message to maildir folder: %s: %s" msgstr "Cannot append message to maildir folder: %s: %s" -#: camel/providers/local/camel-maildir-folder.c:243 -#: camel/providers/local/camel-maildir-folder.c:257 -#: camel/providers/local/camel-maildir-folder.c:266 -#: camel/providers/local/camel-mbox-folder.c:417 -#: camel/providers/local/camel-mbox-folder.c:436 -#: camel/providers/local/camel-mbox-folder.c:467 -#: camel/providers/local/camel-mbox-folder.c:475 -#: camel/providers/local/camel-mh-folder.c:201 -#: camel/providers/local/camel-mh-folder.c:212 -#: camel/providers/local/camel-mh-folder.c:221 +#: camel/providers/local/camel-maildir-folder.c:244 +#: camel/providers/local/camel-maildir-folder.c:258 +#: camel/providers/local/camel-maildir-folder.c:267 +#: camel/providers/local/camel-mbox-folder.c:418 +#: camel/providers/local/camel-mbox-folder.c:437 +#: camel/providers/local/camel-mbox-folder.c:468 +#: camel/providers/local/camel-mbox-folder.c:476 +#: camel/providers/local/camel-mh-folder.c:202 +#: camel/providers/local/camel-mh-folder.c:213 +#: camel/providers/local/camel-mh-folder.c:222 #, c-format msgid "" "Cannot get message: %s from folder %s\n" @@ -10898,118 +10895,118 @@ msgstr "" "Cannot get message: %s from folder %s\n" " %s" -#: camel/providers/local/camel-maildir-folder.c:267 +#: camel/providers/local/camel-maildir-folder.c:268 msgid "Invalid message contents" msgstr "Invalid message contents" -#: camel/providers/local/camel-maildir-store.c:109 -#: camel/providers/local/camel-mbox-store.c:154 -#: camel/providers/local/camel-mh-store.c:204 +#: camel/providers/local/camel-maildir-store.c:110 +#: camel/providers/local/camel-mbox-store.c:155 +#: camel/providers/local/camel-mh-store.c:205 #, c-format msgid "Cannot get folder `%s': %s" msgstr "Cannot get folder `%s': %s" -#: camel/providers/local/camel-maildir-store.c:113 -#: camel/providers/local/camel-mbox-store.c:162 -#: camel/providers/local/camel-mh-store.c:211 +#: camel/providers/local/camel-maildir-store.c:114 +#: camel/providers/local/camel-mbox-store.c:163 +#: camel/providers/local/camel-mh-store.c:212 #, c-format msgid "Cannot get folder `%s': folder does not exist." msgstr "Cannot get folder `%s': folder does not exist." -#: camel/providers/local/camel-maildir-store.c:121 -#: camel/providers/local/camel-mbox-store.c:184 -#: camel/providers/local/camel-mbox-store.c:196 +#: camel/providers/local/camel-maildir-store.c:122 +#: camel/providers/local/camel-mbox-store.c:185 +#: camel/providers/local/camel-mbox-store.c:197 #, c-format msgid "Cannot create folder `%s': %s" msgstr "Cannot create folder `%s': %s" -#: camel/providers/local/camel-maildir-store.c:136 +#: camel/providers/local/camel-maildir-store.c:137 #, c-format msgid "Cannot get folder `%s': not a maildir directory." msgstr "Cannot get folder `%s': not a maildir directory." -#: camel/providers/local/camel-maildir-store.c:175 -#: camel/providers/local/camel-maildir-store.c:213 -#: camel/providers/local/camel-mh-store.c:260 +#: camel/providers/local/camel-maildir-store.c:176 +#: camel/providers/local/camel-maildir-store.c:214 +#: camel/providers/local/camel-mh-store.c:261 #, c-format msgid "Could not delete folder `%s': %s" msgstr "Could not delete folder `%s': %s" -#: camel/providers/local/camel-maildir-store.c:177 +#: camel/providers/local/camel-maildir-store.c:178 msgid "not a maildir directory" msgstr "not a maildir directory" -#: camel/providers/local/camel-maildir-store.c:355 -#: camel/providers/local/camel-spool-store.c:284 -#: camel/providers/local/camel-spool-store.c:314 +#: camel/providers/local/camel-maildir-store.c:356 +#: camel/providers/local/camel-spool-store.c:285 +#: camel/providers/local/camel-spool-store.c:315 #, c-format msgid "Could not scan folder `%s': %s" msgstr "Could not scan folder `%s': %s" -#: camel/providers/local/camel-maildir-summary.c:419 -#: camel/providers/local/camel-maildir-summary.c:550 +#: camel/providers/local/camel-maildir-summary.c:420 +#: camel/providers/local/camel-maildir-summary.c:551 #, c-format msgid "Cannot open maildir directory path: %s: %s" msgstr "Cannot open maildir directory path: %s: %s" -#: camel/providers/local/camel-maildir-summary.c:543 +#: camel/providers/local/camel-maildir-summary.c:544 msgid "Checking folder consistency" msgstr "Checking folder consistency" -#: camel/providers/local/camel-maildir-summary.c:646 +#: camel/providers/local/camel-maildir-summary.c:647 msgid "Checking for new messages" msgstr "Checking for new messages" -#: camel/providers/local/camel-maildir-summary.c:735 -#: camel/providers/local/camel-mbox-summary.c:369 -#: camel/providers/local/camel-mbox-summary.c:542 -#: camel/providers/local/camel-mbox-summary.c:633 -#: camel/providers/local/camel-spool-summary.c:137 +#: camel/providers/local/camel-maildir-summary.c:736 +#: camel/providers/local/camel-mbox-summary.c:370 +#: camel/providers/local/camel-mbox-summary.c:543 +#: camel/providers/local/camel-mbox-summary.c:634 +#: camel/providers/local/camel-spool-summary.c:138 msgid "Storing folder" msgstr "Storing folder" -#: camel/providers/local/camel-mbox-folder.c:225 -#: camel/providers/local/camel-spool-folder.c:148 +#: camel/providers/local/camel-mbox-folder.c:226 +#: camel/providers/local/camel-spool-folder.c:147 #, c-format msgid "Cannot create folder lock on %s: %s" msgstr "Cannot create folder lock on %s: %s" -#: camel/providers/local/camel-mbox-folder.c:284 +#: camel/providers/local/camel-mbox-folder.c:285 #, c-format msgid "Cannot open mailbox: %s: %s\n" msgstr "Cannot open mailbox: %s: %s\n" -#: camel/providers/local/camel-mbox-folder.c:344 +#: camel/providers/local/camel-mbox-folder.c:345 msgid "Mail append cancelled" msgstr "Mail append canceled" -#: camel/providers/local/camel-mbox-folder.c:347 +#: camel/providers/local/camel-mbox-folder.c:348 #, c-format msgid "Cannot append message to mbox file: %s: %s" msgstr "Cannot append message to mbox file: %s: %s" -#: camel/providers/local/camel-mbox-folder.c:468 +#: camel/providers/local/camel-mbox-folder.c:469 msgid "The folder appears to be irrecoverably corrupted." msgstr "The folder appears to be irrecoverably corrupted." -#: camel/providers/local/camel-mbox-folder.c:476 -#: camel/providers/local/camel-mh-folder.c:222 +#: camel/providers/local/camel-mbox-folder.c:477 +#: camel/providers/local/camel-mh-folder.c:223 msgid "Message construction failed." msgstr "Message construction failed." -#: camel/providers/local/camel-mbox-store.c:176 -#: camel/providers/local/camel-mbox-store.c:361 +#: camel/providers/local/camel-mbox-store.c:177 +#: camel/providers/local/camel-mbox-store.c:362 msgid "Cannot create a folder by this name." msgstr "Cannot create a folder by this name." -#: camel/providers/local/camel-mbox-store.c:206 +#: camel/providers/local/camel-mbox-store.c:207 #, c-format msgid "Cannot get folder `%s': not a regular file." msgstr "Cannot get folder `%s': not a regular file." -#: camel/providers/local/camel-mbox-store.c:236 -#: camel/providers/local/camel-mbox-store.c:247 -#: camel/providers/local/camel-mbox-store.c:270 +#: camel/providers/local/camel-mbox-store.c:237 +#: camel/providers/local/camel-mbox-store.c:248 +#: camel/providers/local/camel-mbox-store.c:271 #, c-format msgid "" "Could not delete folder `%s':\n" @@ -11018,157 +11015,157 @@ msgstr "" "Could not delete folder `%s':\n" "%s" -#: camel/providers/local/camel-mbox-store.c:255 +#: camel/providers/local/camel-mbox-store.c:256 #, c-format msgid "`%s' is not a regular file." msgstr "`%s' is not a regular file." -#: camel/providers/local/camel-mbox-store.c:262 +#: camel/providers/local/camel-mbox-store.c:263 #, c-format msgid "Folder `%s' is not empty. Not deleted." msgstr "Folder `%s' is not empty. Not deleted." -#: camel/providers/local/camel-mbox-store.c:374 +#: camel/providers/local/camel-mbox-store.c:375 #, c-format msgid "Cannot create directory `%s': %s." msgstr "Cannot create directory `%s': %s." -#: camel/providers/local/camel-mbox-store.c:388 +#: camel/providers/local/camel-mbox-store.c:389 #, c-format msgid "Cannot create folder: %s: %s" msgstr "Cannot create folder: %s: %s" -#: camel/providers/local/camel-mbox-store.c:390 +#: camel/providers/local/camel-mbox-store.c:391 msgid "Folder already exists" msgstr "Folder already exists" -#: camel/providers/local/camel-mbox-store.c:472 +#: camel/providers/local/camel-mbox-store.c:473 msgid "The new folder name is illegal." msgstr "The new folder name is illegal." -#: camel/providers/local/camel-mbox-store.c:485 +#: camel/providers/local/camel-mbox-store.c:486 #, c-format msgid "Could not rename `%s': `%s': %s" msgstr "Could not rename `%s': `%s': %s" -#: camel/providers/local/camel-mbox-store.c:560 +#: camel/providers/local/camel-mbox-store.c:561 #, c-format msgid "Could not rename '%s' to %s: %s" msgstr "Could not rename '%s' to %s: %s" -#: camel/providers/local/camel-mbox-summary.c:375 +#: camel/providers/local/camel-mbox-summary.c:376 #, c-format msgid "Could not open folder: %s: %s" msgstr "Could not open folder: %s: %s" -#: camel/providers/local/camel-mbox-summary.c:423 +#: camel/providers/local/camel-mbox-summary.c:424 #, c-format msgid "Fatal mail parser error near position %ld in folder %s" msgstr "Fatal mail parser error near position %ld in folder %s" -#: camel/providers/local/camel-mbox-summary.c:479 +#: camel/providers/local/camel-mbox-summary.c:480 #, c-format msgid "Cannot check folder: %s: %s" msgstr "Cannot check folder: %s: %s" -#: camel/providers/local/camel-mbox-summary.c:547 -#: camel/providers/local/camel-mbox-summary.c:638 -#: camel/providers/local/camel-spool-summary.c:142 +#: camel/providers/local/camel-mbox-summary.c:548 +#: camel/providers/local/camel-mbox-summary.c:639 +#: camel/providers/local/camel-spool-summary.c:143 #, c-format msgid "Could not open file: %s: %s" msgstr "Could not open file: %s: %s" -#: camel/providers/local/camel-mbox-summary.c:559 -#: camel/providers/local/camel-spool-summary.c:162 +#: camel/providers/local/camel-mbox-summary.c:560 +#: camel/providers/local/camel-spool-summary.c:163 #, c-format msgid "Cannot open temporary mailbox: %s" msgstr "Cannot open temporary mailbox: %s" -#: camel/providers/local/camel-mbox-summary.c:572 -#: camel/providers/local/camel-mbox-summary.c:736 +#: camel/providers/local/camel-mbox-summary.c:573 +#: camel/providers/local/camel-mbox-summary.c:737 #, c-format msgid "Could not close source folder %s: %s" msgstr "Could not close source folder %s: %s" -#: camel/providers/local/camel-mbox-summary.c:581 +#: camel/providers/local/camel-mbox-summary.c:582 #, c-format msgid "Could not close temp folder: %s" msgstr "Could not close temp folder: %s" -#: camel/providers/local/camel-mbox-summary.c:592 +#: camel/providers/local/camel-mbox-summary.c:593 #, c-format msgid "Could not rename folder: %s" msgstr "Could not rename folder: %s" -#: camel/providers/local/camel-mbox-summary.c:676 -#: camel/providers/local/camel-mbox-summary.c:684 -#: camel/providers/local/camel-mbox-summary.c:877 -#: camel/providers/local/camel-mbox-summary.c:885 +#: camel/providers/local/camel-mbox-summary.c:677 +#: camel/providers/local/camel-mbox-summary.c:685 +#: camel/providers/local/camel-mbox-summary.c:878 +#: camel/providers/local/camel-mbox-summary.c:886 msgid "Summary and folder mismatch, even after a sync" msgstr "Summary and folder mismatch, even after a sync" -#: camel/providers/local/camel-mbox-summary.c:811 -#: camel/providers/local/camel-spool-summary.c:334 +#: camel/providers/local/camel-mbox-summary.c:812 +#: camel/providers/local/camel-spool-summary.c:335 #, c-format msgid "Unknown error: %s" msgstr "Unknown error: %s" -#: camel/providers/local/camel-mbox-summary.c:846 +#: camel/providers/local/camel-mbox-summary.c:847 #, c-format msgid "Could not store folder: %s" msgstr "Could not store folder: %s" -#: camel/providers/local/camel-mbox-summary.c:940 -#: camel/providers/local/camel-mbox-summary.c:966 +#: camel/providers/local/camel-mbox-summary.c:941 +#: camel/providers/local/camel-mbox-summary.c:967 #, c-format msgid "Error writing to temp mailbox: %s" msgstr "Error writing to temp mailbox: %s" -#: camel/providers/local/camel-mbox-summary.c:957 +#: camel/providers/local/camel-mbox-summary.c:958 #, c-format msgid "Writing to tmp mailbox failed: %s: %s" msgstr "Writing to tmp mailbox failed: %s: %s" -#: camel/providers/local/camel-mh-folder.c:174 +#: camel/providers/local/camel-mh-folder.c:175 msgid "MH append message cancelled" msgstr "MH append message canceled" -#: camel/providers/local/camel-mh-folder.c:177 +#: camel/providers/local/camel-mh-folder.c:178 #, c-format msgid "Cannot append message to mh folder: %s: %s" msgstr "Cannot append message to mh folder: %s: %s" -#: camel/providers/local/camel-mh-store.c:219 +#: camel/providers/local/camel-mh-store.c:220 #, c-format msgid "Could not create folder `%s': %s" msgstr "Could not create folder `%s': %s" -#: camel/providers/local/camel-mh-store.c:231 +#: camel/providers/local/camel-mh-store.c:232 #, c-format msgid "Cannot get folder `%s': not a directory." msgstr "Cannot get folder `%s': not a directory." -#: camel/providers/local/camel-mh-summary.c:244 +#: camel/providers/local/camel-mh-summary.c:245 #, c-format msgid "Cannot open MH directory path: %s: %s" msgstr "Cannot open MH directory path: %s: %s" -#: camel/providers/local/camel-spool-store.c:122 +#: camel/providers/local/camel-spool-store.c:123 #, c-format msgid "Spool `%s' cannot be opened: %s" msgstr "Spool `%s' cannot be opened: %s" -#: camel/providers/local/camel-spool-store.c:134 +#: camel/providers/local/camel-spool-store.c:135 #, c-format msgid "Spool `%s' is not a regular file or directory" msgstr "Spool `%s' is not a regular file or directory" -#: camel/providers/local/camel-spool-store.c:153 +#: camel/providers/local/camel-spool-store.c:154 #, c-format msgid "Folder `%s/%s' does not exist." msgstr "Folder `%s/%s' does not exist." -#: camel/providers/local/camel-spool-store.c:163 +#: camel/providers/local/camel-spool-store.c:164 #, c-format msgid "" "Could not open folder `%s':\n" @@ -11177,12 +11174,12 @@ msgstr "" "Could not open folder `%s':\n" "%s" -#: camel/providers/local/camel-spool-store.c:167 +#: camel/providers/local/camel-spool-store.c:168 #, c-format msgid "Folder `%s' does not exist." msgstr "Folder `%s' does not exist." -#: camel/providers/local/camel-spool-store.c:172 +#: camel/providers/local/camel-spool-store.c:173 #, c-format msgid "" "Could not create folder `%s':\n" @@ -11191,48 +11188,48 @@ msgstr "" "Could not create folder `%s':\n" "%s" -#: camel/providers/local/camel-spool-store.c:180 +#: camel/providers/local/camel-spool-store.c:181 #, c-format msgid "`%s' is not a mailbox file." msgstr "`%s' is not a mailbox file." -#: camel/providers/local/camel-spool-store.c:197 +#: camel/providers/local/camel-spool-store.c:198 msgid "Store does not support an INBOX" msgstr "Store does not support an INBOX" -#: camel/providers/local/camel-spool-store.c:209 +#: camel/providers/local/camel-spool-store.c:210 #, c-format msgid "Spool mail file %s" msgstr "Spool mail file %s" -#: camel/providers/local/camel-spool-store.c:209 +#: camel/providers/local/camel-spool-store.c:210 #, c-format msgid "Spool folder tree %s" msgstr "Spool folder tree %s" -#: camel/providers/local/camel-spool-store.c:217 +#: camel/providers/local/camel-spool-store.c:218 msgid "Spool folders cannot be renamed" msgstr "Spool folders cannot be renamed" -#: camel/providers/local/camel-spool-store.c:225 +#: camel/providers/local/camel-spool-store.c:226 msgid "Spool folders cannot be deleted" msgstr "Spool folders cannot be deleted" -#: camel/providers/local/camel-spool-summary.c:175 -#: camel/providers/local/camel-spool-summary.c:185 -#: camel/providers/local/camel-spool-summary.c:195 +#: camel/providers/local/camel-spool-summary.c:176 +#: camel/providers/local/camel-spool-summary.c:186 +#: camel/providers/local/camel-spool-summary.c:196 #, c-format msgid "Could not sync temporary folder %s: %s" msgstr "Could not sync temporary folder %s: %s" -#: camel/providers/local/camel-spool-summary.c:211 +#: camel/providers/local/camel-spool-summary.c:212 #, c-format msgid "Could not sync spool folder %s: %s" msgstr "Could not sync spool folder %s: %s" -#: camel/providers/local/camel-spool-summary.c:242 -#: camel/providers/local/camel-spool-summary.c:261 -#: camel/providers/local/camel-spool-summary.c:274 +#: camel/providers/local/camel-spool-summary.c:243 +#: camel/providers/local/camel-spool-summary.c:262 +#: camel/providers/local/camel-spool-summary.c:275 #, c-format msgid "" "Could not sync spool folder %s: %s\n" @@ -11263,10 +11260,10 @@ msgstr "Server rejected username/password" #: camel/providers/nntp/camel-nntp-folder.c:149 #: camel/providers/nntp/camel-nntp-folder.c:158 #: camel/providers/nntp/camel-nntp-folder.c:234 -#: camel/providers/pop3/camel-pop3-folder.c:433 -#: camel/providers/pop3/camel-pop3-folder.c:494 -#: camel/providers/pop3/camel-pop3-folder.c:501 -#: camel/providers/pop3/camel-pop3-folder.c:512 +#: camel/providers/pop3/camel-pop3-folder.c:434 +#: camel/providers/pop3/camel-pop3-folder.c:495 +#: camel/providers/pop3/camel-pop3-folder.c:502 +#: camel/providers/pop3/camel-pop3-folder.c:513 #, c-format msgid "Cannot get message %s: %s" msgstr "Cannot get message %s: %s" @@ -11274,10 +11271,10 @@ msgstr "Cannot get message %s: %s" #: camel/providers/nntp/camel-nntp-folder.c:156 #: camel/providers/nntp/camel-nntp-folder.c:232 #: camel/providers/nntp/camel-nntp-folder.c:371 -#: camel/providers/pop3/camel-pop3-folder.c:262 -#: camel/providers/pop3/camel-pop3-folder.c:430 -#: camel/providers/pop3/camel-pop3-folder.c:491 -#: camel/providers/pop3/camel-pop3-folder.c:509 +#: camel/providers/pop3/camel-pop3-folder.c:263 +#: camel/providers/pop3/camel-pop3-folder.c:431 +#: camel/providers/pop3/camel-pop3-folder.c:492 +#: camel/providers/pop3/camel-pop3-folder.c:510 msgid "User cancelled" msgstr "User canceled" @@ -11318,25 +11315,25 @@ msgstr "Unable to load grouplist file for %s: %s" msgid "Unable to save grouplist file for %s: %s" msgstr "Unable to save grouplist file for %s: %s" -#: camel/providers/nntp/camel-nntp-provider.c:43 +#: camel/providers/nntp/camel-nntp-provider.c:44 msgid "" "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" msgstr "" "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)" -#: camel/providers/nntp/camel-nntp-provider.c:45 +#: camel/providers/nntp/camel-nntp-provider.c:46 msgid "In the subscription dialog, show relative folder names" msgstr "In the subscription dialog, show relative folder names" -#: camel/providers/nntp/camel-nntp-provider.c:52 +#: camel/providers/nntp/camel-nntp-provider.c:53 msgid "USENET news" msgstr "USENET news" -#: camel/providers/nntp/camel-nntp-provider.c:54 +#: camel/providers/nntp/camel-nntp-provider.c:55 msgid "This is a provider for reading from and posting toUSENET newsgroups." msgstr "This is a provider for reading from and posting toUSENET newsgroups." -#: camel/providers/nntp/camel-nntp-provider.c:73 +#: camel/providers/nntp/camel-nntp-provider.c:74 msgid "" "This option will authenticate with the NNTP server using a plaintext " "password." @@ -11427,83 +11424,83 @@ msgstr "Not connected." msgid "No such folder: %s" msgstr "No such folder: %s" -#: camel/providers/nntp/camel-nntp-summary.c:218 -#: camel/providers/nntp/camel-nntp-summary.c:314 +#: camel/providers/nntp/camel-nntp-summary.c:219 +#: camel/providers/nntp/camel-nntp-summary.c:315 #, c-format msgid "%s: Scanning new messages" msgstr "%s: Scanning new messages" -#: camel/providers/nntp/camel-nntp-summary.c:225 +#: camel/providers/nntp/camel-nntp-summary.c:226 #, c-format msgid "Unexpected server response from xover: %s" msgstr "Unexpected server response from xover: %s" -#: camel/providers/nntp/camel-nntp-summary.c:328 +#: camel/providers/nntp/camel-nntp-summary.c:329 #, c-format msgid "Unexpected server response from head: %s" msgstr "Unexpected server response from head: %s" -#: camel/providers/nntp/camel-nntp-summary.c:368 +#: camel/providers/nntp/camel-nntp-summary.c:369 msgid "Use cancel" msgstr "Use cancel" -#: camel/providers/nntp/camel-nntp-summary.c:370 +#: camel/providers/nntp/camel-nntp-summary.c:371 #, c-format msgid "Operation failed: %s" msgstr "Operation failed: %s" -#: camel/providers/pop3/camel-pop3-folder.c:246 +#: camel/providers/pop3/camel-pop3-folder.c:247 msgid "Retrieving POP summary" msgstr "Retrieving POP summary" -#: camel/providers/pop3/camel-pop3-folder.c:265 +#: camel/providers/pop3/camel-pop3-folder.c:266 #, c-format msgid "Cannot get POP summary: %s" msgstr "Cannot get POP summary: %s" -#: camel/providers/pop3/camel-pop3-folder.c:308 +#: camel/providers/pop3/camel-pop3-folder.c:309 msgid "Expunging deleted messages" msgstr "Expunging deleted messages" -#: camel/providers/pop3/camel-pop3-folder.c:404 +#: camel/providers/pop3/camel-pop3-folder.c:405 #, c-format msgid "No message with uid %s" msgstr "No message with uid %s" #. Sigh, most of the crap in this function is so that the cancel button #. returns the proper exception code. Sigh. -#: camel/providers/pop3/camel-pop3-folder.c:411 +#: camel/providers/pop3/camel-pop3-folder.c:412 #, c-format msgid "Retrieving POP message %d" msgstr "Retrieving POP message %d" -#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210 -#: composer/e-msg-composer.c:1231 +#: camel/providers/pop3/camel-pop3-folder.c:502 composer/e-msg-composer.c:1211 +#: composer/e-msg-composer.c:1232 msgid "Unknown reason" msgstr "Unknown reason" -#: camel/providers/pop3/camel-pop3-provider.c:40 +#: camel/providers/pop3/camel-pop3-provider.c:41 msgid "Leave messages on server" msgstr "Leave messages on server" -#: camel/providers/pop3/camel-pop3-provider.c:43 +#: camel/providers/pop3/camel-pop3-provider.c:44 #, c-format msgid "Delete after %s day(s)" msgstr "Delete after %s day(s)" -#: camel/providers/pop3/camel-pop3-provider.c:46 +#: camel/providers/pop3/camel-pop3-provider.c:47 msgid "Disable support for all POP3 extensions" msgstr "Disable support for all POP3 extensions" -#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107 +#: camel/providers/pop3/camel-pop3-provider.c:55 msgid "POP" msgstr "POP" -#: camel/providers/pop3/camel-pop3-provider.c:56 +#: camel/providers/pop3/camel-pop3-provider.c:57 msgid "For connecting to and downloading mail from POP servers." msgstr "For connecting to and downloading mail from POP servers." -#: camel/providers/pop3/camel-pop3-provider.c:73 +#: camel/providers/pop3/camel-pop3-provider.c:74 msgid "" "This option will connect to the POP server using a plaintext password. This " "is the only option supported by many POP servers." @@ -11511,7 +11508,7 @@ msgstr "" "This option will connect to the POP server using a plaintext password. This " "is the only option supported by many POP servers." -#: camel/providers/pop3/camel-pop3-provider.c:83 +#: camel/providers/pop3/camel-pop3-provider.c:84 msgid "" "This option will connect to the POP server using an encrypted password via " "the APOP protocol. This may not work for all users even on servers that " @@ -11521,30 +11518,30 @@ msgstr "" "the APOP protocol. This may not work for all users even on servers that " "claim to support it." -#: camel/providers/pop3/camel-pop3-store.c:195 +#: camel/providers/pop3/camel-pop3-store.c:196 #, c-format msgid "Could not connect to POP server %s (port %d): %s" msgstr "Could not connect to POP server %s (port %d): %s" -#: camel/providers/pop3/camel-pop3-store.c:214 +#: camel/providers/pop3/camel-pop3-store.c:215 #, c-format msgid "Failed to read a valid greeting from POP server %s (port %d)" msgstr "Failed to read a valid greeting from POP server %s (port %d)" -#: camel/providers/pop3/camel-pop3-store.c:232 -#: camel/providers/pop3/camel-pop3-store.c:261 -#: camel/providers/pop3/camel-pop3-store.c:273 +#: camel/providers/pop3/camel-pop3-store.c:233 +#: camel/providers/pop3/camel-pop3-store.c:262 +#: camel/providers/pop3/camel-pop3-store.c:274 #, c-format msgid "Failed to connect to POP server %s in secure mode: %s" msgstr "Failed to connect to POP server %s in secure mode: %s" -#: camel/providers/pop3/camel-pop3-store.c:371 +#: camel/providers/pop3/camel-pop3-store.c:372 #, c-format msgid "Could not connect to POP server %s" msgstr "Could not connect to POP server %s" -#: camel/providers/pop3/camel-pop3-store.c:412 -#: camel/providers/pop3/camel-pop3-store.c:526 +#: camel/providers/pop3/camel-pop3-store.c:413 +#: camel/providers/pop3/camel-pop3-store.c:527 #, c-format msgid "" "Unable to connect to POP server %s: No support for requested authentication " @@ -11553,28 +11550,28 @@ msgstr "" "Unable to connect to POP server %s: No support for requested authentication " "mechanism." -#: camel/providers/pop3/camel-pop3-store.c:428 +#: camel/providers/pop3/camel-pop3-store.c:429 #, c-format msgid "SASL `%s' Login failed for POP server %s: %s" msgstr "SASL `%s' Login failed for POP server %s: %s" -#: camel/providers/pop3/camel-pop3-store.c:440 +#: camel/providers/pop3/camel-pop3-store.c:441 #, c-format msgid "Cannot login to POP server %s: SASL Protocol error" msgstr "Cannot login to POP server %s: SASL Protocol error" -#: camel/providers/pop3/camel-pop3-store.c:459 +#: camel/providers/pop3/camel-pop3-store.c:460 #, c-format msgid "Failed to authenticate on POP server %s: %s" msgstr "Failed to authenticate on POP server %s: %s" -#: camel/providers/pop3/camel-pop3-store.c:485 +#: camel/providers/pop3/camel-pop3-store.c:486 #, c-format msgid "%sPlease enter the POP password for %s on host %s" msgstr "%sPlease enter the POP password for %s on host %s" -#: camel/providers/pop3/camel-pop3-store.c:540 -#: camel/providers/pop3/camel-pop3-store.c:553 +#: camel/providers/pop3/camel-pop3-store.c:541 +#: camel/providers/pop3/camel-pop3-store.c:554 #, c-format msgid "" "Unable to connect to POP server %s.\n" @@ -11583,7 +11580,7 @@ msgstr "" "Unable to connect to POP server %s.\n" "Error sending password: %s" -#: camel/providers/pop3/camel-pop3-store.c:547 +#: camel/providers/pop3/camel-pop3-store.c:548 #, c-format msgid "" "Unable to connect to POP server %s.\n" @@ -11592,17 +11589,16 @@ msgstr "" "Unable to connect to POP server %s.\n" "Error sending username: %s" -#: camel/providers/pop3/camel-pop3-store.c:652 +#: camel/providers/pop3/camel-pop3-store.c:653 #, c-format msgid "No such folder `%s'." msgstr "No such folder `%s'." -#: camel/providers/sendmail/camel-sendmail-provider.c:36 -#: mail/mail-config.glade.h:132 +#: camel/providers/sendmail/camel-sendmail-provider.c:37 msgid "Sendmail" msgstr "Sendmail" -#: camel/providers/sendmail/camel-sendmail-provider.c:38 +#: camel/providers/sendmail/camel-sendmail-provider.c:39 msgid "" "For delivering mail by passing it to the \"sendmail\" program on the local " "system." @@ -11610,53 +11606,53 @@ msgstr "" "For delivering mail by passing it to the \"sendmail\" program on the local " "system." -#: camel/providers/sendmail/camel-sendmail-transport.c:113 +#: camel/providers/sendmail/camel-sendmail-transport.c:114 msgid "Could not parse recipient list" msgstr "Could not parse recipient list" -#: camel/providers/sendmail/camel-sendmail-transport.c:144 +#: camel/providers/sendmail/camel-sendmail-transport.c:145 #, c-format msgid "Could not create pipe to sendmail: %s: mail not sent" msgstr "Could not create pipe to sendmail: %s: mail not sent" -#: camel/providers/sendmail/camel-sendmail-transport.c:165 +#: camel/providers/sendmail/camel-sendmail-transport.c:166 #, c-format msgid "Could not fork sendmail: %s: mail not sent" msgstr "Could not fork sendmail: %s: mail not sent" -#: camel/providers/sendmail/camel-sendmail-transport.c:205 +#: camel/providers/sendmail/camel-sendmail-transport.c:206 #, c-format msgid "Could not send message: %s" msgstr "Could not send message: %s" -#: camel/providers/sendmail/camel-sendmail-transport.c:233 +#: camel/providers/sendmail/camel-sendmail-transport.c:234 #, c-format msgid "sendmail exited with signal %s: mail not sent." msgstr "sendmail exited with signal %s: mail not sent." -#: camel/providers/sendmail/camel-sendmail-transport.c:240 +#: camel/providers/sendmail/camel-sendmail-transport.c:241 #, c-format msgid "Could not execute %s: mail not sent." msgstr "Could not execute %s: mail not sent." -#: camel/providers/sendmail/camel-sendmail-transport.c:245 +#: camel/providers/sendmail/camel-sendmail-transport.c:246 #, c-format msgid "sendmail exited with status %d: mail not sent." msgstr "sendmail exited with status %d: mail not sent." -#: camel/providers/sendmail/camel-sendmail-transport.c:259 +#: camel/providers/sendmail/camel-sendmail-transport.c:260 msgid "sendmail" msgstr "sendmail" -#: camel/providers/sendmail/camel-sendmail-transport.c:261 +#: camel/providers/sendmail/camel-sendmail-transport.c:262 msgid "Mail delivery via the sendmail program" msgstr "Mail delivery via the sendmail program" -#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122 +#: camel/providers/smtp/camel-smtp-provider.c:38 msgid "SMTP" msgstr "SMTP" -#: camel/providers/smtp/camel-smtp-provider.c:39 +#: camel/providers/smtp/camel-smtp-provider.c:40 msgid "For delivering mail by connecting to a remote mailhub using SMTP." msgstr "For delivering mail by connecting to a remote mailhub using SMTP." @@ -11921,44 +11917,41 @@ msgstr "QUIT command failed: %s" msgid "QUIT command failed" msgstr "QUIT command failed" -#: composer/e-msg-composer-attachment-bar.c:106 +#: composer/e-msg-composer-attachment-bar.c:101 #, c-format msgid "%.0fK" msgstr "%.0fK" -#: composer/e-msg-composer-attachment-bar.c:109 +#: composer/e-msg-composer-attachment-bar.c:104 #, c-format msgid "%.0fM" msgstr "%.0fM" -#: composer/e-msg-composer-attachment-bar.c:112 +#: composer/e-msg-composer-attachment-bar.c:107 #, c-format msgid "%.0fG" msgstr "%.0fG" -#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436 +#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436 msgid "attachment" msgstr "attachment" -#: composer/e-msg-composer-attachment-bar.c:454 -msgid "Remove selected items from the attachment list" -msgstr "Remove selected items from the attachment list" - -#: composer/e-msg-composer-attachment-bar.c:494 -msgid "Add attachment..." -msgstr "Add attachment..." +#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2732 +#: ui/evolution-mail-list.xml.h:27 +msgid "_Properties" +msgstr "_Properties" -#: composer/e-msg-composer-attachment-bar.c:495 -msgid "Attach a file to the message" -msgstr "Attach a file to the message" +#: composer/e-msg-composer-attachment-bar.c:443 +msgid "_Add attachment..." +msgstr "_Add attachment..." -#: composer/e-msg-composer-attachment.c:173 -#: composer/e-msg-composer-attachment.c:189 +#: composer/e-msg-composer-attachment.c:174 +#: composer/e-msg-composer-attachment.c:190 #, c-format msgid "Cannot attach file %s: %s" msgstr "Cannot attach file %s: %s" -#: composer/e-msg-composer-attachment.c:181 +#: composer/e-msg-composer-attachment.c:182 #, c-format msgid "Cannot attach file %s: not a regular file" msgstr "Cannot attach file %s: not a regular file" @@ -11976,20 +11969,20 @@ msgid "MIME type:" msgstr "MIME type:" #: composer/e-msg-composer-attachment.glade.h:6 -#: composer/e-msg-composer-select-file.c:92 -#: composer/e-msg-composer-select-file.c:111 +#: composer/e-msg-composer-select-file.c:93 +#: composer/e-msg-composer-select-file.c:112 msgid "Suggest automatic display of attachment" msgstr "Suggest automatic display of attachment" -#: composer/e-msg-composer-hdrs.c:512 +#: composer/e-msg-composer-hdrs.c:513 msgid "Posting destination" msgstr "Posting destination" -#: composer/e-msg-composer-hdrs.c:513 +#: composer/e-msg-composer-hdrs.c:514 msgid "Choose folders to post the message to." msgstr "Choose folders to post the message to." -#: composer/e-msg-composer-hdrs.c:547 +#: composer/e-msg-composer-hdrs.c:548 msgid "Click here for the address book" msgstr "Click here for the address book" @@ -12000,45 +11993,45 @@ msgstr "Click here for the address book" #. * because that causes from_changed to be called, which #. * expects the reply_to fields to be initialized. #. -#: composer/e-msg-composer-hdrs.c:577 +#: composer/e-msg-composer-hdrs.c:578 msgid "Reply-To:" msgstr "Reply-To:" #. #. * From #. -#: composer/e-msg-composer-hdrs.c:583 +#: composer/e-msg-composer-hdrs.c:584 msgid "From:" msgstr "From:" #. #. * Subject #. -#: composer/e-msg-composer-hdrs.c:589 +#: composer/e-msg-composer-hdrs.c:590 msgid "Subject:" msgstr "Subject:" -#: composer/e-msg-composer-hdrs.c:598 +#: composer/e-msg-composer-hdrs.c:599 msgid "To:" msgstr "To:" -#: composer/e-msg-composer-hdrs.c:599 +#: composer/e-msg-composer-hdrs.c:600 msgid "Enter the recipients of the message" msgstr "Enter the recipients of the message" -#: composer/e-msg-composer-hdrs.c:602 +#: composer/e-msg-composer-hdrs.c:603 msgid "Cc:" msgstr "Cc:" -#: composer/e-msg-composer-hdrs.c:603 +#: composer/e-msg-composer-hdrs.c:604 msgid "Enter the addresses that will receive a carbon copy of the message" msgstr "Enter the addresses that will receive a carbon copy of the message" -#: composer/e-msg-composer-hdrs.c:606 +#: composer/e-msg-composer-hdrs.c:607 msgid "Bcc:" msgstr "Bcc:" -#: composer/e-msg-composer-hdrs.c:607 +#: composer/e-msg-composer-hdrs.c:608 msgid "" "Enter the addresses that will receive a carbon copy of the message without " "appearing in the recipient list of the message." @@ -12049,25 +12042,25 @@ msgstr "" #. #. * Post-To #. -#: composer/e-msg-composer-hdrs.c:614 +#: composer/e-msg-composer-hdrs.c:615 msgid "Post To:" msgstr "Post To:" -#: composer/e-msg-composer-hdrs.c:619 +#: composer/e-msg-composer-hdrs.c:620 msgid "Click here to select folders to post to" msgstr "Click here to select folders to post to" -#: composer/e-msg-composer-select-file.c:186 +#: composer/e-msg-composer-select-file.c:187 msgid "Attach file(s)" msgstr "Attach file(s)" -#: composer/e-msg-composer.c:704 +#: composer/e-msg-composer.c:705 msgid "" "Cannot sign outgoing message: No signing certificate set for this account" msgstr "" "Cannot sign outgoing message: No signing certificate set for this account" -#: composer/e-msg-composer.c:711 +#: composer/e-msg-composer.c:712 msgid "" "Cannot encrypt outgoing message: No encryption certificate set for this " "account" @@ -12075,64 +12068,64 @@ msgstr "" "Cannot encrypt outgoing message: No encryption certificate set for this " "account" -#: composer/e-msg-composer.c:1268 +#: composer/e-msg-composer.c:1269 msgid "Could not open file" msgstr "Could not open file" -#: composer/e-msg-composer.c:1276 +#: composer/e-msg-composer.c:1277 msgid "Unable to retrieve message from editor" msgstr "Unable to retrieve message from editor" -#: composer/e-msg-composer.c:1546 +#: composer/e-msg-composer.c:1547 msgid "Untitled Message" msgstr "Untitled Message" -#: composer/e-msg-composer.c:1576 +#: composer/e-msg-composer.c:1577 msgid "Open file" msgstr "Open file" -#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491 +#: composer/e-msg-composer.c:1984 mail/mail-account-gui.c:1498 msgid "Autogenerated" msgstr "Autogenerated" -#: composer/e-msg-composer.c:2082 +#: composer/e-msg-composer.c:2083 msgid "Signature:" msgstr "Signature:" -#: composer/e-msg-composer.c:2283 +#: composer/e-msg-composer.c:2284 #, c-format msgid "<b>%d</b> File Attached" msgid_plural "<b>%d</b> Files Attached" msgstr[0] "<b>%d</b> File Attached" msgstr[1] "<b>%d</b> Files Attached" -#: composer/e-msg-composer.c:2312 +#: composer/e-msg-composer.c:2313 msgid "Hide _Attachment Bar (drop attachments here)" msgstr "Hide _Attachment Bar (drop attachments here)" -#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271 +#: composer/e-msg-composer.c:2316 composer/e-msg-composer.c:3272 msgid "Show _Attachment Bar (drop attachments here)" msgstr "Show _Attachment Bar (drop attachments here)" -#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163 -#: composer/e-msg-composer.c:3164 +#: composer/e-msg-composer.c:2333 composer/e-msg-composer.c:3164 +#: composer/e-msg-composer.c:3165 msgid "Compose a message" msgstr "Compose a message" -#: composer/e-msg-composer.c:2634 +#: composer/e-msg-composer.c:2635 #, c-format msgid "Attached message - %s" msgstr "Attached message - %s" #. translators, this count will always be >1 -#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783 +#: composer/e-msg-composer.c:2640 composer/e-msg-composer.c:2784 #, c-format msgid "Attached message" msgid_plural "%d attached messages" msgstr[0] "Attached message" msgstr[1] "%d attached messages" -#: composer/e-msg-composer.c:4341 +#: composer/e-msg-composer.c:4343 msgid "" "<b>(The composer contains a non-text message body, which cannot be edited.)" "<b>" @@ -12668,19 +12661,19 @@ msgid "Choose a file" msgstr "Choose a file" #: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011 -#: mail/mail-config.c:76 mail/mail-config.glade.h:93 +#: mail/mail-config.c:76 mail/mail-config.glade.h:88 msgid "Important" msgstr "Important" #. forest green #: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79 -#: mail/mail-config.glade.h:148 +#: mail/mail-config.glade.h:135 msgid "To Do" msgstr "To Do" #. blue #: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80 -#: mail/mail-config.glade.h:97 +#: mail/mail-config.glade.h:91 msgid "Later" msgstr "Later" @@ -12780,7 +12773,7 @@ msgstr "ago" msgid "months" msgstr "months" -#: filter/filter.glade.h:17 mail/mail-config.glade.h:184 +#: filter/filter.glade.h:17 mail/mail-config.glade.h:170 msgid "seconds" msgstr "seconds" @@ -12850,10 +12843,10 @@ msgstr "Evolution Mail composer configuration control" msgid "Evolution Mail preferences control" msgstr "Evolution Mail preferences control" -#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:419 +#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:420 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902 -#: mail/importers/pine-importer.c:474 mail/mail-component.c:510 -#: mail/mail-component.c:561 +#: mail/importers/pine-importer.c:474 mail/mail-component.c:530 +#: mail/mail-component.c:581 msgid "Mail" msgstr "Mail" @@ -12861,7 +12854,7 @@ msgstr "Mail" msgid "Mail Accounts" msgstr "Mail Accounts" -#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:99 +#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:93 msgid "Mail Preferences" msgstr "Mail Preferences" @@ -12870,47 +12863,47 @@ msgid "_Mail" msgstr "_Mail" #. translators: default account indicator -#: mail/em-account-prefs.c:418 +#: mail/em-account-prefs.c:433 msgid "[Default]" msgstr "[Default]" -#: mail/em-account-prefs.c:472 +#: mail/em-account-prefs.c:487 msgid "Account name" msgstr "Account name" -#: mail/em-account-prefs.c:474 +#: mail/em-account-prefs.c:489 msgid "Protocol" msgstr "Protocol" -#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424 +#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425 #: mail/mail-config.c:1049 msgid "Unnamed" msgstr "Unnamed" -#: mail/em-composer-prefs.c:909 +#: mail/em-composer-prefs.c:941 msgid "Language(s)" msgstr "Language(s)" -#: mail/em-composer-prefs.c:955 +#: mail/em-composer-prefs.c:987 msgid "Add signature script" msgstr "Add signature script" -#: mail/em-composer-prefs.c:975 +#: mail/em-composer-prefs.c:1007 msgid "Signature(s)" msgstr "Signature(s)" -#: mail/em-composer-utils.c:889 +#: mail/em-composer-utils.c:890 msgid "-------- Forwarded Message --------" msgstr "-------- Forwarded Message --------" -#: mail/em-composer-utils.c:1502 +#: mail/em-composer-utils.c:1503 msgid "an unknown sender" msgstr "an unknown sender" #. Note to translators: this is the attribution string used when quoting messages. #. * each ${Variable} gets replaced with a value. To see a full list of available #. * variables, see em-composer-utils.c:1514 -#: mail/em-composer-utils.c:1549 +#: mail/em-composer-utils.c:1550 msgid "" "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " "${TimeZone}, ${Sender} wrote:" @@ -12923,7 +12916,7 @@ msgid "_Filter Rules" msgstr "_Filter Rules" #: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494 -#: mail/mail-account-gui.c:1347 +#: mail/mail-account-gui.c:1354 msgid "Select Folder" msgstr "Select Folder" @@ -13056,7 +13049,7 @@ msgstr "is not Flagged" msgid "Junk Test" msgstr "Junk Test" -#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:932 +#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:954 #: widgets/misc/e-expander.c:189 msgid "Label" msgstr "Label" @@ -13093,7 +13086,7 @@ msgstr "Pipe to Program" msgid "Play Sound" msgstr "Play Sound" -#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79 +#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:80 msgid "Read" msgstr "Read" @@ -13161,9 +13154,9 @@ msgstr "starts with" msgid "Stop Processing" msgstr "Stop Processing" -#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1550 -#: mail/em-format-quote.c:305 mail/em-format.c:808 mail/em-mailer-prefs.c:87 -#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329 +#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1548 +#: mail/em-format-quote.c:306 mail/em-format.c:825 mail/em-mailer-prefs.c:88 +#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330 #: smime/lib/e-cert.c:1131 msgid "Subject" msgstr "Subject" @@ -13177,28 +13170,28 @@ msgstr "Unset Status" msgid "<b>Then</b>" msgstr "<b>Then</b>" -#: mail/em-folder-browser.c:129 +#: mail/em-folder-browser.c:132 msgid "Create _Virtual Folder From Search..." msgstr "Create _Virtual Folder From Search..." -#: mail/em-folder-properties.c:122 -msgid "Folder Properties" -msgstr "Folder Properties" - #. TODO: can this be done in a loop? -#: mail/em-folder-properties.c:161 +#: mail/em-folder-properties.c:142 msgid "Total message:" msgid_plural "Total messages:" msgstr[0] "Total message:" msgstr[1] "Total messages:" -#: mail/em-folder-properties.c:173 +#: mail/em-folder-properties.c:154 msgid "Unread message:" msgid_plural "Unread messages:" msgstr[0] "Unread message:" msgstr[1] "Unread messages:" -#: mail/em-folder-selection-button.c:120 +#: mail/em-folder-properties.c:268 +msgid "Folder Properties" +msgstr "Folder Properties" + +#: mail/em-folder-selection-button.c:121 msgid "<click here to select a folder>" msgstr "<click here to select a folder>" @@ -13206,8 +13199,8 @@ msgstr "<click here to select a folder>" msgid "Create New Folder" msgstr "Create New Folder" -#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2430 -#: mail/mail-component.c:711 +#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2445 +#: mail/mail-component.c:731 msgid "Specify where to create the folder:" msgstr "Specify where to create the folder:" @@ -13233,262 +13226,255 @@ msgstr "UNMATCHED" msgid "Loading..." msgstr "Loading..." -#: mail/em-folder-tree.c:894 +#: mail/em-folder-tree.c:895 #, c-format msgid "Moving folder %s" msgstr "Moving folder %s" -#: mail/em-folder-tree.c:896 +#: mail/em-folder-tree.c:897 #, c-format msgid "Copying folder %s" msgstr "Copying folder %s" -#: mail/em-folder-tree.c:903 mail/message-list.c:1613 +#: mail/em-folder-tree.c:904 mail/message-list.c:1614 #, c-format msgid "Moving messages into folder %s" msgstr "Moving messages into folder %s" -#: mail/em-folder-tree.c:905 mail/message-list.c:1615 +#: mail/em-folder-tree.c:906 mail/message-list.c:1616 #, c-format msgid "Copying messages into folder %s" msgstr "Copying messages into folder %s" -#: mail/em-folder-tree.c:921 +#: mail/em-folder-tree.c:922 msgid "Cannot drop message(s) into toplevel store" msgstr "Cannot drop message(s) into toplevel store" -#: mail/em-folder-tree.c:1011 ui/evolution-mail-message.xml.h:110 +#: mail/em-folder-tree.c:1018 ui/evolution-mail-message.xml.h:110 msgid "_Copy to Folder" msgstr "_Copy to Folder" -#: mail/em-folder-tree.c:1012 ui/evolution-mail-message.xml.h:119 +#: mail/em-folder-tree.c:1019 ui/evolution-mail-message.xml.h:119 msgid "_Move to Folder" msgstr "_Move to Folder" -#: mail/em-folder-tree.c:1014 mail/em-folder-tree.c:2216 -#: mail/em-folder-view.c:803 mail/message-list.c:1703 +#: mail/em-folder-tree.c:1021 mail/em-folder-tree.c:2229 +#: mail/em-folder-view.c:817 mail/message-list.c:1710 msgid "_Move" msgstr "_Move" -#: mail/em-folder-tree.c:1016 mail/message-list.c:1705 +#: mail/em-folder-tree.c:1023 mail/message-list.c:1712 msgid "Cancel _Drag" msgstr "Cancel _Drag" -#: mail/em-folder-tree.c:2203 mail/em-folder-tree.c:2216 -#: mail/em-folder-view.c:803 mail/em-folder-view.c:817 -#: mail/importers/evolution-mbox-importer.c:119 -#: mail/importers/evolution-outlook-importer.c:133 +#: mail/em-folder-tree.c:2215 mail/em-folder-tree.c:2229 +#: mail/em-folder-view.c:817 mail/em-folder-view.c:832 +#: mail/importers/evolution-mbox-importer.c:120 +#: mail/importers/evolution-outlook-importer.c:134 msgid "Select folder" msgstr "Select folder" -#: mail/em-folder-tree.c:2203 mail/em-folder-view.c:817 +#: mail/em-folder-tree.c:2215 mail/em-folder-view.c:832 msgid "C_opy" msgstr "C_opy" -#: mail/em-folder-tree.c:2243 +#: mail/em-folder-tree.c:2256 #, c-format msgid "Creating folder `%s'" msgstr "Creating folder `%s'" -#: mail/em-folder-tree.c:2430 mail/mail-component.c:711 +#: mail/em-folder-tree.c:2445 mail/mail-component.c:731 msgid "Create folder" msgstr "Create folder" -#: mail/em-folder-tree.c:2621 +#: mail/em-folder-tree.c:2638 #, c-format msgid "Rename the \"%s\" folder to:" msgstr "Rename the \"%s\" folder to:" -#: mail/em-folder-tree.c:2623 +#: mail/em-folder-tree.c:2640 msgid "Rename Folder" msgstr "Rename Folder" -#: mail/em-folder-tree.c:2698 ui/evolution-addressbook.xml.h:44 +#: mail/em-folder-tree.c:2716 ui/evolution-addressbook.xml.h:44 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37 msgid "_View" msgstr "_View" -#: mail/em-folder-tree.c:2699 +#: mail/em-folder-tree.c:2717 msgid "Open in _New Window" msgstr "Open in _New Window" -#: mail/em-folder-tree.c:2703 +#: mail/em-folder-tree.c:2721 msgid "_Copy..." msgstr "_Copy..." -#: mail/em-folder-tree.c:2704 +#: mail/em-folder-tree.c:2722 msgid "_Move..." msgstr "_Move..." #. FIXME: need to disable for nochildren folders -#: mail/em-folder-tree.c:2708 +#: mail/em-folder-tree.c:2726 msgid "_New Folder..." msgstr "_New Folder..." -#: mail/em-folder-tree.c:2711 +#: mail/em-folder-tree.c:2729 msgid "_Rename..." msgstr "_Rename..." -#: mail/em-folder-tree.c:2714 ui/evolution-mail-list.xml.h:27 -msgid "_Properties" -msgstr "_Properties" - -#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 }, -#: mail/em-folder-view.c:900 mail/em-popup.c:690 -#: ui/evolution-mail-message.xml.h:113 +#: mail/em-folder-view.c:922 ui/evolution-mail-message.xml.h:113 msgid "_Edit as New Message..." msgstr "_Edit as New Message..." -#: mail/em-folder-view.c:902 +#: mail/em-folder-view.c:924 msgid "_Print" msgstr "_Print" -#: mail/em-folder-view.c:905 ui/evolution-mail-message.xml.h:127 +#: mail/em-folder-view.c:927 ui/evolution-mail-message.xml.h:127 msgid "_Reply to Sender" msgstr "_Reply to Sender" -#: mail/em-folder-view.c:906 mail/em-popup.c:811 +#: mail/em-folder-view.c:928 mail/em-popup.c:500 #: ui/evolution-mail-message.xml.h:88 msgid "Reply to _List" msgstr "Reply to _List" -#: mail/em-folder-view.c:907 mail/em-popup.c:812 +#: mail/em-folder-view.c:929 mail/em-popup.c:501 #: ui/evolution-mail-message.xml.h:87 msgid "Reply to _All" msgstr "Reply to _All" -#: mail/em-folder-view.c:908 mail/em-popup.c:814 +#: mail/em-folder-view.c:930 mail/em-popup.c:503 #: ui/evolution-mail-message.xml.h:114 msgid "_Forward" msgstr "_Forward" -#: mail/em-folder-view.c:911 +#: mail/em-folder-view.c:933 msgid "Follo_w Up..." msgstr "Follo_w Up..." -#: mail/em-folder-view.c:912 +#: mail/em-folder-view.c:934 msgid "Fla_g Completed" msgstr "Fla_g Completed" -#: mail/em-folder-view.c:913 +#: mail/em-folder-view.c:935 msgid "Cl_ear Flag" msgstr "Cl_ear Flag" -#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:50 +#: mail/em-folder-view.c:938 ui/evolution-mail-message.xml.h:50 msgid "Mar_k as Read" msgstr "Mar_k as Read" -#: mail/em-folder-view.c:917 +#: mail/em-folder-view.c:939 msgid "Mark as _Unread" msgstr "Mark as _Unread" -#: mail/em-folder-view.c:918 +#: mail/em-folder-view.c:940 msgid "Mark as _Important" msgstr "Mark as _Important" -#: mail/em-folder-view.c:919 +#: mail/em-folder-view.c:941 msgid "_Mark as Unimportant" msgstr "_Mark as Unimportant" -#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:54 +#: mail/em-folder-view.c:942 ui/evolution-mail-message.xml.h:54 msgid "Mark as _Junk" msgstr "Mark as _Junk" -#: mail/em-folder-view.c:921 ui/evolution-mail-message.xml.h:55 +#: mail/em-folder-view.c:943 ui/evolution-mail-message.xml.h:55 msgid "Mark as _Not Junk" msgstr "Mark as _Not Junk" -#: mail/em-folder-view.c:925 +#: mail/em-folder-view.c:947 msgid "U_ndelete" msgstr "U_ndelete" -#: mail/em-folder-view.c:928 +#: mail/em-folder-view.c:950 msgid "Mo_ve to Folder..." msgstr "Mo_ve to Folder..." -#: mail/em-folder-view.c:929 ui/evolution-addressbook.xml.h:32 +#: mail/em-folder-view.c:951 ui/evolution-addressbook.xml.h:32 msgid "_Copy to Folder..." msgstr "_Copy to Folder..." -#: mail/em-folder-view.c:937 +#: mail/em-folder-view.c:959 msgid "Add Sender to Address_book" msgstr "Add Sender to Address_book" -#: mail/em-folder-view.c:940 +#: mail/em-folder-view.c:962 msgid "Appl_y Filters" msgstr "Appl_y Filters" -#: mail/em-folder-view.c:941 +#: mail/em-folder-view.c:963 msgid "F_ilter Junk" msgstr "F_ilter Junk" -#: mail/em-folder-view.c:944 +#: mail/em-folder-view.c:966 msgid "Crea_te Rule From Message" msgstr "Crea_te Rule From Message" -#: mail/em-folder-view.c:945 +#: mail/em-folder-view.c:967 msgid "VFolder on _Subject" msgstr "VFolder on _Subject" -#: mail/em-folder-view.c:946 +#: mail/em-folder-view.c:968 msgid "VFolder on Se_nder" msgstr "VFolder on Se_nder" -#: mail/em-folder-view.c:947 +#: mail/em-folder-view.c:969 msgid "VFolder on _Recipients" msgstr "VFolder on _Recipients" -#: mail/em-folder-view.c:948 +#: mail/em-folder-view.c:970 msgid "VFolder on Mailing _List" msgstr "VFolder on Mailing _List" -#: mail/em-folder-view.c:952 +#: mail/em-folder-view.c:974 msgid "Filter on Sub_ject" msgstr "Filter on Sub_ject" -#: mail/em-folder-view.c:953 +#: mail/em-folder-view.c:975 msgid "Filter on Sen_der" msgstr "Filter on Sen_der" -#: mail/em-folder-view.c:954 +#: mail/em-folder-view.c:976 msgid "Filter on Re_cipients" msgstr "Filter on Re_cipients" -#: mail/em-folder-view.c:955 +#: mail/em-folder-view.c:977 msgid "Filter on _Mailing List" msgstr "Filter on _Mailing List" #. default charset used in mail view -#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751 -#: mail/mail-config.glade.h:68 +#: mail/em-folder-view.c:1747 mail/em-folder-view.c:1790 msgid "Default" msgstr "Default" -#: mail/em-folder-view.c:1848 +#: mail/em-folder-view.c:1887 msgid "Print Message" msgstr "Print Message" -#: mail/em-folder-view.c:2115 +#: mail/em-folder-view.c:2148 msgid "_Copy Link Location" msgstr "_Copy Link Location" -#: mail/em-folder-view.c:2380 +#: mail/em-folder-view.c:2412 #, c-format msgid "Click to mail %s" msgstr "Click to mail %s" #. message-search popup match count string -#: mail/em-format-html-display.c:410 +#: mail/em-format-html-display.c:405 #, c-format msgid "Matches: %d" msgstr "Matches: %d" -#: mail/em-format-html-display.c:643 mail/em-format-html.c:582 +#: mail/em-format-html-display.c:638 mail/em-format-html.c:580 msgid "Unsigned" msgstr "Unsigned" -#: mail/em-format-html-display.c:643 +#: mail/em-format-html-display.c:638 msgid "" "This message is not signed. There is no guarantee that this message is " "authentic." @@ -13496,11 +13482,11 @@ msgstr "" "This message is not signed. There is no guarantee that this message is " "authentic." -#: mail/em-format-html-display.c:644 mail/em-format-html.c:583 +#: mail/em-format-html-display.c:639 mail/em-format-html.c:581 msgid "Valid signature" msgstr "Valid signature" -#: mail/em-format-html-display.c:644 +#: mail/em-format-html-display.c:639 msgid "" "This message is signed and is valid meaning that it is very likely that this " "message is authentic." @@ -13508,11 +13494,11 @@ msgstr "" "This message is signed and is valid meaning that it is very likely that this " "message is authentic." -#: mail/em-format-html-display.c:645 mail/em-format-html.c:584 +#: mail/em-format-html-display.c:640 mail/em-format-html.c:582 msgid "Invalid signature" msgstr "Invalid signature" -#: mail/em-format-html-display.c:645 +#: mail/em-format-html-display.c:640 msgid "" "The signature of this message cannot be verified, it may have been altered " "in transit." @@ -13520,11 +13506,11 @@ msgstr "" "The signature of this message cannot be verified, it may have been altered " "in transit." -#: mail/em-format-html-display.c:646 +#: mail/em-format-html-display.c:641 msgid "Valid signature, cannot verify sender" msgstr "Valid signature, cannot verify sender" -#: mail/em-format-html-display.c:646 +#: mail/em-format-html-display.c:641 msgid "" "This message is signed with a valid signature, but the sender of the message " "cannot be verified." @@ -13532,11 +13518,11 @@ msgstr "" "This message is signed with a valid signature, but the sender of the message " "cannot be verified." -#: mail/em-format-html-display.c:652 mail/em-format-html.c:591 +#: mail/em-format-html-display.c:647 mail/em-format-html.c:589 msgid "Unencrypted" msgstr "Unencrypted" -#: mail/em-format-html-display.c:652 +#: mail/em-format-html-display.c:647 msgid "" "This message is not encrypted. Its content may be viewed in transit across " "the Internet." @@ -13544,11 +13530,11 @@ msgstr "" "This message is not encrypted. Its content may be viewed in transit across " "the Internet." -#: mail/em-format-html-display.c:653 mail/em-format-html.c:592 +#: mail/em-format-html-display.c:648 mail/em-format-html.c:590 msgid "Encrypted, weak" msgstr "Encrypted, weak" -#: mail/em-format-html-display.c:653 +#: mail/em-format-html-display.c:648 msgid "" "This message is encrypted, but with a weak encryption algorithm. It would " "be difficult, but not impossible for an outsider to view the content of this " @@ -13558,11 +13544,11 @@ msgstr "" "be difficult, but not impossible for an outsider to view the content of this " "message in a practical amount of time." -#: mail/em-format-html-display.c:654 mail/em-format-html.c:593 +#: mail/em-format-html-display.c:649 mail/em-format-html.c:591 msgid "Encrypted" msgstr "Encrypted" -#: mail/em-format-html-display.c:654 +#: mail/em-format-html-display.c:649 msgid "" "This message is encrypted. It would be difficult for an outsider to view " "the content of this message." @@ -13570,11 +13556,11 @@ msgstr "" "This message is encrypted. It would be difficult for an outsider to view " "the content of this message." -#: mail/em-format-html-display.c:655 mail/em-format-html.c:594 +#: mail/em-format-html-display.c:650 mail/em-format-html.c:592 msgid "Encrypted, strong" msgstr "Encrypted, strong" -#: mail/em-format-html-display.c:655 +#: mail/em-format-html-display.c:650 msgid "" "This message is encrypted, with a strong encryption algorithm. It would be " "very difficult for an outsider to view the content of this message in a " @@ -13584,31 +13570,31 @@ msgstr "" "very difficult for an outsider to view the content of this message in a " "practical amount of time." -#: mail/em-format-html-display.c:756 smime/gui/smime-ui.glade.h:47 +#: mail/em-format-html-display.c:751 smime/gui/smime-ui.glade.h:47 msgid "_View Certificate" msgstr "_View Certificate" -#: mail/em-format-html-display.c:771 +#: mail/em-format-html-display.c:766 msgid "This certificate is not viewable" msgstr "This certificate is not viewable" -#: mail/em-format-html-display.c:1006 +#: mail/em-format-html-display.c:1001 msgid "Completed on %B %d, %Y, %l:%M %p" msgstr "Completed on %B %d, %Y, %l:%M %p" -#: mail/em-format-html-display.c:1014 +#: mail/em-format-html-display.c:1009 msgid "Overdue:" msgstr "Overdue:" -#: mail/em-format-html-display.c:1017 +#: mail/em-format-html-display.c:1012 msgid "by %B %d, %Y, %l:%M %p" msgstr "by %B %d, %Y, %l:%M %p" -#: mail/em-format-html-display.c:1056 +#: mail/em-format-html-display.c:1059 msgid "_View Inline" msgstr "_View Inline" -#: mail/em-format-html-display.c:1057 +#: mail/em-format-html-display.c:1060 msgid "_Hide" msgstr "_Hide" @@ -13617,145 +13603,145 @@ msgstr "_Hide" msgid "Page %d of %d" msgstr "Page %d of %d" -#: mail/em-format-html.c:475 mail/em-format-html.c:477 +#: mail/em-format-html.c:473 mail/em-format-html.c:475 #, c-format msgid "Retrieving `%s'" msgstr "Retrieving `%s'" -#: mail/em-format-html.c:585 +#: mail/em-format-html.c:583 msgid "Valid signature but cannot verify sender" msgstr "Valid signature but cannot verify sender" -#: mail/em-format-html.c:848 +#: mail/em-format-html.c:846 msgid "Malformed external-body part." msgstr "Malformed external-body part." -#: mail/em-format-html.c:878 +#: mail/em-format-html.c:876 #, c-format msgid "Pointer to FTP site (%s)" msgstr "Pointer to FTP site (%s)" -#: mail/em-format-html.c:889 +#: mail/em-format-html.c:887 #, c-format msgid "Pointer to local file (%s) valid at site \"%s\"" msgstr "Pointer to local file (%s) valid at site \"%s\"" -#: mail/em-format-html.c:891 +#: mail/em-format-html.c:889 #, c-format msgid "Pointer to local file (%s)" msgstr "Pointer to local file (%s)" -#: mail/em-format-html.c:912 +#: mail/em-format-html.c:910 #, c-format msgid "Pointer to remote data (%s)" msgstr "Pointer to remote data (%s)" -#: mail/em-format-html.c:923 +#: mail/em-format-html.c:921 #, c-format msgid "Pointer to unknown external data (\"%s\" type)" msgstr "Pointer to unknown external data (\"%s\" type)" -#: mail/em-format-html.c:1165 +#: mail/em-format-html.c:1163 msgid "Formatting message" msgstr "Formatting message" -#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:803 -#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7 -#: mail/message-tag-followup.c:325 +#: mail/em-format-html.c:1439 mail/em-format-quote.c:193 mail/em-format.c:820 +#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7 +#: mail/message-tag-followup.c:326 msgid "From" msgstr "From" -#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:804 -#: mail/em-mailer-prefs.c:83 +#: mail/em-format-html.c:1439 mail/em-format-quote.c:193 mail/em-format.c:821 +#: mail/em-mailer-prefs.c:84 msgid "Reply-To" msgstr "Reply-To" -#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:805 -#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14 +#: mail/em-format-html.c:1439 mail/em-format-quote.c:193 mail/em-format.c:822 +#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14 msgid "To" msgstr "To" -#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:806 -#: mail/em-mailer-prefs.c:85 +#: mail/em-format-html.c:1439 mail/em-format-quote.c:193 mail/em-format.c:823 +#: mail/em-mailer-prefs.c:86 msgid "Cc" msgstr "Cc" -#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:807 -#: mail/em-mailer-prefs.c:86 +#: mail/em-format-html.c:1439 mail/em-format-quote.c:193 mail/em-format.c:824 +#: mail/em-mailer-prefs.c:87 msgid "Bcc" msgstr "Bcc" #. pseudo-header -#: mail/em-format-html.c:1554 mail/em-format-quote.c:314 -#: mail/em-mailer-prefs.c:939 +#: mail/em-format-html.c:1552 mail/em-format-quote.c:315 +#: mail/em-mailer-prefs.c:976 msgid "Mailer" msgstr "Mailer" #. translators: strftime format for local time equivalent in Date header display, with day -#: mail/em-format-html.c:1581 +#: mail/em-format-html.c:1579 msgid "<I> (%a, %R %Z)</I>" msgstr "<I> (%a, %R %Z)</I>" #. translators: strftime format for local time equivalent in Date header display, without day -#: mail/em-format-html.c:1584 +#: mail/em-format-html.c:1582 msgid "<I> (%R %Z)</I>" msgstr "<I> (%R %Z)</I>" -#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:809 -#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2 +#: mail/em-format-html.c:1592 mail/em-format-quote.c:322 mail/em-format.c:826 +#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2 msgid "Date" msgstr "Date" -#: mail/em-format-html.c:1617 mail/em-format.c:810 mail/em-mailer-prefs.c:89 +#: mail/em-format-html.c:1615 mail/em-format.c:827 mail/em-mailer-prefs.c:90 msgid "Newsgroups" msgstr "Newsgroups" -#: mail/em-format.c:1059 +#: mail/em-format.c:1076 #, c-format msgid "%s attachment" msgstr "%s attachment" -#: mail/em-format.c:1098 mail/em-format.c:1231 +#: mail/em-format.c:1115 mail/em-format.c:1248 msgid "Could not parse S/MIME message: Unknown error" msgstr "Could not parse S/MIME message: Unknown error" -#: mail/em-format.c:1221 +#: mail/em-format.c:1238 msgid "Unsupported encryption type for multipart/encrypted" msgstr "Unsupported encryption type for multipart/encrypted" -#: mail/em-format.c:1382 +#: mail/em-format.c:1399 msgid "Could not parse MIME message. Displaying as source." msgstr "Could not parse MIME message. Displaying as source." -#: mail/em-format.c:1401 +#: mail/em-format.c:1418 msgid "Unsupported signature format" msgstr "Unsupported signature format" -#: mail/em-format.c:1409 +#: mail/em-format.c:1426 msgid "Error verifying signature" msgstr "Error verifying signature" -#: mail/em-format.c:1409 +#: mail/em-format.c:1426 msgid "Unknown error verifying signature" msgstr "Unknown error verifying signature" -#: mail/em-junk-filter.c:86 +#: mail/em-junk-filter.c:87 msgid "Spamassassin (built-in)" msgstr "Spamassassin (built-in)" -#: mail/em-mailer-prefs.c:100 +#: mail/em-mailer-prefs.c:101 msgid "Every time" msgstr "Every time" -#: mail/em-mailer-prefs.c:101 +#: mail/em-mailer-prefs.c:102 msgid "Once per day" msgstr "Once per day" -#: mail/em-mailer-prefs.c:102 +#: mail/em-mailer-prefs.c:103 msgid "Once per week" msgstr "Once per week" -#: mail/em-mailer-prefs.c:103 +#: mail/em-mailer-prefs.c:104 msgid "Once per month" msgstr "Once per month" @@ -13819,62 +13805,62 @@ msgstr "" "Unable to read settings from previous Evolution install, `evolution/config." "xmldb' does not exist or is corrupt." -#: mail/em-popup.c:700 +#: mail/em-popup.c:384 msgid "Save As..." msgstr "Save As..." -#: mail/em-popup.c:718 +#: mail/em-popup.c:403 #, c-format msgid "untitled_image.%s" msgstr "untitled_image.%s" -#: mail/em-popup.c:808 +#: mail/em-popup.c:497 msgid "Set as _Background" msgstr "Set as _Background" -#: mail/em-popup.c:810 +#: mail/em-popup.c:499 msgid "_Reply to sender" msgstr "_Reply to sender" -#: mail/em-popup.c:859 +#: mail/em-popup.c:551 msgid "_Open Link in Browser" msgstr "_Open Link in Browser" -#: mail/em-popup.c:860 +#: mail/em-popup.c:552 msgid "Se_nd message to..." msgstr "Se_nd message to..." -#: mail/em-popup.c:861 +#: mail/em-popup.c:553 msgid "_Add to Addressbook" msgstr "_Add to Addressbook" -#: mail/em-popup.c:985 +#: mail/em-popup.c:684 #, c-format msgid "Open in %s..." msgstr "Open in %s..." -#: mail/em-subscribe-editor.c:606 +#: mail/em-subscribe-editor.c:607 msgid "This store does not support subscriptions, or they are not enabled." msgstr "This store does not support subscriptions, or they are not enabled." -#: mail/em-subscribe-editor.c:635 +#: mail/em-subscribe-editor.c:636 msgid "Subscribed" msgstr "Subscribed" -#: mail/em-subscribe-editor.c:639 +#: mail/em-subscribe-editor.c:640 msgid "Folder" msgstr "Folder" #. FIXME: This is just to get the shadow, is there a better way? -#: mail/em-subscribe-editor.c:852 +#: mail/em-subscribe-editor.c:853 msgid "Please select a server." msgstr "Please select a server." -#: mail/em-subscribe-editor.c:873 +#: mail/em-subscribe-editor.c:874 msgid "No server has been selected" msgstr "No server has been selected" -#: mail/em-utils.c:104 +#: mail/em-utils.c:105 msgid "Don't show this message again." msgstr "Don't show this message again." @@ -14415,15 +14401,15 @@ msgid "Evolution is importing your old Elm mail" msgstr "Evolution is importing your old Elm mail" #: mail/importers/elm-importer.c:89 -#: mail/importers/evolution-mbox-importer.c:224 -#: mail/importers/evolution-outlook-importer.c:258 +#: mail/importers/evolution-mbox-importer.c:225 +#: mail/importers/evolution-outlook-importer.c:259 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117 msgid "Importing..." msgstr "Importing..." #: mail/importers/elm-importer.c:91 -#: mail/importers/evolution-mbox-importer.c:226 -#: mail/importers/evolution-outlook-importer.c:260 +#: mail/importers/evolution-mbox-importer.c:227 +#: mail/importers/evolution-outlook-importer.c:261 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119 msgid "Please wait" msgstr "Please wait" @@ -14444,29 +14430,29 @@ msgstr "" msgid "Elm" msgstr "Elm" -#: mail/importers/evolution-mbox-importer.c:116 -#: mail/importers/evolution-outlook-importer.c:130 +#: mail/importers/evolution-mbox-importer.c:117 +#: mail/importers/evolution-outlook-importer.c:131 msgid "Destination folder:" msgstr "Destination folder:" -#: mail/importers/evolution-mbox-importer.c:119 -#: mail/importers/evolution-outlook-importer.c:133 +#: mail/importers/evolution-mbox-importer.c:120 +#: mail/importers/evolution-outlook-importer.c:134 msgid "Select folder to import into" msgstr "Select folder to import into" -#: mail/importers/evolution-mbox-importer.c:222 -#: mail/importers/evolution-outlook-importer.c:256 -#: mail/importers/mail-importer.c:226 +#: mail/importers/evolution-mbox-importer.c:223 +#: mail/importers/evolution-outlook-importer.c:257 +#: mail/importers/mail-importer.c:227 #, c-format msgid "Importing `%s'" msgstr "Importing `%s'" -#: mail/importers/evolution-outlook-importer.c:304 -#: mail/importers/mail-importer.c:140 +#: mail/importers/evolution-outlook-importer.c:305 +#: mail/importers/mail-importer.c:141 msgid "Importing mailbox" msgstr "Importing mailbox" -#: mail/importers/mail-importer.c:361 +#: mail/importers/mail-importer.c:362 #, c-format msgid "Scanning %s" msgstr "Scanning %s" @@ -14577,11 +14563,11 @@ msgid "Pine" msgstr "Pine" #. give our dialog an OK button and title -#: mail/mail-account-editor.c:155 +#: mail/mail-account-editor.c:156 msgid "Evolution Account Editor" msgstr "Evolution Account Editor" -#: mail/mail-account-gui.c:246 +#: mail/mail-account-gui.c:253 #, c-format msgid "" "\n" @@ -14594,23 +14580,27 @@ msgstr "" "for %s displayed below\n" "and tick the check box for accepting it\n" -#: mail/mail-account-gui.c:252 +#: mail/mail-account-gui.c:259 #, c-format msgid "%s License Agreement" msgstr "%s Licence Agreement" -#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167 +#: mail/mail-account-gui.c:964 mail/mail-config.glade.h:154 msgid "_Host:" msgstr "_Host:" -#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151 +#: mail/mail-account-gui.c:968 mail/mail-config.glade.h:138 msgid "User_name:" msgstr "User_name:" -#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173 +#: mail/mail-account-gui.c:972 mail/mail-config.glade.h:160 msgid "_Path:" msgstr "_Path:" +#: mail/mail-account-gui.c:1783 +msgid "Select individual file" +msgstr "Select individual file" + #: mail/mail-autofilter.c:74 #, c-format msgid "Mail to %s" @@ -14635,88 +14625,88 @@ msgstr "%s mailing list" msgid "Add Filter Rule" msgstr "Add Filter Rule" -#: mail/mail-component.c:463 +#: mail/mail-component.c:483 #, c-format msgid "%d deleted" msgid_plural "%d deleted" msgstr[0] "%d deleted" msgstr[1] "%d deleted" -#: mail/mail-component.c:465 +#: mail/mail-component.c:485 #, c-format msgid "%d junk" msgid_plural "%d junk" msgstr[0] "%d junk" msgstr[1] "%d junk" -#: mail/mail-component.c:488 +#: mail/mail-component.c:508 #, c-format msgid "%d draft" msgid_plural "%d drafts" msgstr[0] "%d draft" msgstr[1] "%d drafts" -#: mail/mail-component.c:490 +#: mail/mail-component.c:510 #, c-format msgid "%d sent" msgid_plural "%d sent" msgstr[0] "%d sent" msgstr[1] "%d sent" -#: mail/mail-component.c:492 +#: mail/mail-component.c:512 #, c-format msgid "%d unsent" msgid_plural "%d unsent" msgstr[0] "%d unsent" msgstr[1] "%d unsent" -#: mail/mail-component.c:496 +#: mail/mail-component.c:516 #, c-format msgid "%d total" msgid_plural "%d total" msgstr[0] "%d total" msgstr[1] "%d total" -#: mail/mail-component.c:498 +#: mail/mail-component.c:518 #, c-format msgid ", %d unread" msgid_plural ", %d unread" msgstr[0] ", %d unread" msgstr[1] ", %d unread" -#: mail/mail-component.c:663 +#: mail/mail-component.c:683 msgid "New Mail Message" msgstr "New Mail Message" -#: mail/mail-component.c:664 +#: mail/mail-component.c:684 msgid "_Mail Message" msgstr "_Mail Message" -#: mail/mail-component.c:665 +#: mail/mail-component.c:685 msgid "Compose a new mail message" msgstr "Compose a new mail message" -#: mail/mail-component.c:671 +#: mail/mail-component.c:691 msgid "New Mail Folder" msgstr "New Mail Folder" -#: mail/mail-component.c:672 +#: mail/mail-component.c:692 msgid "Mail _Folder" msgstr "Mail _Folder" -#: mail/mail-component.c:673 +#: mail/mail-component.c:693 msgid "Create a new mail folder" msgstr "Create a new mail folder" -#: mail/mail-component.c:805 +#: mail/mail-component.c:825 msgid "Failed upgrading Mail settings or folders." msgstr "Failed upgrading Mail settings or folders." -#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92 +#: mail/mail-config-druid.c:363 mail/mail-config.glade.h:87 msgid "Identity" msgstr "Identity" -#: mail/mail-config-druid.c:364 +#: mail/mail-config-druid.c:365 mail/mail-config.glade.h:103 msgid "" "Please enter your name and email address below. The \"optional\" fields " "below do not need to be filled in, unless you wish to include this " @@ -14726,12 +14716,11 @@ msgstr "" "below do not need to be filled in, unless you wish to include this " "information in email you send." -#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377 -#: mail/mail-config.glade.h:119 +#: mail/mail-config-druid.c:371 mail/mail-config-druid.c:378 msgid "Receiving Mail" msgstr "Receiving Mail" -#: mail/mail-config-druid.c:372 +#: mail/mail-config-druid.c:373 msgid "" "Please enter information about your incoming mail server below. If you are " "not sure, ask your system administrator or Internet Service Provider." @@ -14739,15 +14728,15 @@ msgstr "" "Please enter information about your incoming mail server below. If you are " "not sure, ask your system administrator or Internet Service Provider." -#: mail/mail-config-druid.c:379 +#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:104 msgid "Please select among the following options" msgstr "Please select among the following options" -#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131 +#: mail/mail-config-druid.c:383 mail/mail-config.glade.h:120 msgid "Sending Mail" msgstr "Sending Mail" -#: mail/mail-config-druid.c:384 +#: mail/mail-config-druid.c:385 mail/mail-config.glade.h:102 msgid "" "Please enter information about the way you will send mail. If you are not " "sure, ask your system administrator or Internet Service Provider." @@ -14755,11 +14744,11 @@ msgstr "" "Please enter information about the way you will send mail. If you are not " "sure, ask your system administrator or Internet Service Provider." -#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37 +#: mail/mail-config-druid.c:390 mail/mail-config.glade.h:36 msgid "Account Management" msgstr "Account Management" -#: mail/mail-config-druid.c:391 +#: mail/mail-config-druid.c:392 mail/mail-config.glade.h:144 msgid "" "You are almost done with the mail configuration process. The identity, " "incoming mail server and outgoing mail transport method which you provided " @@ -14826,190 +14815,182 @@ msgid "<span weight=\"bold\">Authentication</span>" msgstr "<span weight=\"bold\">Authentication</span>" #: mail/mail-config.glade.h:13 -msgid "<span weight=\"bold\">Checking for New Mail</span>" -msgstr "<span weight=\"bold\">Checking for New Mail</span>" - -#: mail/mail-config.glade.h:14 msgid "<span weight=\"bold\">Composing Messages</span>" msgstr "<span weight=\"bold\">Composing Messages</span>" -#: mail/mail-config.glade.h:15 +#: mail/mail-config.glade.h:14 msgid "<span weight=\"bold\">Configuration</span>" msgstr "<span weight=\"bold\">Configuration</span>" -#: mail/mail-config.glade.h:16 +#: mail/mail-config.glade.h:15 msgid "<span weight=\"bold\">Default Behavior</span>" msgstr "<span weight=\"bold\">Default Behaviour</span>" -#: mail/mail-config.glade.h:17 +#: mail/mail-config.glade.h:16 msgid "<span weight=\"bold\">Delete Mail</span>" msgstr "<span weight=\"bold\">Delete Mail</span>" -#: mail/mail-config.glade.h:18 +#: mail/mail-config.glade.h:17 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>" msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>" -#: mail/mail-config.glade.h:19 +#: mail/mail-config.glade.h:18 msgid "<span weight=\"bold\">Filter Options</span>" msgstr "<span weight=\"bold\">Filter Options</span>" -#: mail/mail-config.glade.h:20 +#: mail/mail-config.glade.h:19 msgid "<span weight=\"bold\">General</span>" msgstr "<span weight=\"bold\">General</span>" -#: mail/mail-config.glade.h:21 +#: mail/mail-config.glade.h:20 msgid "<span weight=\"bold\">Labels and Colors</span>" msgstr "<span weight=\"bold\">Labels and Colours</span>" -#: mail/mail-config.glade.h:22 +#: mail/mail-config.glade.h:21 msgid "<span weight=\"bold\">Loading Images</span>" msgstr "<span weight=\"bold\">Loading Images</span>" -#: mail/mail-config.glade.h:23 +#: mail/mail-config.glade.h:22 msgid "<span weight=\"bold\">Message Display</span>" msgstr "<span weight=\"bold\">Message Display</span>" -#: mail/mail-config.glade.h:24 +#: mail/mail-config.glade.h:23 msgid "<span weight=\"bold\">Message Fonts</span>" msgstr "<span weight=\"bold\">Message Fonts</span>" -#: mail/mail-config.glade.h:25 +#: mail/mail-config.glade.h:24 msgid "<span weight=\"bold\">New Mail Notification</span>" msgstr "<span weight=\"bold\">New Mail Notification</span>" -#: mail/mail-config.glade.h:26 +#: mail/mail-config.glade.h:25 msgid "<span weight=\"bold\">Optional Information</span>" msgstr "<span weight=\"bold\">Optional Information</span>" -#: mail/mail-config.glade.h:27 +#: mail/mail-config.glade.h:26 msgid "<span weight=\"bold\">Options</span>" msgstr "<span weight=\"bold\">Options</span>" -#: mail/mail-config.glade.h:28 +#: mail/mail-config.glade.h:27 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>" msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>" -#: mail/mail-config.glade.h:29 +#: mail/mail-config.glade.h:28 msgid "<span weight=\"bold\">Printed Fonts</span>" msgstr "<span weight=\"bold\">Printed Fonts</span>" -#: mail/mail-config.glade.h:30 +#: mail/mail-config.glade.h:29 msgid "<span weight=\"bold\">Required Information</span>" msgstr "<span weight=\"bold\">Required Information</span>" -#: mail/mail-config.glade.h:31 +#: mail/mail-config.glade.h:30 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>" msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>" -#: mail/mail-config.glade.h:32 +#: mail/mail-config.glade.h:31 msgid "<span weight=\"bold\">Security</span>" msgstr "<span weight=\"bold\">Security</span>" -#: mail/mail-config.glade.h:33 +#: mail/mail-config.glade.h:32 msgid "<span weight=\"bold\">Sent and Draft Messages</span>" msgstr "<span weight=\"bold\">Sent and Draft Messages</span>" -#: mail/mail-config.glade.h:34 +#: mail/mail-config.glade.h:33 msgid "<span weight=\"bold\">Server Configuration</span>" msgstr "<span weight=\"bold\">Server Configuration</span>" -#: mail/mail-config.glade.h:35 +#: mail/mail-config.glade.h:34 msgid "A_lso encrypt to self when sending encrypted mail" msgstr "A_lso encrypt to self when sending encrypted mail" -#: mail/mail-config.glade.h:36 +#: mail/mail-config.glade.h:35 msgid "Account Editor" msgstr "Account Editor" -#: mail/mail-config.glade.h:38 +#: mail/mail-config.glade.h:37 msgid "Add Ne_w Signature..." msgstr "Add Ne_w Signature..." -#: mail/mail-config.glade.h:39 +#: mail/mail-config.glade.h:38 msgid "Add _Script" msgstr "Add _Script" -#: mail/mail-config.glade.h:40 +#: mail/mail-config.glade.h:39 msgid "Al_ways encrypt to myself when sending encrypted mail" msgstr "Al_ways encrypt to myself when sending encrypted mail" -#: mail/mail-config.glade.h:41 +#: mail/mail-config.glade.h:40 msgid "Alway_s carbon-copy (cc) to:" msgstr "Alway_s carbon-copy (cc) to:" -#: mail/mail-config.glade.h:43 +#: mail/mail-config.glade.h:41 msgid "Always _blind carbon-copy (bcc) to:" msgstr "Always _blind carbon-copy (bcc) to:" -#: mail/mail-config.glade.h:44 +#: mail/mail-config.glade.h:42 msgid "Always _sign outgoing messages when using this account" msgstr "Always _sign outgoing messages when using this account" -#: mail/mail-config.glade.h:45 +#: mail/mail-config.glade.h:43 msgid "Always _trust keys in my keyring when encrypting" msgstr "Always _trust keys in my keyring when encrypting" -#: mail/mail-config.glade.h:46 +#: mail/mail-config.glade.h:44 msgid "Attach original message" msgstr "Attach original message" -#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1 +#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1 msgid "Attachment" msgstr "Attachment" -#: mail/mail-config.glade.h:48 +#: mail/mail-config.glade.h:46 msgid "Automatically _insert smiley images" msgstr "Automatically _insert smiley images" -#: mail/mail-config.glade.h:49 -msgid "Automatically check for _new mail every" -msgstr "Automatically check for _new mail every" - -#: mail/mail-config.glade.h:50 +#: mail/mail-config.glade.h:47 msgid "Baltic (ISO-8859-13)" msgstr "Baltic (ISO-8859-13)" -#: mail/mail-config.glade.h:51 +#: mail/mail-config.glade.h:48 msgid "Baltic (ISO-8859-4)" msgstr "Baltic (ISO-8859-4)" -#: mail/mail-config.glade.h:52 +#: mail/mail-config.glade.h:49 msgid "Beep w_hen new mail arrives" msgstr "Beep w_hen new mail arrives" -#: mail/mail-config.glade.h:53 +#: mail/mail-config.glade.h:50 msgid "C_haracter set:" msgstr "C_haracter set:" -#: mail/mail-config.glade.h:54 +#: mail/mail-config.glade.h:51 msgid "Ch_eck for Supported Types " msgstr "Ch_eck for Supported Types " -#: mail/mail-config.glade.h:55 +#: mail/mail-config.glade.h:52 msgid "Check _incoming mail for junk" msgstr "Check _incoming mail for junk" -#: mail/mail-config.glade.h:56 +#: mail/mail-config.glade.h:53 msgid "Check spelling while I _type" msgstr "Check spelling while I _type" -#: mail/mail-config.glade.h:57 +#: mail/mail-config.glade.h:54 msgid "Checks incoming mail messages to be Junk" msgstr "Checks incoming mail messages to be Junk" -#: mail/mail-config.glade.h:58 +#: mail/mail-config.glade.h:55 msgid "Color for _misspelled words:" msgstr "Colour for _misspelled words:" -#: mail/mail-config.glade.h:59 +#: mail/mail-config.glade.h:56 msgid "Colors" msgstr "Colours" -#: mail/mail-config.glade.h:60 +#: mail/mail-config.glade.h:57 msgid "Confirm _when expunging a folder" msgstr "Confirm _when expunging a folder" -#: mail/mail-config.glade.h:61 +#: mail/mail-config.glade.h:58 msgid "" "Congratulations, your mail configuration is complete.\n" "\n" @@ -15025,111 +15006,103 @@ msgstr "" "\n" "Click \"Apply\" to save your settings." -#: mail/mail-config.glade.h:67 +#: mail/mail-config.glade.h:64 msgid "De_fault" msgstr "De_fault" -#: mail/mail-config.glade.h:69 +#: mail/mail-config.glade.h:65 msgid "Default character e_ncoding:" msgstr "Default character e_ncoding:" -#: mail/mail-config.glade.h:70 +#: mail/mail-config.glade.h:66 msgid "Defaults" msgstr "Defaults" -#: mail/mail-config.glade.h:72 +#: mail/mail-config.glade.h:68 msgid "Do not quote original message" msgstr "Do not quote original message" -#: mail/mail-config.glade.h:73 +#: mail/mail-config.glade.h:69 msgid "Don't sign _meeting requests (for Outlook compatibility)" msgstr "Don't sign _meeting requests (for Outlook compatibility)" -#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1 +#: mail/mail-config.glade.h:70 shell/evolution-startup-wizard.glade.h:1 msgid "Done" msgstr "Done" -#: mail/mail-config.glade.h:75 +#: mail/mail-config.glade.h:71 msgid "Drafts _Folder:" msgstr "Drafts _Folder:" -#: mail/mail-config.glade.h:77 +#: mail/mail-config.glade.h:73 msgid "Email Accounts" msgstr "Email Accounts" -#: mail/mail-config.glade.h:78 +#: mail/mail-config.glade.h:74 msgid "Email _Address:" msgstr "Email _Address:" -#: mail/mail-config.glade.h:79 +#: mail/mail-config.glade.h:75 msgid "Empty trash folders on e_xit" msgstr "Empty trash folders on e_xit" -#: mail/mail-config.glade.h:80 +#: mail/mail-config.glade.h:76 msgid "Encry_ption certificate:" msgstr "Encry_ption certificate:" -#: mail/mail-config.glade.h:81 +#: mail/mail-config.glade.h:77 msgid "Evolution Account Assistant" msgstr "Evolution Account Assistant" -#: mail/mail-config.glade.h:82 +#: mail/mail-config.glade.h:78 msgid "Execute Command..." msgstr "Execute Command..." -#: mail/mail-config.glade.h:83 +#: mail/mail-config.glade.h:79 msgid "Fi_xed-width:" msgstr "Fi_xed-width:" -#: mail/mail-config.glade.h:84 +#: mail/mail-config.glade.h:80 msgid "Font Properties" msgstr "Font Properties" -#: mail/mail-config.glade.h:85 +#: mail/mail-config.glade.h:81 msgid "Format messages in _HTML" msgstr "Format messages in _HTML" -#: mail/mail-config.glade.h:87 +#: mail/mail-config.glade.h:83 msgid "HTML Mail" msgstr "HTML Mail" -#: mail/mail-config.glade.h:88 +#: mail/mail-config.glade.h:84 msgid "Headers" msgstr "Headers" -#: mail/mail-config.glade.h:89 +#: mail/mail-config.glade.h:85 msgid "Highlight _quotations with" msgstr "Highlight _quotations with" -#: mail/mail-config.glade.h:90 -msgid "IMAPv4 " -msgstr "IMAPv4 " - -#: mail/mail-config.glade.h:91 +#: mail/mail-config.glade.h:86 msgid "I_nclude remote tests" msgstr "I_nclude remote tests" -#: mail/mail-config.glade.h:94 +#: mail/mail-config.glade.h:89 msgid "Inline" msgstr "Inline" -#: mail/mail-config.glade.h:96 -msgid "Kerberos " -msgstr "Kerberos " - -#: mail/mail-config.glade.h:98 +#: mail/mail-config.glade.h:92 msgid "Mail Configuration" msgstr "Mail Configuration" -#: mail/mail-config.glade.h:100 +#: mail/mail-config.glade.h:94 msgid "Mailbox location" msgstr "Mailbox location" -#: mail/mail-config.glade.h:101 +#: mail/mail-config.glade.h:95 msgid "Message Composer" msgstr "Message Composer" -#: mail/mail-config.glade.h:104 +#: mail/mail-config.glade.h:96 msgid "" "Note: you will not be prompted for a password until you connect for the " "first time" @@ -15137,131 +15110,119 @@ msgstr "" "Note: you will not be prompted for a password until you connect for the " "first time" -#: mail/mail-config.glade.h:105 +#: mail/mail-config.glade.h:97 msgid "Or_ganization:" msgstr "Or_ganization:" -#: mail/mail-config.glade.h:106 +#: mail/mail-config.glade.h:98 msgid "PGP/GPG _Key ID:" msgstr "PGP/GPG _Key ID:" -#: mail/mail-config.glade.h:111 +#: mail/mail-config.glade.h:101 msgid "Play sound file when new mail arri_ves" msgstr "Play sound file when new mail arri_ves" -#: mail/mail-config.glade.h:112 +#: mail/mail-config.glade.h:105 msgid "Pr_ompt when sending messages with only Bcc recipients defined" msgstr "Pr_ompt when sending messages with only Bcc recipients defined" -#: mail/mail-config.glade.h:113 -msgid "Qmail maildir " -msgstr "Qmail maildir " - -#: mail/mail-config.glade.h:114 +#: mail/mail-config.glade.h:106 msgid "Quote original message" msgstr "Quote original message" -#: mail/mail-config.glade.h:115 +#: mail/mail-config.glade.h:107 msgid "Quoted" msgstr "Quoted" -#: mail/mail-config.glade.h:116 +#: mail/mail-config.glade.h:108 msgid "Re_member password" msgstr "Re_member password" -#: mail/mail-config.glade.h:117 +#: mail/mail-config.glade.h:109 msgid "Re_ply-To:" msgstr "Re_ply-To:" -#: mail/mail-config.glade.h:118 +#: mail/mail-config.glade.h:110 msgid "Receiving Email" msgstr "Receiving Email" -#: mail/mail-config.glade.h:120 -msgid "Receiving Options" -msgstr "Receiving Options" - -#: mail/mail-config.glade.h:121 +#: mail/mail-config.glade.h:111 msgid "Remember _password" msgstr "Remember _password" -#: mail/mail-config.glade.h:123 +#: mail/mail-config.glade.h:112 msgid "S_tandard Font:" msgstr "S_tandard Font:" -#: mail/mail-config.glade.h:124 +#: mail/mail-config.glade.h:113 msgid "Security" msgstr "Security" -#: mail/mail-config.glade.h:125 +#: mail/mail-config.glade.h:114 msgid "Select HTML fixed width font" msgstr "Select HTML fixed width font" -#: mail/mail-config.glade.h:126 +#: mail/mail-config.glade.h:115 msgid "Select HTML fixed width font for printing" msgstr "Select HTML fixed width font for printing" -#: mail/mail-config.glade.h:127 +#: mail/mail-config.glade.h:116 msgid "Select HTML variable width font" msgstr "Select HTML variable width font" -#: mail/mail-config.glade.h:128 +#: mail/mail-config.glade.h:117 msgid "Select HTML variable width font for printing" msgstr "Select HTML variable width font for printing" -#: mail/mail-config.glade.h:129 +#: mail/mail-config.glade.h:118 msgid "Select..." msgstr "Select..." -#: mail/mail-config.glade.h:130 +#: mail/mail-config.glade.h:119 msgid "Sending Email" msgstr "Sending Email" -#: mail/mail-config.glade.h:133 +#: mail/mail-config.glade.h:121 msgid "Sent _Messages Folder:" msgstr "Sent _Messages Folder:" -#: mail/mail-config.glade.h:134 +#: mail/mail-config.glade.h:122 msgid "Ser_ver requires authentication" msgstr "Ser_ver requires authentication" -#: mail/mail-config.glade.h:135 +#: mail/mail-config.glade.h:123 msgid "Server _Type: " msgstr "Server _Type: " -#: mail/mail-config.glade.h:136 +#: mail/mail-config.glade.h:124 msgid "Si_gning certificate:" msgstr "Si_gning certificate:" -#: mail/mail-config.glade.h:137 +#: mail/mail-config.glade.h:125 msgid "Signat_ure:" msgstr "Signat_ure:" -#: mail/mail-config.glade.h:138 +#: mail/mail-config.glade.h:126 msgid "Signatures" msgstr "Signatures" -#: mail/mail-config.glade.h:139 +#: mail/mail-config.glade.h:127 msgid "Specify _filename:" msgstr "Specify _filename:" -#: mail/mail-config.glade.h:140 +#: mail/mail-config.glade.h:128 msgid "Spell Checking" msgstr "Spell Checking" -#: mail/mail-config.glade.h:141 -msgid "Standard Unix mbox" -msgstr "Standard Unix mbox" - -#: mail/mail-config.glade.h:142 +#: mail/mail-config.glade.h:129 msgid "T_erminal Font:" msgstr "T_erminal Font:" -#: mail/mail-config.glade.h:143 +#: mail/mail-config.glade.h:130 msgid "T_ype: " msgstr "T_ype: " -#: mail/mail-config.glade.h:144 +#: mail/mail-config.glade.h:131 msgid "" "The output of this script will be used as your\n" "signature. The name you specify will be used\n" @@ -15271,7 +15232,7 @@ msgstr "" "signature. The name you specify will be used\n" "for display purposes only. " -#: mail/mail-config.glade.h:147 +#: mail/mail-config.glade.h:134 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 " @@ -15281,7 +15242,7 @@ msgstr "" "list of languages here reflects only the languages for which you have a " "dictionary installed." -#: mail/mail-config.glade.h:149 +#: mail/mail-config.glade.h:136 msgid "" "Type the name by which you would like to refer to this account.\n" "For example: \"Work\" or \"Personal\"" @@ -15289,11 +15250,11 @@ msgstr "" "Type the name by which you would like to refer to this account.\n" "For example: \"Work\" or \"Personal\"" -#: mail/mail-config.glade.h:152 +#: mail/mail-config.glade.h:139 msgid "V_ariable-width:" msgstr "V_ariable-width:" -#: mail/mail-config.glade.h:153 +#: mail/mail-config.glade.h:140 msgid "" "Welcome to the Evolution Mail Configuration Assistant.\n" "\n" @@ -15303,83 +15264,83 @@ msgstr "" "\n" "Click \"Forward\" to begin. " -#: mail/mail-config.glade.h:158 +#: mail/mail-config.glade.h:145 msgid "_Add Signature" msgstr "_Add Signature" -#: mail/mail-config.glade.h:159 +#: mail/mail-config.glade.h:146 msgid "_Always load images from the Internet" msgstr "_Always load images from the Internet" -#: mail/mail-config.glade.h:160 +#: mail/mail-config.glade.h:147 msgid "_Digitally sign outgoing messages (by default)" msgstr "_Digitally sign outgoing messages (by default)" -#: mail/mail-config.glade.h:161 +#: mail/mail-config.glade.h:148 msgid "_Do not notify me when new mail arrives" msgstr "_Do not notify me when new mail arrives" -#: mail/mail-config.glade.h:163 +#: mail/mail-config.glade.h:150 msgid "_Enable" msgstr "_Enable" -#: mail/mail-config.glade.h:164 +#: mail/mail-config.glade.h:151 msgid "_Encrypt outgoing messages (by default)" msgstr "_Encrypt outgoing messages (by default)" -#: mail/mail-config.glade.h:165 +#: mail/mail-config.glade.h:152 msgid "_Forward style:" msgstr "_Forward style:" -#: mail/mail-config.glade.h:168 +#: mail/mail-config.glade.h:155 msgid "_Load images if sender is in address book" msgstr "_Load images if sender is in address book" -#: mail/mail-config.glade.h:169 +#: mail/mail-config.glade.h:156 msgid "_Make this my default account" msgstr "_Make this my default account" -#: mail/mail-config.glade.h:170 +#: mail/mail-config.glade.h:157 msgid "_Mark messages as read after" msgstr "_Mark messages as read after" -#: mail/mail-config.glade.h:172 +#: mail/mail-config.glade.h:159 msgid "_Never load images from the Internet" msgstr "_Never load images from the Internet" -#: mail/mail-config.glade.h:174 +#: mail/mail-config.glade.h:161 msgid "_Prompt when sending HTML messages to contacts that don't want them" msgstr "_Prompt when sending HTML messages to contacts that don't want them" -#: mail/mail-config.glade.h:175 +#: mail/mail-config.glade.h:162 msgid "_Prompt when sending messages with an empty subject line" msgstr "_Prompt when sending messages with an empty subject line" -#: mail/mail-config.glade.h:176 +#: mail/mail-config.glade.h:163 msgid "_Reply style:" msgstr "_Reply style:" -#: mail/mail-config.glade.h:177 +#: mail/mail-config.glade.h:164 msgid "_Script:" msgstr "_Script:" -#: mail/mail-config.glade.h:178 +#: mail/mail-config.glade.h:165 msgid "_Show animated images" msgstr "_Show animated images" -#: mail/mail-config.glade.h:179 +#: mail/mail-config.glade.h:166 msgid "_Use Secure Connection (SSL):" msgstr "_Use Secure Connection (SSL):" -#: mail/mail-config.glade.h:180 +#: mail/mail-config.glade.h:167 msgid "_Use the same fonts as other applications" msgstr "_Use the same fonts as other applications" -#: mail/mail-config.glade.h:181 +#: mail/mail-config.glade.h:168 msgid "color" msgstr "colour" -#: mail/mail-config.glade.h:182 +#: mail/mail-config.glade.h:169 msgid "description" msgstr "description" @@ -15425,7 +15386,7 @@ msgstr "Find in Message" msgid "Find:" msgstr "Find:" -#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294 +#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:295 #: mail/message-tags.glade.h:3 msgid "Flag to Follow Up" msgstr "Flag to Follow Up" @@ -16039,7 +16000,24 @@ msgstr "_Overwrite" msgid "_Append" msgstr "_Append" +#. mail:no-load-license primary #: mail/mail-errors.xml.h:234 +msgid "Unable to read license file." +msgstr "Unable to read licence file." + +#: mail/mail-errors.xml.h:236 +msgid "" +"Cannot read the license file \"{0}\", due to an\n" +" installation problem. You will not be able to use this provider " +"until\n" +" you can accept its license." +msgstr "" +"Cannot read the licence file \"{0}\", due to an\n" +" installation problem. You will not be able to use this provider " +"until\n" +" you can accept its licence." + +#: mail/mail-errors.xml.h:240 msgid "" "Unable to connect to the GroupWise\n" "server." @@ -16047,7 +16025,7 @@ msgstr "" "Unable to connect to the GroupWise\n" "server." -#: mail/mail-errors.xml.h:237 +#: mail/mail-errors.xml.h:243 msgid "" "\n" "Please check your account settings and try again.\n" @@ -16055,25 +16033,25 @@ msgstr "" "\n" "Please check your account settings and try again.\n" -#: mail/mail-folder-cache.c:795 +#: mail/mail-folder-cache.c:807 #, c-format msgid "Pinging %s" msgstr "Pinging %s" -#: mail/mail-ops.c:98 +#: mail/mail-ops.c:99 msgid "Filtering Folder" msgstr "Filtering Folder" -#: mail/mail-ops.c:259 +#: mail/mail-ops.c:260 msgid "Fetching Mail" msgstr "Fetching Mail" -#: mail/mail-ops.c:542 +#: mail/mail-ops.c:543 #, c-format msgid "Failed to apply outgoing filters: %s" msgstr "Failed to apply outgoing filters: %s" -#: mail/mail-ops.c:567 +#: mail/mail-ops.c:568 #, c-format msgid "" "Failed to append to %s: %s\n" @@ -16082,115 +16060,115 @@ msgstr "" "Failed to append to %s: %s\n" "Appending to local `Sent' folder instead." -#: mail/mail-ops.c:576 +#: mail/mail-ops.c:577 #, c-format msgid "Failed to append to local `Sent' folder: %s" msgstr "Failed to append to local `Sent' folder: %s" -#: mail/mail-ops.c:672 +#: mail/mail-ops.c:673 #, c-format msgid "Sending message %d of %d" msgstr "Sending message %d of %d" -#: mail/mail-ops.c:703 +#: mail/mail-ops.c:704 #, c-format msgid "Failed to send %d of %d messages" msgstr "Failed to send %d of %d messages" -#: mail/mail-ops.c:707 +#: mail/mail-ops.c:708 msgid "Complete." msgstr "Complete." -#: mail/mail-ops.c:804 +#: mail/mail-ops.c:805 msgid "Saving message to folder" msgstr "Saving message to folder" -#: mail/mail-ops.c:889 +#: mail/mail-ops.c:890 #, c-format msgid "Moving messages to %s" msgstr "Moving messages to %s" -#: mail/mail-ops.c:889 +#: mail/mail-ops.c:890 #, c-format msgid "Copying messages to %s" msgstr "Copying messages to %s" -#: mail/mail-ops.c:1002 +#: mail/mail-ops.c:1003 #, c-format msgid "Scanning folders in \"%s\"" msgstr "Scanning folders in \"%s\"" -#: mail/mail-ops.c:1115 +#: mail/mail-ops.c:1116 msgid "Forwarded messages" msgstr "Forwarded messages" -#: mail/mail-ops.c:1158 +#: mail/mail-ops.c:1159 #, c-format msgid "Opening folder %s" msgstr "Opening folder %s" -#: mail/mail-ops.c:1230 +#: mail/mail-ops.c:1231 #, c-format msgid "Opening store %s" msgstr "Opening store %s" -#: mail/mail-ops.c:1308 +#: mail/mail-ops.c:1309 #, c-format msgid "Removing folder %s" msgstr "Removing folder %s" -#: mail/mail-ops.c:1402 +#: mail/mail-ops.c:1403 #, c-format msgid "Storing folder '%s'" msgstr "Storing folder '%s'" -#: mail/mail-ops.c:1467 +#: mail/mail-ops.c:1468 #, c-format msgid "Expunging and storing account '%s'" msgstr "Expunging and storing account '%s'" -#: mail/mail-ops.c:1468 +#: mail/mail-ops.c:1469 #, c-format msgid "Storing account '%s'" msgstr "Storing account '%s'" -#: mail/mail-ops.c:1523 +#: mail/mail-ops.c:1524 msgid "Refreshing folder" msgstr "Refreshing folder" -#: mail/mail-ops.c:1559 mail/mail-ops.c:1610 +#: mail/mail-ops.c:1560 mail/mail-ops.c:1611 msgid "Expunging folder" msgstr "Expunging folder" -#: mail/mail-ops.c:1607 +#: mail/mail-ops.c:1608 #, c-format msgid "Emptying trash in '%s'" msgstr "Emptying trash in '%s'" -#: mail/mail-ops.c:1608 +#: mail/mail-ops.c:1609 msgid "Local Folders" msgstr "Local Folders" -#: mail/mail-ops.c:1691 +#: mail/mail-ops.c:1692 #, c-format msgid "Retrieving message %s" msgstr "Retrieving message %s" -#: mail/mail-ops.c:1763 +#: mail/mail-ops.c:1764 #, c-format msgid "Retrieving %d message" msgid_plural "Retrieving %d messages" msgstr[0] "Retrieving %d message" msgstr[1] "Retrieving %d message(s)" -#: mail/mail-ops.c:1849 +#: mail/mail-ops.c:1850 #, c-format msgid "Saving %d message" msgid_plural "Saving %d messsages" msgstr[0] "Saving %d message" msgstr[1] "Saving %d messsage(s)" -#: mail/mail-ops.c:1899 +#: mail/mail-ops.c:1900 #, c-format msgid "" "Unable to create output file: %s\n" @@ -16199,7 +16177,7 @@ msgstr "" "Unable to create output file: %s\n" " %s" -#: mail/mail-ops.c:1927 +#: mail/mail-ops.c:1928 #, c-format msgid "" "Error saving messages to: %s:\n" @@ -16208,11 +16186,11 @@ msgstr "" "Error saving messages to: %s:\n" " %s" -#: mail/mail-ops.c:1998 +#: mail/mail-ops.c:1999 msgid "Saving attachment" msgstr "Saving attachment" -#: mail/mail-ops.c:2010 +#: mail/mail-ops.c:2011 #, c-format msgid "" "Cannot create output file: %s:\n" @@ -16221,66 +16199,66 @@ msgstr "" "Cannot create output file: %s:\n" " %s" -#: mail/mail-ops.c:2020 +#: mail/mail-ops.c:2021 #, c-format msgid "Could not write data: %s" msgstr "Could not write data: %s" -#: mail/mail-ops.c:2168 +#: mail/mail-ops.c:2169 #, c-format msgid "Disconnecting from %s" msgstr "Disconnecting from %s" -#: mail/mail-ops.c:2168 +#: mail/mail-ops.c:2169 #, c-format msgid "Reconnecting to %s" msgstr "Reconnecting to %s" -#: mail/mail-send-recv.c:157 +#: mail/mail-send-recv.c:158 msgid "Cancelling..." msgstr "Canceling..." -#: mail/mail-send-recv.c:264 +#: mail/mail-send-recv.c:265 #, c-format msgid "Server: %s, Type: %s" msgstr "Server: %s, Type: %s" -#: mail/mail-send-recv.c:266 +#: mail/mail-send-recv.c:267 #, c-format msgid "Path: %s, Type: %s" msgstr "Path: %s, Type: %s" -#: mail/mail-send-recv.c:268 +#: mail/mail-send-recv.c:269 #, c-format msgid "Type: %s" msgstr "Type: %s" -#: mail/mail-send-recv.c:320 +#: mail/mail-send-recv.c:321 msgid "Send & Receive Mail" msgstr "Send & Receive Mail" -#: mail/mail-send-recv.c:323 +#: mail/mail-send-recv.c:324 msgid "Cancel _All" msgstr "Cancel _All" -#: mail/mail-send-recv.c:412 +#: mail/mail-send-recv.c:413 msgid "Updating..." msgstr "Updating..." -#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466 +#: mail/mail-send-recv.c:413 mail/mail-send-recv.c:467 msgid "Waiting..." msgstr "Waiting..." -#: mail/mail-session.c:207 +#: mail/mail-session.c:208 #, c-format msgid "Enter Password for %s" msgstr "Enter Password for %s" -#: mail/mail-session.c:209 +#: mail/mail-session.c:210 msgid "Enter Password" msgstr "Enter Password" -#: mail/mail-session.c:238 +#: mail/mail-session.c:239 msgid "User canceled operation." msgstr "User canceled operation." @@ -16296,26 +16274,26 @@ msgstr "Enter a name for this signature." msgid "Name:" msgstr "Name:" -#: mail/mail-tools.c:114 +#: mail/mail-tools.c:115 #, c-format msgid "Could not create spool directory `%s': %s" msgstr "Could not create spool directory `%s': %s" -#: mail/mail-tools.c:141 +#: mail/mail-tools.c:142 #, c-format msgid "Trying to movemail a non-mbox source `%s'" msgstr "Trying to movemail a non-mbox source `%s'" -#: mail/mail-tools.c:276 +#: mail/mail-tools.c:277 #, c-format msgid "Forwarded message - %s" msgstr "Forwarded message - %s" -#: mail/mail-tools.c:278 +#: mail/mail-tools.c:279 msgid "Forwarded message" msgstr "Forwarded message" -#: mail/mail-tools.c:319 +#: mail/mail-tools.c:320 #, c-format msgid "Invalid folder: `%s'" msgstr "Invalid folder: `%s'" @@ -16347,67 +16325,67 @@ msgstr "Edit VFolder" msgid "New VFolder" msgstr "New VFolder" -#: mail/message-list.c:1000 +#: mail/message-list.c:1001 msgid "Unseen" msgstr "Unseen" -#: mail/message-list.c:1001 +#: mail/message-list.c:1002 msgid "Seen" msgstr "Seen" -#: mail/message-list.c:1002 +#: mail/message-list.c:1003 msgid "Answered" msgstr "Answered" -#: mail/message-list.c:1003 +#: mail/message-list.c:1004 msgid "Multiple Unseen Messages" msgstr "Multiple Unseen Messages" -#: mail/message-list.c:1004 +#: mail/message-list.c:1005 msgid "Multiple Messages" msgstr "Multiple Messages" -#: mail/message-list.c:1008 +#: mail/message-list.c:1009 msgid "Lowest" msgstr "Lowest" -#: mail/message-list.c:1009 +#: mail/message-list.c:1010 msgid "Lower" msgstr "Lower" -#: mail/message-list.c:1013 +#: mail/message-list.c:1014 msgid "Higher" msgstr "Higher" -#: mail/message-list.c:1014 +#: mail/message-list.c:1015 msgid "Highest" msgstr "Highest" -#: mail/message-list.c:1337 +#: mail/message-list.c:1338 msgid "?" msgstr "?" -#: mail/message-list.c:1344 +#: mail/message-list.c:1345 msgid "Today %l:%M %p" msgstr "Today %l:%M %p" -#: mail/message-list.c:1353 +#: mail/message-list.c:1354 msgid "Yesterday %l:%M %p" msgstr "Yesterday %l:%M %p" -#: mail/message-list.c:1365 +#: mail/message-list.c:1366 msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: mail/message-list.c:1373 +#: mail/message-list.c:1374 msgid "%b %d %l:%M %p" msgstr "%b %d %l:%M %p" -#: mail/message-list.c:1375 +#: mail/message-list.c:1376 msgid "%b %d %Y" msgstr "%d %b %Y" -#: mail/message-list.c:3384 +#: mail/message-list.c:3396 msgid "Generating message list" msgstr "Generating message list" @@ -16439,39 +16417,39 @@ msgstr "Received" msgid "Size" msgstr "Size" -#: mail/message-tag-followup.c:73 +#: mail/message-tag-followup.c:74 msgid "Call" msgstr "Call" -#: mail/message-tag-followup.c:74 +#: mail/message-tag-followup.c:75 msgid "Do Not Forward" msgstr "Do Not Forward" -#: mail/message-tag-followup.c:75 +#: mail/message-tag-followup.c:76 msgid "Follow-Up" msgstr "Follow-Up" -#: mail/message-tag-followup.c:76 +#: mail/message-tag-followup.c:77 msgid "For Your Information" msgstr "For Your Information" -#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42 +#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42 msgid "Forward" msgstr "Forward" -#: mail/message-tag-followup.c:78 +#: mail/message-tag-followup.c:79 msgid "No Response Necessary" msgstr "No Response Necessary" -#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85 +#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85 msgid "Reply" msgstr "Reply" -#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86 +#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86 msgid "Reply to All" msgstr "Reply to All" -#: mail/message-tag-followup.c:82 +#: mail/message-tag-followup.c:83 msgid "Review" msgstr "Review" @@ -16793,19 +16771,26 @@ msgstr "Bug buddy is not installed." msgid "Bug buddy could not be run." msgstr "Bug buddy could not be run." -#: shell/e-shell-window-commands.c:323 +#. The translator-credits string is for translators to list +#. * per language credits for translation, displayed in the +#. * about box +#: shell/e-shell-window-commands.c:424 +msgid "translator-credits" +msgstr "Adam Weinberger <adamw@FreeBSD.org>" + +#: shell/e-shell-window-commands.c:438 msgid "Groupware Suite" msgstr "Groupware Suite" -#: shell/e-shell-window-commands.c:563 +#: shell/e-shell-window-commands.c:678 msgid "_Work Online" msgstr "_Work Online" -#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39 +#: shell/e-shell-window-commands.c:691 ui/evolution.xml.h:39 msgid "_Work Offline" msgstr "_Work Offline" -#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25 +#: shell/e-shell-window-commands.c:704 ui/evolution.xml.h:25 msgid "Work Offline" msgstr "Work Offline" @@ -16830,28 +16815,28 @@ msgstr "Switch to %s" msgid "Uknown system error." msgstr "Uknown system error." -#: shell/e-shell.c:795 shell/e-shell.c:796 +#: shell/e-shell.c:797 shell/e-shell.c:798 #, c-format msgid "%ld KB" msgstr "%ld KB" -#: shell/e-shell.c:1216 widgets/misc/e-cell-date-edit.c:265 +#: shell/e-shell.c:1220 widgets/misc/e-cell-date-edit.c:265 msgid "OK" msgstr "OK" -#: shell/e-shell.c:1218 +#: shell/e-shell.c:1222 msgid "Invalid arguments" msgstr "Invalid arguments" -#: shell/e-shell.c:1220 +#: shell/e-shell.c:1224 msgid "Cannot register on OAF" msgstr "Cannot register on OAF" -#: shell/e-shell.c:1222 +#: shell/e-shell.c:1226 msgid "Configuration Database not found" msgstr "Configuration Database not found" -#: shell/e-shell.c:1224 +#: shell/e-shell.c:1228 msgid "Generic error" msgstr "Generic error" @@ -17463,6 +17448,10 @@ msgstr "Your Certificates" msgid "_Edit CA Trust" msgstr "_Edit CA Trust" +#: smime/gui/smime-ui.glade.h:48 +msgid "dialog1" +msgstr "dialog1" + #. XXX we shouldn't be popping up dialogs in this code. #: smime/lib/e-cert-db.c:612 msgid "Certificate already exists" @@ -19155,8 +19144,8 @@ msgstr "With _Due Date" msgid "With _Status" msgstr "With _Status" -#: widgets/e-timezone-dialog/e-timezone-dialog.c:197 -#: widgets/e-timezone-dialog/e-timezone-dialog.c:635 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:198 +#: widgets/e-timezone-dialog/e-timezone-dialog.c:640 msgid "UTC" msgstr "UTC" @@ -19168,11 +19157,11 @@ msgstr "<b>Time Zones</b>" msgid "<b>_Selection</b>" msgstr "<b>_Selection:</b>" -#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4 +#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5 msgid "Select a Time Zone" msgstr "Select a Time Zone" -#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5 +#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6 msgid "" "Use the left mouse button to zoom in on an area of the map and select a time " "zone.\n" |