diff options
| author | Gareth Owen <gowen@src.gnome.org> | 2004-04-13 10:02:15 +0800 |
|---|---|---|
| committer | Gareth Owen <gowen@src.gnome.org> | 2004-04-13 10:02:15 +0800 |
| commit | 6bb123fef9b59492e4635825d3761fcd529b6344 (patch) | |
| tree | 5ada6f1662a2223f55bb9530aa8e653609c534ce | |
| parent | e24d016dac2652bc213d3c1bb073042ee99eeb3c (diff) | |
| download | gsoc2013-evolution-6bb123fef9b59492e4635825d3761fcd529b6344.tar.gz gsoc2013-evolution-6bb123fef9b59492e4635825d3761fcd529b6344.tar.zst gsoc2013-evolution-6bb123fef9b59492e4635825d3761fcd529b6344.zip | |
Updated British English translation
svn path=/trunk/; revision=25421
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/en_GB.po | 1452 |
2 files changed, 729 insertions, 727 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index a9ee8e46a8..572c2c5df3 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2004-04-12 Gareth Owen <gowen72@yahoo.com> + + * en_GB.po: Updated British English translation + 2004-04-12 Miloslav Trmac <mitr@volny.cz> * cs.po: Updated Czech translation. diff --git a/po/en_GB.po b/po/en_GB.po index 63ee188c7e..4a7e8f5cae 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: evolution 0.6\n" -"POT-Creation-Date: 2004-04-02 11:14-0500\n" -"PO-Revision-Date: 2004-03-31 18:55-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-12 21:59-0400\n" +"PO-Revision-Date: 2004-04-12 22:00-0400\n" "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: a11y/addressbook/ea-addressbook-view.c:94 @@ -80,6 +80,7 @@ msgstr "Configure autocomple here" #. #. name = e_book_get_name (book); #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4 +#: addressbook/gui/component/addressbook-component.c:522 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51 #: calendar/gui/migration.c:363 msgid "Contacts" @@ -121,17 +122,17 @@ msgstr "Evolution folder settings configuration control" msgid "Manager your S/Mime certificates here" msgstr "Manager your S/Mime certificates here" -#: addressbook/gui/component/addressbook-component.c:225 +#: addressbook/gui/component/addressbook-component.c:227 #, c-format msgid "Address book '%s' will be removed. Are you sure you want to continue?" msgstr "Address book '%s' will be removed. Are you sure you want to continue?" -#: addressbook/gui/component/addressbook-component.c:313 +#: addressbook/gui/component/addressbook-component.c:315 #: addressbook/gui/component/ldap-config.glade.h:25 msgid "New Address Book" msgstr "New Address Book" -#: addressbook/gui/component/addressbook-component.c:314 +#: addressbook/gui/component/addressbook-component.c:316 #: addressbook/gui/widgets/e-addressbook-view.c:1086 #: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367 #: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235 @@ -142,46 +143,46 @@ msgstr "New Address Book" msgid "Delete" msgstr "Delete" -#: addressbook/gui/component/addressbook-component.c:315 +#: addressbook/gui/component/addressbook-component.c:317 #: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369 msgid "Properties..." msgstr "Properties..." -#: addressbook/gui/component/addressbook-component.c:551 +#: addressbook/gui/component/addressbook-component.c:562 msgid "New Contact" msgstr "New Contact" -#: addressbook/gui/component/addressbook-component.c:552 +#: addressbook/gui/component/addressbook-component.c:563 msgid "_Contact" msgstr "_Contact" -#: addressbook/gui/component/addressbook-component.c:553 +#: addressbook/gui/component/addressbook-component.c:564 msgid "Create a new contact" msgstr "Create a new contact" -#: addressbook/gui/component/addressbook-component.c:558 +#: addressbook/gui/component/addressbook-component.c:570 msgid "New Contact List" msgstr "New Contact List" -#: addressbook/gui/component/addressbook-component.c:559 +#: addressbook/gui/component/addressbook-component.c:571 msgid "Contact _List" msgstr "Contact _List" -#: addressbook/gui/component/addressbook-component.c:560 +#: addressbook/gui/component/addressbook-component.c:572 msgid "Create a new contact list" msgstr "Create a new contact list" -#: addressbook/gui/component/addressbook-component.c:565 -msgid "New Addressbook Book" -msgstr "New Addressbook Book" +#: addressbook/gui/component/addressbook-component.c:578 +msgid "New Contacts Group" +msgstr "New Contacts Group" -#: addressbook/gui/component/addressbook-component.c:566 -msgid "_Address Book" -msgstr "_Address Book" +#: addressbook/gui/component/addressbook-component.c:579 +msgid "_Contacts Group" +msgstr "_Contacts Group" -#: addressbook/gui/component/addressbook-component.c:567 -msgid "Create a new address book" -msgstr "Create a new address book" +#: addressbook/gui/component/addressbook-component.c:580 +msgid "Create a new contacts group" +msgstr "Create a new contacts group" #: addressbook/gui/component/addressbook-config.c:407 msgid "Failed to connect to LDAP server" @@ -211,150 +212,86 @@ msgstr "Error retrieving schema information" msgid "Server did not respond with valid schema information" msgstr "Server did not respond with valid schema information" -#: addressbook/gui/component/addressbook-migrate.c:57 -#: calendar/gui/migration.c:128 mail/em-migrate.c:1071 +#: addressbook/gui/component/addressbook-migrate.c:58 +#: calendar/gui/migration.c:128 mail/em-migrate.c:1072 msgid "Migrating..." msgstr "Migrating..." -#: addressbook/gui/component/addressbook-migrate.c:65 -msgid "" -"The location and hierarchy of the Evolution contact folders has changed " -"since Evolution 1.x.\n" -"\n" -"Please be patient while Evolution migrates your folders..." -msgstr "" -"The location and hierarchy of the Evolution contact folders has changed " -"since Evolution 1.x.\n" -"\n" -"Please be patient while Evolution migrates your folders..." - -#: addressbook/gui/component/addressbook-migrate.c:99 -#: calendar/gui/migration.c:175 mail/em-migrate.c:1112 +#: addressbook/gui/component/addressbook-migrate.c:98 +#: calendar/gui/migration.c:175 mail/em-migrate.c:1113 #, c-format msgid "Migrating `%s':" msgstr "Migrating `%s':" #. create the local source group -#: addressbook/gui/component/addressbook-migrate.c:409 +#: addressbook/gui/component/addressbook-migrate.c:408 #: calendar/gui/migration.c:430 calendar/gui/migration.c:513 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194 -#: mail/mail-component.c:236 +#: mail/mail-component.c:238 msgid "On This Computer" msgstr "On This Computer" #. Create the default Person addressbook -#: addressbook/gui/component/addressbook-migrate.c:417 +#: addressbook/gui/component/addressbook-migrate.c:416 #: calendar/gui/migration.c:438 calendar/gui/migration.c:521 -#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67 +#: filter/filter-label.c:123 mail/em-migrate.c:926 mail/mail-config.c:67 #: mail/mail-config.glade.h:106 msgid "Personal" msgstr "Personal" #. Create the LDAP source group -#: addressbook/gui/component/addressbook-migrate.c:425 +#: addressbook/gui/component/addressbook-migrate.c:424 msgid "On LDAP Servers" msgstr "On LDAP Servers" -#: addressbook/gui/component/addressbook-migrate.c:553 +#: addressbook/gui/component/addressbook-migrate.c:552 msgid "LDAP Servers" msgstr "LDAP Servers" -#: addressbook/gui/component/addressbook-migrate.c:673 +#: addressbook/gui/component/addressbook-migrate.c:672 msgid "Autocompletion Settings" msgstr "Autocompletion Settings" -#: addressbook/gui/component/addressbook.c:275 +#: addressbook/gui/component/addressbook-migrate.c:853 msgid "" -"More cards matched this query than either the server is \n" -"configured to return or Evolution is configured to display.\n" -"Please make your search more specific or raise the result limit in\n" -"the directory server preferences for this addressbook." -msgstr "" -"More cards matched this query than either the server is \n" -"configured to return or Evolution is configured to display.\n" -"Please make your search more specific or raise the result limit in\n" -"the directory server preferences for this addressbook." - -#: addressbook/gui/component/addressbook.c:281 -msgid "" -"The time to execute this query exceeded the server limit or the limit\n" -"you have configured for this addressbook. Please make your search\n" -"more specific or raise the time limit in the directory server\n" -"preferences for this addressbook." -msgstr "" -"The time to execute this query exceeded the server limit or the limit\n" -"you have configured for this addressbook. Please make your search\n" -"more specific or raise the time limit in the directory server\n" -"preferences for this addressbook." - -#: addressbook/gui/component/addressbook.c:287 -msgid "The backend for this addressbook was unable to parse this query." -msgstr "The backend for this addressbook was unable to parse this query." - -#: addressbook/gui/component/addressbook.c:290 -msgid "The backend for this addressbook refused to perform this query." -msgstr "The backend for this addressbook refused to perform this query." - -#: addressbook/gui/component/addressbook.c:293 -msgid "This query did not complete successfully." -msgstr "This query did not complete successfully." - -#: addressbook/gui/component/addressbook.c:591 -msgid "" -"We were unable to open this addressbook. Please check that the path exists " -"and that you have permission to access it." -msgstr "" -"We were unable to open this addressbook. Please check that the path exists " -"and that you have permission to access it." - -#: addressbook/gui/component/addressbook.c:598 -msgid "" -"We were unable to open this addressbook. This either means you have entered " -"an incorrect URI, or the LDAP server is unreachable." -msgstr "" -"We were unable to open this addressbook. This either means you have entered " -"an incorrect URI, or the LDAP server is unreachable." - -#: addressbook/gui/component/addressbook.c:603 -msgid "" -"This version of Evolution does not have LDAP support compiled in to it. If " -"you want to use LDAP in Evolution you must compile the program from the CVS " -"sources after retrieving OpenLDAP from the link below." +"The location and hierarchy of the Evolution contact folders has changed " +"since Evolution 1.x.\n" +"\n" +"Please be patient while Evolution migrates your folders..." msgstr "" -"This version of Evolution does not have LDAP support compiled in to it. If " -"you want to use LDAP in Evolution you must compile the program from the CVS " -"sources after retrieving OpenLDAP from the link below." +"The location and hierarchy of the Evolution contact folders has changed " +"since Evolution 1.x.\n" +"\n" +"Please be patient while Evolution migrates your folders..." -#: addressbook/gui/component/addressbook.c:612 +#: addressbook/gui/component/addressbook-migrate.c:869 msgid "" -"We were unable to open this addressbook. This either means you have entered " -"an incorrect URI, or the server is unreachable." +"The format of mailing list contacts has changed.\n" +"\n" +"Please be patient while Evolution migrates your folders..." msgstr "" -"We were unable to open this addressbook. This either means you have entered " -"an incorrect URI, or the server is unreachable." - -#: addressbook/gui/component/addressbook.c:629 -msgid "Unable to open addressbook" -msgstr "Unable to open addressbook" +"The format of mailing list contacts has changed.\n" +"\n" +"Please be patient while Evolution migrates your folders..." -#: addressbook/gui/component/addressbook.c:713 +#: addressbook/gui/component/addressbook.c:622 msgid "Accessing LDAP Server anonymously" msgstr "Accessing LDAP Server anonymously" -#: addressbook/gui/component/addressbook.c:782 +#: addressbook/gui/component/addressbook.c:691 msgid "Failed to authenticate.\n" msgstr "Failed to authenticate.\n" -#: addressbook/gui/component/addressbook.c:788 +#: addressbook/gui/component/addressbook.c:697 #, c-format msgid "%sEnter password for %s (user %s)" msgstr "%sEnter password for %s (user %s)" -#: addressbook/gui/component/addressbook.c:1113 +#: addressbook/gui/component/addressbook.c:1022 msgid "UID of the contacts source that the view will display" msgstr "UID of the contacts source that the view will display" -#: addressbook/gui/component/addressbook.c:1118 +#: addressbook/gui/component/addressbook.c:1027 msgid "The URI that the address book will display" msgstr "The URI that the address book will display" @@ -399,7 +336,6 @@ msgstr " S_how Supported Bases " #: calendar/gui/dialogs/url-editor-dialog.glade.h:1 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1 -#: shell/glade/e-shell-folder-creation-dialog.glade.h:1 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1 msgid "*" msgstr "*" @@ -812,35 +748,35 @@ msgstr "searching-tab" msgid "Evolution Addressbook name selection interface" msgstr "Evolution Addressbook name selection interface" -#: addressbook/gui/component/select-names/e-select-names-popup.c:207 +#: addressbook/gui/component/select-names/e-select-names-popup.c:206 msgid "Remove All" msgstr "Remove All" -#: addressbook/gui/component/select-names/e-select-names-popup.c:214 -#: addressbook/gui/component/select-names/e-select-names.c:693 -#: calendar/gui/dialogs/cal-prefs-dialog.c:659 +#: addressbook/gui/component/select-names/e-select-names-popup.c:213 +#: addressbook/gui/component/select-names/e-select-names.c:696 +#: calendar/gui/dialogs/cal-prefs-dialog.c:734 msgid "Remove" msgstr "Remove" -#: addressbook/gui/component/select-names/e-select-names-popup.c:221 +#: addressbook/gui/component/select-names/e-select-names-popup.c:220 msgid "View Contact List" msgstr "View Contact List" -#: addressbook/gui/component/select-names/e-select-names-popup.c:221 +#: addressbook/gui/component/select-names/e-select-names-popup.c:220 msgid "View Contact Info" msgstr "View Contact Info" -#: addressbook/gui/component/select-names/e-select-names-popup.c:228 -#: addressbook/gui/component/select-names/e-select-names-popup.c:338 +#: addressbook/gui/component/select-names/e-select-names-popup.c:227 +#: addressbook/gui/component/select-names/e-select-names-popup.c:328 msgid "Send HTML Mail?" msgstr "Send HTML Mail?" -#: addressbook/gui/component/select-names/e-select-names-popup.c:330 +#: addressbook/gui/component/select-names/e-select-names-popup.c:320 #: addressbook/gui/widgets/eab-popup-control.c:1001 msgid "Add to Contacts" msgstr "Add to Contacts" -#: addressbook/gui/component/select-names/e-select-names-popup.c:356 +#: addressbook/gui/component/select-names/e-select-names-popup.c:346 msgid "Unnamed Contact" msgstr "Unnamed Contact" @@ -856,7 +792,7 @@ msgstr "Name" msgid "Source" msgstr "Source" -#: addressbook/gui/component/select-names/e-select-names.c:494 +#: addressbook/gui/component/select-names/e-select-names.c:497 #: addressbook/gui/component/select-names/select-names.glade.h:6 msgid "Select Contacts from Address Book" msgstr "Select Contacts from Address Book" @@ -1017,7 +953,7 @@ msgstr "_Categories..." #: calendar/gui/dialogs/meeting-page.c:651 #: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078 #: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312 -#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765 +#: mail/em-folder-tree.c:2570 mail/em-folder-view.c:799 #: 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 @@ -1076,8 +1012,8 @@ msgid "_Web page address:" msgstr "_Web page address:" #: addressbook/gui/contact-editor/e-contact-editor-address.c:96 -#: addressbook/gui/widgets/eab-contact-display.c:316 -#: addressbook/gui/widgets/eab-contact-display.c:337 +#: addressbook/gui/widgets/eab-contact-display.c:310 +#: addressbook/gui/widgets/eab-contact-display.c:331 msgid "Address" msgstr "Address" @@ -1085,7 +1021,7 @@ msgstr "Address" #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141 #: addressbook/gui/contact-editor/e-contact-editor.c:252 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:173 #: addressbook/gui/widgets/e-addressbook-model.c:309 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392 #: addressbook/gui/widgets/e-minicard-label.c:164 @@ -2073,8 +2009,8 @@ msgstr "Novell Groupwise" #: addressbook/gui/contact-editor/e-contact-editor-im.c:64 #: addressbook/gui/contact-editor/e-contact-editor.c:2835 -#: addressbook/gui/widgets/eab-contact-display.c:310 -#: addressbook/gui/widgets/eab-contact-display.c:329 +#: addressbook/gui/widgets/eab-contact-display.c:304 +#: addressbook/gui/widgets/eab-contact-display.c:323 msgid "Jabber" msgstr "Jabber" @@ -2088,8 +2024,8 @@ msgstr "MSN Messenger" #: addressbook/gui/contact-editor/e-contact-editor-im.c:67 #: addressbook/gui/contact-editor/e-contact-editor.c:2838 -#: addressbook/gui/widgets/eab-contact-display.c:309 -#: addressbook/gui/widgets/eab-contact-display.c:328 +#: addressbook/gui/widgets/eab-contact-display.c:303 +#: addressbook/gui/widgets/eab-contact-display.c:322 msgid "ICQ" msgstr "ICQ" @@ -2100,7 +2036,7 @@ msgstr "Service" #: addressbook/gui/contact-editor/e-contact-editor-im.c:127 #: addressbook/gui/contact-editor/e-contact-editor.c:727 -#: calendar/gui/dialogs/cal-prefs-dialog.c:426 +#: calendar/gui/dialogs/cal-prefs-dialog.c:580 #: calendar/gui/e-cal-list-view.etspec.h:2 msgid "Location" msgstr "Location" @@ -2118,7 +2054,7 @@ msgstr "Home" #. red #: addressbook/gui/contact-editor/e-contact-editor-im.c:250 #: addressbook/gui/contact-editor/e-contact-editor.c:2803 -#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66 +#: filter/filter-label.c:122 mail/em-migrate.c:925 mail/mail-config.c:66 #: mail/mail-config.glade.h:155 msgid "Work" msgstr "Work" @@ -2138,7 +2074,7 @@ msgid "Target Book" msgstr "Target Book" #: addressbook/gui/contact-editor/e-contact-editor.c:231 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:159 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1 #: addressbook/gui/widgets/e-minicard.c:180 msgid "Contact" @@ -2177,20 +2113,20 @@ msgid "Business" msgstr "Business" #: addressbook/gui/contact-editor/e-contact-editor.c:2834 -#: addressbook/gui/widgets/eab-contact-display.c:307 -#: addressbook/gui/widgets/eab-contact-display.c:326 +#: addressbook/gui/widgets/eab-contact-display.c:301 +#: addressbook/gui/widgets/eab-contact-display.c:320 msgid "AIM" msgstr "AIM" #: addressbook/gui/contact-editor/e-contact-editor.c:2836 -#: addressbook/gui/widgets/eab-contact-display.c:312 -#: addressbook/gui/widgets/eab-contact-display.c:331 +#: addressbook/gui/widgets/eab-contact-display.c:306 +#: addressbook/gui/widgets/eab-contact-display.c:325 msgid "Yahoo" msgstr "Yahoo" #: addressbook/gui/contact-editor/e-contact-editor.c:2837 -#: addressbook/gui/widgets/eab-contact-display.c:311 -#: addressbook/gui/widgets/eab-contact-display.c:330 +#: addressbook/gui/widgets/eab-contact-display.c:305 +#: addressbook/gui/widgets/eab-contact-display.c:324 msgid "MSN" msgstr "MSN" @@ -2377,7 +2313,7 @@ msgstr "_Type an email address or drag a contact into the list below:" msgid "contact-list-editor" msgstr "contact-list-editor" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:152 #: addressbook/gui/widgets/e-addressbook-model.c:295 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378 #: addressbook/gui/widgets/e-addressbook-view.c:215 @@ -2386,17 +2322,17 @@ msgstr "contact-list-editor" msgid "Book" msgstr "Book" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:166 msgid "Is New List" msgstr "Is New List" #. Construct the app -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:214 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:756 msgid "Contact List Editor" msgstr "Contact List Editor" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:434 msgid "Save List as VCard" msgstr "Save List as VCard" @@ -2470,7 +2406,7 @@ msgstr "Error getting book view" msgid "Model" msgstr "Model" -#: addressbook/gui/widgets/e-addressbook-table-adapter.c:114 +#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103 msgid "Error modifying card" msgstr "Error modifying card" @@ -2649,7 +2585,7 @@ msgid "Company Phone" msgstr "Company Phone" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10 -#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774 +#: addressbook/gui/widgets/eab-contact-display.c:511 smime/lib/e-cert.c:774 msgid "Email" msgstr "Email" @@ -2700,7 +2636,7 @@ msgid "Manager" msgstr "Manager" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23 -#: addressbook/gui/widgets/eab-contact-display.c:336 +#: addressbook/gui/widgets/eab-contact-display.c:330 msgid "Mobile Phone" msgstr "Mobile Phone" @@ -2709,7 +2645,7 @@ msgid "Nickname" msgstr "Nickname" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25 -#: addressbook/gui/widgets/eab-contact-display.c:347 +#: addressbook/gui/widgets/eab-contact-display.c:341 msgid "Note" msgstr "Note" @@ -2718,7 +2654,7 @@ msgid "Office" msgstr "Office" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27 -#: addressbook/gui/widgets/eab-contact-display.c:305 +#: addressbook/gui/widgets/eab-contact-display.c:299 msgid "Organization" msgstr "Organisation" @@ -2844,69 +2780,69 @@ msgstr "Selected" msgid "Has Cursor" msgstr "Has Cursor" -#: addressbook/gui/widgets/eab-contact-display.c:118 -#: addressbook/gui/widgets/eab-contact-display.c:180 +#: addressbook/gui/widgets/eab-contact-display.c:117 +#: addressbook/gui/widgets/eab-contact-display.c:179 msgid "(map)" msgstr "(map)" -#: addressbook/gui/widgets/eab-contact-display.c:128 -#: addressbook/gui/widgets/eab-contact-display.c:190 +#: addressbook/gui/widgets/eab-contact-display.c:127 +#: addressbook/gui/widgets/eab-contact-display.c:189 msgid "map" msgstr "map" -#: addressbook/gui/widgets/eab-contact-display.c:242 -#: addressbook/gui/widgets/eab-contact-display.c:498 +#: addressbook/gui/widgets/eab-contact-display.c:241 +#: addressbook/gui/widgets/eab-contact-display.c:492 msgid "List Members" msgstr "List Members" -#: addressbook/gui/widgets/eab-contact-display.c:298 +#: addressbook/gui/widgets/eab-contact-display.c:292 msgid "E-mail" msgstr "E-mail" -#: addressbook/gui/widgets/eab-contact-display.c:306 +#: addressbook/gui/widgets/eab-contact-display.c:300 msgid "Position" msgstr "Position" -#: addressbook/gui/widgets/eab-contact-display.c:308 -#: addressbook/gui/widgets/eab-contact-display.c:327 +#: addressbook/gui/widgets/eab-contact-display.c:302 +#: addressbook/gui/widgets/eab-contact-display.c:321 msgid "Groupwise" msgstr "Groupwise" -#: addressbook/gui/widgets/eab-contact-display.c:313 +#: addressbook/gui/widgets/eab-contact-display.c:307 msgid "Video Conferencing" msgstr "Video Conferencing" -#: addressbook/gui/widgets/eab-contact-display.c:314 -#: addressbook/gui/widgets/eab-contact-display.c:335 +#: addressbook/gui/widgets/eab-contact-display.c:308 +#: addressbook/gui/widgets/eab-contact-display.c:329 msgid "Phone" msgstr "Phone" -#: addressbook/gui/widgets/eab-contact-display.c:315 +#: addressbook/gui/widgets/eab-contact-display.c:309 msgid "Fax" msgstr "Fax" -#: addressbook/gui/widgets/eab-contact-display.c:319 +#: addressbook/gui/widgets/eab-contact-display.c:313 msgid "work" msgstr "work" -#: addressbook/gui/widgets/eab-contact-display.c:332 +#: addressbook/gui/widgets/eab-contact-display.c:326 msgid "WWW" msgstr "WWW" -#: addressbook/gui/widgets/eab-contact-display.c:333 -#: addressbook/gui/widgets/eab-contact-display.c:557 +#: addressbook/gui/widgets/eab-contact-display.c:327 +#: addressbook/gui/widgets/eab-contact-display.c:546 msgid "Blog" msgstr "Blog" -#: addressbook/gui/widgets/eab-contact-display.c:340 +#: addressbook/gui/widgets/eab-contact-display.c:334 msgid "personal" msgstr "personal" -#: addressbook/gui/widgets/eab-contact-display.c:518 +#: addressbook/gui/widgets/eab-contact-display.c:507 msgid "Job Title" msgstr "Job Title" -#: addressbook/gui/widgets/eab-contact-display.c:549 +#: addressbook/gui/widgets/eab-contact-display.c:538 msgid "Home page" msgstr "Home page" @@ -2918,7 +2854,7 @@ msgstr "Success" #: camel/providers/imap/camel-imap-command.c:303 #: camel/providers/imap/camel-imap-command.c:400 #: camel/providers/pop3/camel-pop3-store.c:538 -#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071 +#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089 msgid "Unknown error" msgstr "Unknown error" @@ -2945,7 +2881,7 @@ msgstr "Protocol not supported" #: addressbook/gui/widgets/eab-gui-util.c:54 #: calendar/gui/dialogs/task-details-page.glade.h:3 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599 -#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209 +#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212 #: calendar/gui/print.c:2349 camel/camel-service.c:728 #: camel/camel-service.c:766 camel/camel-service.c:850 #: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451 @@ -2973,41 +2909,115 @@ msgstr "Address Book does not exist" msgid "Other error" msgstr "Other error" -#: addressbook/gui/widgets/eab-gui-util.c:86 +#: addressbook/gui/widgets/eab-gui-util.c:90 +msgid "" +"We were unable to open this addressbook. Please check that the path exists " +"and that you have permission to access it." +msgstr "" +"We were unable to open this addressbook. Please check that the path exists " +"and that you have permission to access it." + +#: addressbook/gui/widgets/eab-gui-util.c:97 +msgid "" +"We were unable to open this addressbook. This either means you have entered " +"an incorrect URI, or the LDAP server is unreachable." +msgstr "" +"We were unable to open this addressbook. This either means you have entered " +"an incorrect URI, or the LDAP server is unreachable." + +#: addressbook/gui/widgets/eab-gui-util.c:102 +msgid "" +"This version of Evolution does not have LDAP support compiled in to it. If " +"you want to use LDAP in Evolution you must compile the program from the CVS " +"sources after retrieving OpenLDAP from the link below." +msgstr "" +"This version of Evolution does not have LDAP support compiled in to it. If " +"you want to use LDAP in Evolution you must compile the program from the CVS " +"sources after retrieving OpenLDAP from the link below." + +#: addressbook/gui/widgets/eab-gui-util.c:111 +msgid "" +"We were unable to open this addressbook. This either means you have entered " +"an incorrect URI, or the server is unreachable." +msgstr "" +"We were unable to open this addressbook. This either means you have entered " +"an incorrect URI, or the server is unreachable." + +#: addressbook/gui/widgets/eab-gui-util.c:128 +msgid "Unable to open addressbook" +msgstr "Unable to open addressbook" + +#: addressbook/gui/widgets/eab-gui-util.c:149 +msgid "" +"More cards matched this query than either the server is \n" +"configured to return or Evolution is configured to display.\n" +"Please make your search more specific or raise the result limit in\n" +"the directory server preferences for this addressbook." +msgstr "" +"More cards matched this query than either the server is \n" +"configured to return or Evolution is configured to display.\n" +"Please make your search more specific or raise the result limit in\n" +"the directory server preferences for this addressbook." + +#: addressbook/gui/widgets/eab-gui-util.c:155 +msgid "" +"The time to execute this query exceeded the server limit or the limit\n" +"you have configured for this addressbook. Please make your search\n" +"more specific or raise the time limit in the directory server\n" +"preferences for this addressbook." +msgstr "" +"The time to execute this query exceeded the server limit or the limit\n" +"you have configured for this addressbook. Please make your search\n" +"more specific or raise the time limit in the directory server\n" +"preferences for this addressbook." + +#: addressbook/gui/widgets/eab-gui-util.c:161 +msgid "The backend for this addressbook was unable to parse this query." +msgstr "The backend for this addressbook was unable to parse this query." + +#: addressbook/gui/widgets/eab-gui-util.c:164 +msgid "The backend for this addressbook refused to perform this query." +msgstr "The backend for this addressbook refused to perform this query." + +#: addressbook/gui/widgets/eab-gui-util.c:167 +msgid "This query did not complete successfully." +msgstr "This query did not complete successfully." + +#: addressbook/gui/widgets/eab-gui-util.c:193 msgid "Do you want to save changes?" msgstr "Do you want to save changes?" -#: addressbook/gui/widgets/eab-gui-util.c:88 +#: addressbook/gui/widgets/eab-gui-util.c:195 msgid "_Discard" msgstr "_Discard" -#: addressbook/gui/widgets/eab-gui-util.c:107 +#: addressbook/gui/widgets/eab-gui-util.c:214 msgid "Error adding list" msgstr "Error adding list" -#: addressbook/gui/widgets/eab-gui-util.c:107 -#: addressbook/gui/widgets/eab-gui-util.c:525 +#: addressbook/gui/widgets/eab-gui-util.c:214 +#: addressbook/gui/widgets/eab-gui-util.c:632 msgid "Error adding contact" msgstr "Error adding contact" -#: addressbook/gui/widgets/eab-gui-util.c:116 +#: addressbook/gui/widgets/eab-gui-util.c:223 msgid "Error modifying list" msgstr "Error modifying list" -#: addressbook/gui/widgets/eab-gui-util.c:116 +#: addressbook/gui/widgets/eab-gui-util.c:223 msgid "Error modifying contact" msgstr "Error modifying contact" -#: addressbook/gui/widgets/eab-gui-util.c:126 +#: addressbook/gui/widgets/eab-gui-util.c:233 msgid "Error removing list" msgstr "Error removing list" -#: addressbook/gui/widgets/eab-gui-util.c:126 -#: addressbook/gui/widgets/eab-gui-util.c:483 +#: addressbook/gui/widgets/eab-gui-util.c:233 +#: addressbook/gui/widgets/eab-gui-util.c:590 msgid "Error removing contact" msgstr "Error removing contact" -#: addressbook/gui/widgets/eab-gui-util.c:208 +#: addressbook/gui/widgets/eab-gui-util.c:315 #, c-format msgid "" "Opening %d contacts will open %d new windows as well.\n" @@ -3016,7 +3026,7 @@ msgstr "" "Opening %d contacts will open %d new windows as well.\n" "Do you really want to display all of these contacts?" -#: addressbook/gui/widgets/eab-gui-util.c:234 +#: addressbook/gui/widgets/eab-gui-util.c:341 #, c-format msgid "" "%s already exists\n" @@ -3025,49 +3035,49 @@ msgstr "" "%s already exists\n" "Do you want to overwrite it?" -#: addressbook/gui/widgets/eab-gui-util.c:238 +#: addressbook/gui/widgets/eab-gui-util.c:345 msgid "Overwrite" msgstr "Overwrite" -#: addressbook/gui/widgets/eab-gui-util.c:274 +#: addressbook/gui/widgets/eab-gui-util.c:381 #, c-format msgid "Error saving %s: %s" msgstr "Error saving %s: %s" #. This is a filename. Translators take note. -#: addressbook/gui/widgets/eab-gui-util.c:311 +#: addressbook/gui/widgets/eab-gui-util.c:418 msgid "card.vcf" msgstr "card.vcf" -#: addressbook/gui/widgets/eab-gui-util.c:444 +#: addressbook/gui/widgets/eab-gui-util.c:551 msgid "list" msgstr "list" -#: addressbook/gui/widgets/eab-gui-util.c:579 +#: addressbook/gui/widgets/eab-gui-util.c:686 msgid "Move contact to" msgstr "Move contact to" -#: addressbook/gui/widgets/eab-gui-util.c:581 +#: addressbook/gui/widgets/eab-gui-util.c:688 msgid "Copy contact to" msgstr "Copy contact to" -#: addressbook/gui/widgets/eab-gui-util.c:584 +#: addressbook/gui/widgets/eab-gui-util.c:691 msgid "Move contacts to" msgstr "Move contacts to" -#: addressbook/gui/widgets/eab-gui-util.c:586 +#: addressbook/gui/widgets/eab-gui-util.c:693 msgid "Copy contacts to" msgstr "Copy contacts to" -#: addressbook/gui/widgets/eab-gui-util.c:589 +#: addressbook/gui/widgets/eab-gui-util.c:696 msgid "Select target addressbook." msgstr "Select target addressbook." -#: addressbook/gui/widgets/eab-gui-util.c:768 +#: addressbook/gui/widgets/eab-gui-util.c:869 msgid "Multiple VCards" msgstr "Multiple VCards" -#: addressbook/gui/widgets/eab-gui-util.c:771 +#: addressbook/gui/widgets/eab-gui-util.c:872 #, c-format msgid "VCard for %s" msgstr "VCard for %s" @@ -3178,12 +3188,12 @@ msgstr "VCard (.vcf, .gcrd)" msgid "Print envelope" msgstr "Print envelope" -#: addressbook/printing/e-contact-print.c:1009 +#: addressbook/printing/e-contact-print.c:998 msgid "Print contacts" msgstr "Print contacts" -#: addressbook/printing/e-contact-print.c:1075 -#: addressbook/printing/e-contact-print.c:1102 +#: addressbook/printing/e-contact-print.c:1064 +#: addressbook/printing/e-contact-print.c:1091 msgid "Print contact" msgstr "Print contact" @@ -3449,12 +3459,11 @@ msgstr "Input File" msgid "No filename provided." msgstr "No filename provided." -#: addressbook/util/eab-destination.c:677 +#: addressbook/util/e-destination.c:576 msgid "Unnamed List" msgstr "Unnamed List" -#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158 -#: smime/gui/component.c:48 +#: calendar/common/authentication.c:37 smime/gui/component.c:48 msgid "Enter password" msgstr "Enter password" @@ -3531,7 +3540,7 @@ msgid "Evolution's Tasks component" msgstr "Evolution's Tasks component" #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 -#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819 +#: calendar/gui/e-tasks.c:1155 calendar/gui/print.c:1819 #: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79 #: calendar/importers/icalendar-importer.c:709 msgid "Tasks" @@ -3577,24 +3586,24 @@ msgstr "Snooze time (minutes)" msgid "_Edit appointment" msgstr "_Edit appointment" -#: calendar/gui/alarm-notify/alarm-queue.c:906 +#: calendar/gui/alarm-notify/alarm-queue.c:872 #: ui/evolution-message-composer.xml.h:10 msgid "Open" msgstr "Open" -#: calendar/gui/alarm-notify/alarm-queue.c:908 +#: calendar/gui/alarm-notify/alarm-queue.c:874 msgid "Dismiss" msgstr "Dismiss" -#: calendar/gui/alarm-notify/alarm-queue.c:910 +#: calendar/gui/alarm-notify/alarm-queue.c:876 msgid "Dismiss All" msgstr "Dismiss All" -#: calendar/gui/alarm-notify/alarm-queue.c:975 +#: calendar/gui/alarm-notify/alarm-queue.c:941 msgid "No description available." msgstr "No description available." -#: calendar/gui/alarm-notify/alarm-queue.c:993 +#: calendar/gui/alarm-notify/alarm-queue.c:959 #, c-format msgid "" "Alarm on %s\n" @@ -3607,12 +3616,12 @@ msgstr "" "Starting at %s\n" "Ending at %s" -#: calendar/gui/alarm-notify/alarm-queue.c:1089 -#: calendar/gui/alarm-notify/alarm-queue.c:1113 +#: calendar/gui/alarm-notify/alarm-queue.c:1055 +#: calendar/gui/alarm-notify/alarm-queue.c:1079 msgid "Warning" msgstr "Warning" -#: calendar/gui/alarm-notify/alarm-queue.c:1093 +#: calendar/gui/alarm-notify/alarm-queue.c:1059 msgid "" "Evolution does not support calendar reminders with\n" "email notifications yet, but this reminder was\n" @@ -3624,7 +3633,7 @@ msgstr "" "configured to send an email. Evolution will display\n" "a normal reminder dialogue box instead." -#: calendar/gui/alarm-notify/alarm-queue.c:1119 +#: calendar/gui/alarm-notify/alarm-queue.c:1085 #, c-format msgid "" "An Evolution Calendar reminder is about to trigger. This reminder is " @@ -3641,7 +3650,7 @@ msgstr "" "\n" "Are you sure you want to run this program?" -#: calendar/gui/alarm-notify/alarm-queue.c:1133 +#: calendar/gui/alarm-notify/alarm-queue.c:1099 msgid "Do not ask me about this program again." msgstr "Do not ask me about this program again." @@ -3657,7 +3666,7 @@ msgstr "Could not initialise gnome-vfs" msgid "Could not create the alarm notify service factory" msgstr "Could not create the alarm notify service factory" -#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111 +#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:114 msgid "invalid time" msgstr "invalid time" @@ -3746,46 +3755,42 @@ msgid "Show where events end in week and month views" msgstr "Show where events end in week and month views" #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22 -msgid "The view showing when the calendar starts" -msgstr "The view showing when the calendar starts" - -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23 msgid "Time last alarm ran" msgstr "Time last alarm ran" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23 msgid "Units for determining when to hide tasks" msgstr "Units for determining when to hide tasks" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24 msgid "Units of default reminder" msgstr "Units of default reminder" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25 msgid "Weekday the week starts on" msgstr "Weekday the week starts on" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26 msgid "Whether to ask for confirmation on appointment deletion" msgstr "Whether to ask for confirmation on appointment deletion" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27 msgid "Whether to ask for confirmation when folder is expunged" msgstr "Whether to ask for confirmation when folder is expunged" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28 msgid "Whether to hide completed tasks" msgstr "Whether to hide completed tasks" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29 msgid "Whether to set a default reminder for events" msgstr "Whether to set a default reminder for events" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30 msgid "Whether to show times in 24h format instead of using am/pm" msgstr "Whether to show times in 24h format instead of using am/pm" -#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31 msgid "Whether to show week numbers in date navigator" msgstr "Whether to show week numbers in date navigator" @@ -3805,11 +3810,11 @@ msgstr "Comment contains" msgid "Location contains" msgstr "Location contains" -#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059 +#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1005 msgid "Unmatched" msgstr "Unmatched" -#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596 +#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1606 #: camel/providers/groupwise/camel-gw-listener.c:302 #: camel/providers/groupwise/camel-gw-listener.c:326 msgid "Calendar" @@ -3841,7 +3846,7 @@ msgstr "%A %d %B %Y" #. strftime format %a = abbreviated weekday name, %d = day of month, #. %b = abbreviated month name. Don't use any other specifiers. #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692 -#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329 +#: calendar/gui/e-day-view.c:1590 calendar/gui/e-week-view-main-item.c:329 msgid "%a %d %b" msgstr "%a %d %b" @@ -3885,48 +3890,48 @@ msgstr "_Appointment" msgid "Create a new appointment" msgstr "Create a new appointment" -#: calendar/gui/calendar-component.c:930 +#: calendar/gui/calendar-component.c:931 msgid "New meeting" msgstr "New meeting" -#: calendar/gui/calendar-component.c:931 +#: calendar/gui/calendar-component.c:932 msgid "M_eeting" msgstr "M_eeting" -#: calendar/gui/calendar-component.c:932 +#: calendar/gui/calendar-component.c:933 msgid "Create a new meeting request" msgstr "Create a new meeting request" -#: calendar/gui/calendar-component.c:937 +#: calendar/gui/calendar-component.c:939 msgid "New all day appointment" msgstr "New all day appointment" -#: calendar/gui/calendar-component.c:938 +#: calendar/gui/calendar-component.c:940 msgid "All _Day Appointment" msgstr "All _Day Appointment" -#: calendar/gui/calendar-component.c:939 +#: calendar/gui/calendar-component.c:941 msgid "Create a new all-day appointment" msgstr "Create a new all-day appointment" -#: calendar/gui/calendar-component.c:944 +#: calendar/gui/calendar-component.c:947 msgid "New calendar" msgstr "New calendar" -#: calendar/gui/calendar-component.c:945 +#: calendar/gui/calendar-component.c:948 msgid "C_alendar" msgstr "C_alendar" -#: calendar/gui/calendar-component.c:946 +#: calendar/gui/calendar-component.c:949 msgid "Create a new calendar" msgstr "Create a new calendar" -#: calendar/gui/calendar-component.c:1013 +#: calendar/gui/calendar-component.c:1017 #, c-format msgid "Unable to open the calendar '%s' for creating events and meetings" msgstr "Unable to open the calendar '%s' for creating events and meetings" -#: calendar/gui/calendar-component.c:1025 +#: calendar/gui/calendar-component.c:1029 msgid "There is no calendar available for creating events and meetings" msgstr "There is no calendar available for creating events and meetings" @@ -3978,11 +3983,11 @@ msgstr "open_client(): %s" msgid "Could not open the folder in '%s'" msgstr "Could not open the folder in '%s'" -#: calendar/gui/control-factory.c:192 +#: calendar/gui/control-factory.c:194 msgid "The URI that the calendar will display" msgstr "The URI that the calendar will display" -#: calendar/gui/control-factory.c:199 +#: calendar/gui/control-factory.c:201 msgid "The type of view to show" msgstr "The type of view to show" @@ -4051,6 +4056,7 @@ msgid "hours" msgstr "hours" #: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17 +#: mail/mail-config.glade.h:182 msgid "minutes" msgstr "minutes" @@ -4096,7 +4102,7 @@ msgstr "Send an email" #: calendar/gui/dialogs/alarm-page.glade.h:9 #: calendar/gui/dialogs/recurrence-page.glade.h:8 #: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11 -#: calendar/gui/e-tasks.c:164 +#: calendar/gui/e-tasks.c:167 msgid "Summary:" msgstr "Summary:" @@ -4136,34 +4142,34 @@ msgstr "start of appointment" #. 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:415 mail/em-account-prefs.c:492 -#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948 +#: calendar/gui/dialogs/cal-prefs-dialog.c:569 mail/em-account-prefs.c:492 +#: mail/em-composer-prefs.c:670 mail/em-composer-prefs.c:898 msgid "Enabled" msgstr "Enabled" -#: calendar/gui/dialogs/cal-prefs-dialog.c:656 +#: calendar/gui/dialogs/cal-prefs-dialog.c:731 msgid "Are you sure you want to remove this URL?" msgstr "Are you sure you want to remove this URL?" -#: calendar/gui/dialogs/cal-prefs-dialog.c:664 +#: calendar/gui/dialogs/cal-prefs-dialog.c:739 msgid "Don't Remove" msgstr "Don't Remove" -#: calendar/gui/dialogs/cal-prefs-dialog.c:710 -#: calendar/gui/dialogs/cal-prefs-dialog.c:742 -#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314 +#: calendar/gui/dialogs/cal-prefs-dialog.c:789 +#: calendar/gui/dialogs/cal-prefs-dialog.c:823 +#: calendar/gui/dialogs/cal-prefs-dialog.c:857 mail/em-account-prefs.c:314 #: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398 -#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769 -#: mail/em-composer-prefs.c:793 +#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647 +#: mail/em-composer-prefs.c:677 msgid "Disable" msgstr "Disable" -#: calendar/gui/dialogs/cal-prefs-dialog.c:710 -#: calendar/gui/dialogs/cal-prefs-dialog.c:742 -#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314 +#: calendar/gui/dialogs/cal-prefs-dialog.c:789 +#: calendar/gui/dialogs/cal-prefs-dialog.c:823 +#: calendar/gui/dialogs/cal-prefs-dialog.c:859 mail/em-account-prefs.c:314 #: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400 -#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769 -#: mail/em-composer-prefs.c:793 +#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647 +#: mail/em-composer-prefs.c:677 msgid "Enable" msgstr "Enable" @@ -4610,7 +4616,7 @@ msgstr "%s You have made changes. Forget those changes and update the editor?" msgid "%s You have made no changes, update the editor?" msgstr "%s You have made no changes, update the editor?" -#: calendar/gui/dialogs/comp-editor-page.c:440 +#: calendar/gui/dialogs/comp-editor-page.c:463 #, c-format msgid "Validation error: %s" msgstr "Validation error: %s" @@ -4635,51 +4641,51 @@ msgstr " (Due " msgid "Due " msgstr "Due " -#: calendar/gui/dialogs/comp-editor.c:402 +#: calendar/gui/dialogs/comp-editor.c:424 msgid "Could not update object" msgstr "Could not update object" -#: calendar/gui/dialogs/comp-editor.c:877 -#: calendar/gui/dialogs/comp-editor.c:914 +#: calendar/gui/dialogs/comp-editor.c:899 +#: calendar/gui/dialogs/comp-editor.c:936 msgid "Edit Appointment" msgstr "Edit Appointment" -#: calendar/gui/dialogs/comp-editor.c:882 -#: calendar/gui/dialogs/comp-editor.c:919 +#: calendar/gui/dialogs/comp-editor.c:904 +#: calendar/gui/dialogs/comp-editor.c:941 #, c-format msgid "Appointment - %s" msgstr "Appointment - %s" -#: calendar/gui/dialogs/comp-editor.c:885 -#: calendar/gui/dialogs/comp-editor.c:922 +#: calendar/gui/dialogs/comp-editor.c:907 +#: calendar/gui/dialogs/comp-editor.c:944 #, c-format msgid "Task - %s" msgstr "Task - %s" -#: calendar/gui/dialogs/comp-editor.c:888 -#: calendar/gui/dialogs/comp-editor.c:925 +#: calendar/gui/dialogs/comp-editor.c:910 +#: calendar/gui/dialogs/comp-editor.c:947 #, c-format msgid "Journal entry - %s" msgstr "Journal entry - %s" -#: calendar/gui/dialogs/comp-editor.c:899 -#: calendar/gui/dialogs/comp-editor.c:935 +#: calendar/gui/dialogs/comp-editor.c:921 +#: calendar/gui/dialogs/comp-editor.c:957 msgid "No summary" msgstr "No summary" -#: calendar/gui/dialogs/comp-editor.c:1360 +#: calendar/gui/dialogs/comp-editor.c:1382 #: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006 -#: composer/e-msg-composer.c:1153 +#: composer/e-msg-composer.c:1190 msgid "Save as..." msgstr "Save as..." -#: calendar/gui/dialogs/comp-editor.c:1463 -#: calendar/gui/dialogs/comp-editor.c:1487 -#: calendar/gui/dialogs/comp-editor.c:1513 +#: calendar/gui/dialogs/comp-editor.c:1485 +#: calendar/gui/dialogs/comp-editor.c:1509 +#: calendar/gui/dialogs/comp-editor.c:1535 msgid "Changes made to this item may be discarded if an update arrives" msgstr "Changes made to this item may be discarded if an update arrives" -#: calendar/gui/dialogs/comp-editor.c:1552 +#: calendar/gui/dialogs/comp-editor.c:1574 msgid "Unable to use current version!" msgstr "Unable to use current version!" @@ -4827,31 +4833,31 @@ msgstr "Scheduling" msgid "Meeting" msgstr "Meeting" -#: calendar/gui/dialogs/event-page.c:458 +#: calendar/gui/dialogs/event-page.c:460 msgid "Event with no start date" msgstr "Event with no start date" -#: calendar/gui/dialogs/event-page.c:461 +#: calendar/gui/dialogs/event-page.c:463 msgid "Event with no end date" msgstr "Event with no end date" -#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512 +#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514 msgid "Start date is wrong" msgstr "Start date is wrong" -#: calendar/gui/dialogs/event-page.c:625 +#: calendar/gui/dialogs/event-page.c:627 msgid "End date is wrong" msgstr "End date is wrong" -#: calendar/gui/dialogs/event-page.c:648 +#: calendar/gui/dialogs/event-page.c:650 msgid "Start time is wrong" msgstr "Start time is wrong" -#: calendar/gui/dialogs/event-page.c:655 +#: calendar/gui/dialogs/event-page.c:657 msgid "End time is wrong" msgstr "End time is wrong" -#: calendar/gui/dialogs/event-page.c:1234 +#: calendar/gui/dialogs/event-page.c:1264 #, c-format msgid "Unable to open the calendar '%s'." msgstr "Unable to open the calendar '%s'." @@ -4925,9 +4931,9 @@ msgstr "_Start time:" #. an empty string is the same as 'None' #: calendar/gui/dialogs/meeting-page.c:311 #: calendar/gui/dialogs/meeting-page.glade.h:3 -#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131 -#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774 -#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860 +#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2165 +#: mail/em-account-prefs.c:453 mail/em-folder-view.c:808 +#: mail/mail-account-gui.c:1390 mail/mail-account-gui.c:1884 #: mail/mail-config.glade.h:100 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443 @@ -5208,7 +5214,7 @@ msgstr "" "\n" "Do you wish to save your changes?" -#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570 +#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1607 msgid "_Discard Changes" msgstr "_Discard Changes" @@ -5251,7 +5257,7 @@ msgstr "The task assignment information has been created. Send it?" msgid "The task information has changed. Send an updated version?" msgstr "The task information has changed. Send an updated version?" -#: calendar/gui/dialogs/task-details-page.c:404 +#: calendar/gui/dialogs/task-details-page.c:406 msgid "Completed date is wrong" msgstr "Completed date is wrong" @@ -5263,39 +5269,39 @@ msgstr "% _Complete" #: calendar/gui/dialogs/task-details-page.glade.h:4 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597 #: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187 -#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206 +#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209 #: calendar/gui/print.c:2346 msgid "Completed" msgstr "Completed" #: calendar/gui/dialogs/task-details-page.glade.h:5 -#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227 -#: mail/message-list.c:947 +#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:230 +#: mail/message-list.c:945 msgid "High" msgstr "High" #: calendar/gui/dialogs/task-details-page.glade.h:6 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595 #: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465 -#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343 +#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2343 msgid "In Progress" msgstr "In Progress" #: calendar/gui/dialogs/task-details-page.glade.h:7 -#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231 -#: mail/message-list.c:945 +#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:234 +#: mail/message-list.c:943 msgid "Low" msgstr "Low" #: calendar/gui/dialogs/task-details-page.glade.h:8 #: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392 -#: calendar/gui/e-tasks.c:229 mail/message-list.c:946 +#: calendar/gui/e-tasks.c:232 mail/message-list.c:944 msgid "Normal" msgstr "Normal" #: calendar/gui/dialogs/task-details-page.glade.h:9 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593 -#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213 +#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216 #: calendar/gui/print.c:2340 msgid "Not Started" msgstr "Not Started" @@ -5335,16 +5341,16 @@ msgstr "Basic" msgid "Assignment" msgstr "Assignment" -#: calendar/gui/dialogs/task-page.c:485 +#: calendar/gui/dialogs/task-page.c:487 msgid "Due date is wrong" msgstr "Due date is wrong" -#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738 +#: calendar/gui/dialogs/task-page.c:547 calendar/gui/e-cal-model-tasks.c:738 #: calendar/gui/e-cal-model-tasks.c:766 msgid "Due date is before start date!" msgstr "Due date is before start date!" -#: calendar/gui/dialogs/task-page.c:810 +#: calendar/gui/dialogs/task-page.c:840 #, c-format msgid "Unable to open tasks in '%s'." msgstr "Unable to open tasks in '%s'." @@ -5354,7 +5360,7 @@ msgid "Con_fidential" msgstr "Con_fidential" #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976 -#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243 +#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:246 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69 msgid "Description:" msgstr "Description:" @@ -5578,7 +5584,7 @@ msgstr "No" #: calendar/gui/e-meeting-list-view.c:144 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215 -#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716 +#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725 #: camel/camel-tcp-stream-openssl.c:631 #: camel/providers/smtp/camel-smtp-transport.c:172 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133 @@ -5648,7 +5654,7 @@ msgstr "Updating objects" #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081 #: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328 -#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37 +#: mail/em-folder-view.c:774 ui/evolution-addressbook.xml.h:37 msgid "_Open" msgstr "_Open" @@ -5658,7 +5664,7 @@ msgstr "Open _Web Page" #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087 #: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334 -#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804 +#: mail/em-folder-view.c:776 mail/em-popup.c:689 mail/em-popup.c:804 #: ui/evolution-mail-message.xml.h:128 msgid "_Save As..." msgstr "_Save As..." @@ -5681,7 +5687,7 @@ msgstr "C_ut" #: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074 #: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308 -#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31 +#: mail/em-folder-tree.c:2563 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 msgid "_Copy" @@ -5844,26 +5850,26 @@ msgstr "%02i minute divisions" #. strftime format %A = full weekday name, %d = day of month, #. %B = full month name. Don't use any other specifiers. -#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571 +#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1573 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514 msgid "%A %d %B" msgstr "%A %d %B" #. strftime format %d = day of month, %b = abbreviated month name. #. Don't use any other specifiers. -#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604 +#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1606 #: calendar/gui/e-week-view-main-item.c:343 msgid "%d %b" msgstr "%d %b" #. String to use in 12-hour time format for times in the morning. -#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592 +#: calendar/gui/e-day-view.c:823 calendar/gui/e-week-view.c:596 #: calendar/gui/print.c:838 msgid "am" msgstr "am" #. String to use in 12-hour time format for times in the afternoon. -#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595 +#: calendar/gui/e-day-view.c:826 calendar/gui/e-week-view.c:599 #: calendar/gui/print.c:840 msgid "pm" msgstr "pm" @@ -5980,7 +5986,7 @@ msgid "Location:" msgstr "Location:" #. write status -#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199 +#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:202 msgid "Status:" msgstr "Status:" @@ -6013,7 +6019,7 @@ msgstr "Update" #: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049 #: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085 #: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111 -#: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265 +#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265 msgid "OK" msgstr "OK" @@ -6477,30 +6483,30 @@ msgstr "Meeting _start time:" msgid "Meeting _end time:" msgstr "Meeting _end time:" -#: calendar/gui/e-tasks.c:177 +#: calendar/gui/e-tasks.c:180 msgid "Start Date:" msgstr "Start Date:" -#: calendar/gui/e-tasks.c:193 +#: calendar/gui/e-tasks.c:196 msgid "Due Date:" msgstr "Due Date:" #. write priority -#: calendar/gui/e-tasks.c:221 +#: calendar/gui/e-tasks.c:224 msgid "Priority:" msgstr "Priority:" #. URL -#: calendar/gui/e-tasks.c:277 +#: calendar/gui/e-tasks.c:280 msgid "Web Page:" msgstr "Web Page:" -#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173 +#: calendar/gui/e-tasks.c:313 mail/em-folder-view.c:2206 #, c-format msgid "Click to open %s" msgstr "Click to open %s" -#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899 +#: calendar/gui/e-tasks.c:789 calendar/gui/gnome-cal.c:1909 #, c-format msgid "" "Error on %s:\n" @@ -6510,7 +6516,7 @@ msgstr "" " %s" #. FIXME: this doesn't remove the task list from the list or anything -#: calendar/gui/e-tasks.c:792 +#: calendar/gui/e-tasks.c:808 #, c-format msgid "" "The task backend for\n" @@ -6521,12 +6527,12 @@ msgstr "" "%s\n" " has crashed." -#: calendar/gui/e-tasks.c:872 +#: calendar/gui/e-tasks.c:888 #, c-format msgid "Opening tasks at %s" msgstr "Opening tasks at %s" -#: calendar/gui/e-tasks.c:893 +#: calendar/gui/e-tasks.c:909 #, c-format msgid "" "Error opening %s:\n" @@ -6535,48 +6541,48 @@ msgstr "" "Error opening %s:\n" "%s" -#: calendar/gui/e-tasks.c:912 +#: calendar/gui/e-tasks.c:928 msgid "Loading tasks" msgstr "Loading tasks" -#: calendar/gui/e-tasks.c:1014 +#: calendar/gui/e-tasks.c:1030 msgid "Completing tasks..." msgstr "Completing tasks..." -#: calendar/gui/e-tasks.c:1037 +#: calendar/gui/e-tasks.c:1053 msgid "Deleting selected objects..." msgstr "Deleting selected objects..." -#: calendar/gui/e-tasks.c:1063 +#: calendar/gui/e-tasks.c:1079 msgid "Expunging" msgstr "Expunging" -#: calendar/gui/gnome-cal.c:1760 +#: calendar/gui/gnome-cal.c:1770 #, c-format msgid "Loading appointments at %s" msgstr "Loading appointments at %s" -#: calendar/gui/gnome-cal.c:1779 +#: calendar/gui/gnome-cal.c:1789 #, c-format msgid "Loading tasks at %s" msgstr "Loading tasks at %s" -#: calendar/gui/gnome-cal.c:1799 +#: calendar/gui/gnome-cal.c:1809 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: calendar/gui/gnome-cal.c:1928 +#: calendar/gui/gnome-cal.c:1938 #, c-format msgid "The calendar backend for '%s' has crashed." msgstr "The calendar backend for '%s' has crashed." -#: calendar/gui/gnome-cal.c:1940 +#: calendar/gui/gnome-cal.c:1950 #, c-format msgid "The task backend for '%s' has crashed." msgstr "The task backend for '%s' has crashed." -#: calendar/gui/gnome-cal.c:2754 +#: calendar/gui/gnome-cal.c:2763 msgid "Purging" msgstr "Purging" @@ -6690,11 +6696,6 @@ msgstr "iCalendar information" msgid "You must be an attendee of the event." msgstr "You must be an attendee of the event." -#: calendar/gui/itip-utils.c:1157 -#, c-format -msgid "Enter the password for %s" -msgstr "Enter the password for %s" - #: calendar/gui/migration.c:137 msgid "" "The location and hierarchy of the Evolution task folders has changed since " @@ -6976,24 +6977,24 @@ msgstr "_Task" msgid "Create a new task" msgstr "Create a new task" -#: calendar/gui/tasks-component.c:567 -msgid "New task list" -msgstr "New task list" - #: calendar/gui/tasks-component.c:568 -msgid "_Task List" -msgstr "_Task List" +msgid "New tasks group" +msgstr "New tasks group" #: calendar/gui/tasks-component.c:569 -msgid "Create a new task list" -msgstr "Create a new task list" +msgid "_Tasks Group" +msgstr "_Tasks Group" -#: calendar/gui/tasks-component.c:636 +#: calendar/gui/tasks-component.c:570 +msgid "Create a new tasks group" +msgstr "Create a new tasks group" + +#: calendar/gui/tasks-component.c:638 #, c-format msgid "Unable to open the task list '%s' for creating events and meetings" msgstr "Unable to open the task list '%s' for creating events and meetings" -#: calendar/gui/tasks-component.c:648 +#: calendar/gui/tasks-component.c:650 msgid "There is no calendar available for creating tasks" msgstr "There is no calendar available for creating tasks" @@ -8790,38 +8791,38 @@ msgstr "(match-all) requires a single bool result" msgid "Performing query on unknown header: %s" msgstr "Performing query on unknown header: %s" -#: camel/camel-folder.c:586 +#: camel/camel-folder.c:623 #, c-format msgid "Unsupported operation: append message: for %s" msgstr "Unsupported operation: append message: for %s" -#: camel/camel-folder.c:1177 +#: camel/camel-folder.c:1229 #, c-format msgid "Unsupported operation: search by expression: for %s" msgstr "Unsupported operation: search by expression: for %s" -#: camel/camel-folder.c:1217 +#: camel/camel-folder.c:1269 #, c-format msgid "Unsupported operation: search by uids: for %s" msgstr "Unsupported operation: search by uids: for %s" -#: camel/camel-folder.c:1335 +#: camel/camel-folder.c:1386 msgid "Moving messages" msgstr "Moving messages" -#: camel/camel-folder.c:1335 +#: camel/camel-folder.c:1386 msgid "Copying messages" msgstr "Copying messages" -#: camel/camel-folder.c:1589 +#: camel/camel-folder.c:1636 msgid "Learning junk and/or non junk message(s)" msgstr "Learning junk and/or non junk message(s)" -#: camel/camel-folder.c:1618 +#: camel/camel-folder.c:1665 msgid "Filtering new message(s)" msgstr "Filtering new message(s)" -#: camel/camel-gpg-context.c:710 +#: camel/camel-gpg-context.c:712 #, c-format msgid "" "Unexpected GnuPG status message encountered:\n" @@ -8832,15 +8833,15 @@ msgstr "" "\n" "%s" -#: camel/camel-gpg-context.c:724 +#: camel/camel-gpg-context.c:726 msgid "Failed to parse gpg userid hint." msgstr "Failed to parse gpg userid hint." -#: camel/camel-gpg-context.c:748 +#: camel/camel-gpg-context.c:750 msgid "Failed to parse gpg passphrase request." msgstr "Failed to parse gpg passphrase request." -#: camel/camel-gpg-context.c:762 +#: camel/camel-gpg-context.c:764 #, c-format msgid "" "You need a passphrase to unlock the key for\n" @@ -8849,27 +8850,27 @@ msgstr "" "You need a passphrase to unlock the key for\n" "user: \"%s\"" -#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263 -#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508 -#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697 +#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267 +#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517 +#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:697 #: mail/mail-send-recv.c:598 msgid "Cancelled." msgstr "Cancelled." -#: camel/camel-gpg-context.c:797 +#: camel/camel-gpg-context.c:799 msgid "Failed to unlock secret key: 3 bad passphrases given." msgstr "Failed to unlock secret key: 3 bad passphrases given." -#: camel/camel-gpg-context.c:803 +#: camel/camel-gpg-context.c:805 #, c-format msgid "Unexpected response from GnuPG: %s" msgstr "Unexpected response from GnuPG: %s" -#: camel/camel-gpg-context.c:847 +#: camel/camel-gpg-context.c:851 msgid "Failed to encrypt: No valid recipients specified." msgstr "Failed to encrypt: No valid recipients specified." -#: camel/camel-gpg-context.c:1124 +#: camel/camel-gpg-context.c:1128 #, c-format msgid "" "Failed to GPG %s: %s\n" @@ -8880,58 +8881,58 @@ msgstr "" "\n" "%s" -#: camel/camel-gpg-context.c:1129 +#: camel/camel-gpg-context.c:1133 #, c-format msgid "Failed to GPG %s: %s\n" msgstr "Failed to GPG %s: %s\n" -#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419 +#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419 #, c-format msgid "Could not generate signing data: %s" msgstr "Could not generate signing data: %s" -#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664 -#: camel/camel-gpg-context.c:1715 +#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673 +#: camel/camel-gpg-context.c:1724 #, c-format msgid "Failed to execute gpg: %s" msgstr "Failed to execute gpg: %s" -#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414 -#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524 -#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632 -#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737 +#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417 +#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533 +#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641 +#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746 msgid "Failed to execute gpg." msgstr "Failed to execute gpg." -#: camel/camel-gpg-context.c:1299 +#: camel/camel-gpg-context.c:1303 msgid "This is a digitally signed message part" msgstr "This is a digitally signed message part" -#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390 +#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393 #: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728 #: camel/camel-smime-context.c:735 msgid "Cannot verify message signature: Incorrect message format" msgstr "Cannot verify message signature: Incorrect message format" -#: camel/camel-gpg-context.c:1397 +#: camel/camel-gpg-context.c:1400 #, c-format msgid "Cannot verify message signature: could not create temp file: %s" msgstr "Cannot verify message signature: could not create temp file: %s" -#: camel/camel-gpg-context.c:1484 +#: camel/camel-gpg-context.c:1493 #, c-format msgid "Could not generate encrypting data: %s" msgstr "Could not generate encrypting data: %s" -#: camel/camel-gpg-context.c:1542 +#: camel/camel-gpg-context.c:1551 msgid "This is a digitally encrypted message part" msgstr "This is a digitally encrypted message part" -#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990 +#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990 msgid "Encrypted content" msgstr "Encrypted content" -#: camel/camel-gpg-context.c:1643 +#: camel/camel-gpg-context.c:1652 msgid "Unable to parse message content" msgstr "Unable to parse message content" @@ -9441,13 +9442,12 @@ msgstr "Cannot create folder: Invalid operation on this store" msgid "Cannot delete folder: %s: Invalid operation" msgstr "Cannot delete folder: %s: Invalid operation" -#: camel/camel-store.c:793 mail/mail-ops.c:1079 +#: camel/camel-store.c:793 msgid "Trash" msgstr "Trash" #: camel/camel-store.c:795 filter/libfilter-i18n.h:35 -#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083 -#: ui/evolution-mail-message.xml.h:48 +#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48 msgid "Junk" msgstr "Junk" @@ -9664,31 +9664,31 @@ msgstr "" msgid "Could not parse URL `%s'" msgstr "Could not parse URL `%s'" -#: camel/camel-vee-folder.c:611 +#: camel/camel-vee-folder.c:614 #, c-format msgid "Error storing `%s': %s" msgstr "Error storing `%s': %s" -#: camel/camel-vee-folder.c:649 +#: camel/camel-vee-folder.c:654 #, c-format msgid "No such message %s in %s" msgstr "No such message %s in %s" -#: camel/camel-vee-folder.c:815 camel/camel-vee-folder.c:821 +#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826 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:368 +#: camel/camel-vee-store.c:377 #, c-format msgid "Cannot delete folder: %s: No such folder" msgstr "Cannot delete folder: %s: No such folder" -#: camel/camel-vee-store.c:381 +#: camel/camel-vee-store.c:390 #, c-format msgid "Cannot rename folder: %s: Invalid operation" msgstr "Cannot rename folder: %s: Invalid operation" -#: camel/camel-vee-store.c:389 +#: camel/camel-vee-store.c:398 #, c-format msgid "Cannot rename folder: %s: No such folder" msgstr "Cannot rename folder: %s: No such folder" @@ -9702,12 +9702,11 @@ 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/imap/camel-imap-provider.c:50 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:52 +#: camel/providers/imap/camel-imap-provider.c:45 msgid "Check for new messages in all folders" msgstr "Check for new messages in all folders" @@ -9759,12 +9758,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:3024 +#: camel/providers/imap/camel-imap-store.c:3117 msgid "Operation cancelled" msgstr "Operation cancelled" #: camel/providers/imap/camel-imap-command.c:302 -#: camel/providers/imap/camel-imap-store.c:3027 +#: camel/providers/imap/camel-imap-store.c:3120 #, c-format msgid "Server unexpectedly disconnected: %s" msgstr "Server unexpectedly disconnected: %s" @@ -9822,12 +9821,12 @@ msgstr "Folder was destroyed and recreated on server." msgid "Scanning for changed messages" msgstr "Scanning for changed messages" -#: camel/providers/imap/camel-imap-folder.c:1924 +#: camel/providers/imap/camel-imap-folder.c:1960 #, c-format msgid "Unable to retrieve message: %s" msgstr "Unable to retrieve message: %s" -#: camel/providers/imap/camel-imap-folder.c:1971 +#: camel/providers/imap/camel-imap-folder.c:2007 #: camel/providers/local/camel-maildir-folder.c:211 #: camel/providers/local/camel-maildir-folder.c:224 #: camel/providers/local/camel-maildir-folder.c:233 @@ -9843,25 +9842,25 @@ msgstr "" "Cannot get message: %s\n" " %s" -#: camel/providers/imap/camel-imap-folder.c:1971 +#: camel/providers/imap/camel-imap-folder.c:2007 #: camel/providers/local/camel-maildir-folder.c:211 #: camel/providers/local/camel-mbox-folder.c:417 #: camel/providers/local/camel-mh-folder.c:200 msgid "No such message" msgstr "No such message" -#: camel/providers/imap/camel-imap-folder.c:2005 -#: camel/providers/imap/camel-imap-folder.c:2601 +#: camel/providers/imap/camel-imap-folder.c:2041 +#: camel/providers/imap/camel-imap-folder.c:2643 #: camel/providers/nntp/camel-nntp-folder.c:205 msgid "This message is not currently available" msgstr "This message is not currently available" -#: camel/providers/imap/camel-imap-folder.c:2265 -#: camel/providers/imap/camel-imap-folder.c:2335 +#: camel/providers/imap/camel-imap-folder.c:2307 +#: camel/providers/imap/camel-imap-folder.c:2377 msgid "Fetching summary information for new messages" msgstr "Fetching summary information for new messages" -#: camel/providers/imap/camel-imap-folder.c:2639 +#: camel/providers/imap/camel-imap-folder.c:2681 msgid "Could not find message body in FETCH response." msgstr "Could not find message body in FETCH response." @@ -9884,14 +9883,18 @@ msgid "Failed to cache %s: %s" msgstr "Failed to cache %s: %s" #: camel/providers/imap/camel-imap-provider.c:43 +msgid "Checking for New Mail" +msgstr "Checking for New Mail" + +#: camel/providers/imap/camel-imap-provider.c:48 msgid "Connection to Server" msgstr "Connection to Server" -#: camel/providers/imap/camel-imap-provider.c:45 +#: camel/providers/imap/camel-imap-provider.c:50 msgid "Use custom command to connect to server" msgstr "Use custom command to connect to server" -#: camel/providers/imap/camel-imap-provider.c:47 +#: camel/providers/imap/camel-imap-provider.c:52 msgid "Command:" msgstr "Command:" @@ -10022,20 +10025,25 @@ msgstr "" "\n" #: camel/providers/imap/camel-imap-store.c:1790 -#: camel/providers/imap/camel-imap-store.c:1884 +#: camel/providers/imap/camel-imap-store.c:1978 #, c-format msgid "No such folder %s" msgstr "No such folder %s" #: camel/providers/imap/camel-imap-store.c:1801 -#: camel/providers/imap/camel-imap-store.c:2090 +#: camel/providers/imap/camel-imap-store.c:2184 #, c-format msgid "" -"The folder name \"%s\" is invalid because it containes the character \"%c\"" +"The folder name \"%s\" is invalid because it contains the character \"%c\"" msgstr "" -"The folder name \"%s\" is invalid because it containes the character \"%c\"" +"The folder name \"%s\" is invalid because it contains the character \"%c\"" + +#: camel/providers/imap/camel-imap-store.c:1864 +#: camel/providers/imap/camel-imap-store.c:2245 +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:1825 +#: camel/providers/imap/camel-imap-store.c:1919 #: camel/providers/local/camel-maildir-store.c:137 #: camel/providers/local/camel-mbox-store.c:212 #: camel/providers/local/camel-mh-store.c:236 @@ -10043,15 +10051,11 @@ msgstr "" msgid "Cannot create folder `%s': folder exists." msgstr "Cannot create folder `%s': folder exists." -#: camel/providers/imap/camel-imap-store.c:2102 +#: camel/providers/imap/camel-imap-store.c:2195 #, c-format msgid "Unknown parent folder: %s" msgstr "Unknown parent folder: %s" -#: camel/providers/imap/camel-imap-store.c:2152 -msgid "The parent folder is not allowed to contain subfolders" -msgstr "The parent folder is not allowed to contain subfolders" - #: camel/providers/imapp/camel-imapp-provider.c:39 #: camel/providers/pop3/camel-pop3-provider.c:38 msgid "Message storage" @@ -10437,7 +10441,7 @@ msgstr "Could not close source folder %s: %s" msgid "Could not close temp folder: %s" msgstr "Could not close temp folder: %s" -#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470 +#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2523 #, c-format msgid "Could not rename folder: %s" msgstr "Could not rename folder: %s" @@ -11408,13 +11412,13 @@ msgstr "Click here to select folders to post to" msgid "Attach file(s)" msgstr "Attach file(s)" -#: composer/e-msg-composer.c:662 +#: composer/e-msg-composer.c:692 msgid "" "Cannot sign outgoing message: No signing certificate set for from account" msgstr "" "Cannot sign outgoing message: No signing certificate set for from account" -#: composer/e-msg-composer.c:668 +#: composer/e-msg-composer.c:698 msgid "" "Cannot encrypt outgoing message: No encryption certificate set for from " "account" @@ -11422,7 +11426,7 @@ msgstr "" "Cannot encrypt outgoing message: No encryption certificate set for from " "account" -#: composer/e-msg-composer.c:799 +#: composer/e-msg-composer.c:829 #, c-format msgid "" "Error while reading file %s:\n" @@ -11431,30 +11435,30 @@ msgstr "" "Error while reading file %s:\n" "%s" -#: composer/e-msg-composer.c:1168 +#: composer/e-msg-composer.c:1205 msgid "File exists, overwrite?" msgstr "File exists, overwrite?" -#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195 +#: composer/e-msg-composer.c:1216 composer/e-msg-composer.c:1232 #, c-format msgid "Error saving file: %s" msgstr "Error saving file: %s" -#: composer/e-msg-composer.c:1219 +#: composer/e-msg-composer.c:1256 #, c-format msgid "Error loading file: %s" msgstr "Error loading file: %s" -#: composer/e-msg-composer.c:1257 +#: composer/e-msg-composer.c:1294 #, c-format msgid "Error accessing file: %s" msgstr "Error accessing file: %s" -#: composer/e-msg-composer.c:1265 +#: composer/e-msg-composer.c:1302 msgid "Unable to retrieve message from editor" msgstr "Unable to retrieve message from editor" -#: composer/e-msg-composer.c:1272 +#: composer/e-msg-composer.c:1309 #, c-format msgid "" "Unable to seek on file: %s\n" @@ -11463,7 +11467,7 @@ msgstr "" "Unable to seek on file: %s\n" "%s" -#: composer/e-msg-composer.c:1279 +#: composer/e-msg-composer.c:1316 #, c-format msgid "" "Unable to truncate file: %s\n" @@ -11472,7 +11476,7 @@ msgstr "" "Unable to truncate file: %s\n" "%s" -#: composer/e-msg-composer.c:1288 +#: composer/e-msg-composer.c:1325 #, c-format msgid "" "Unable to copy file descriptor: %s\n" @@ -11481,7 +11485,7 @@ msgstr "" "Unable to copy file descriptor: %s\n" "%s" -#: composer/e-msg-composer.c:1297 +#: composer/e-msg-composer.c:1334 #, c-format msgid "" "Error autosaving message: %s\n" @@ -11490,7 +11494,7 @@ msgstr "" "Error autosaving message: %s\n" " %s" -#: composer/e-msg-composer.c:1401 +#: composer/e-msg-composer.c:1438 msgid "" "Ximian Evolution has found unsaved messages from a previous session.\n" "Would you like to try to recover them?" @@ -11498,7 +11502,7 @@ msgstr "" "Ximian Evolution has found unsaved messages from a previous session.\n" "Would you like to try to recover them?" -#: composer/e-msg-composer.c:1565 +#: composer/e-msg-composer.c:1602 #, c-format msgid "" "The message \"%s\" has not been sent.\n" @@ -11509,47 +11513,47 @@ msgstr "" "\n" "Do you wish to save your changes?" -#: composer/e-msg-composer.c:1567 +#: composer/e-msg-composer.c:1604 msgid "Untitled Message" msgstr "Untitled Message" -#: composer/e-msg-composer.c:1574 +#: composer/e-msg-composer.c:1611 msgid "Warning: Modified Message" msgstr "Warning: Modified Message" -#: composer/e-msg-composer.c:1607 +#: composer/e-msg-composer.c:1644 msgid "Open file" msgstr "Open file" -#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287 +#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1311 msgid "Autogenerated" msgstr "Autogenerated" -#: composer/e-msg-composer.c:2084 +#: composer/e-msg-composer.c:2150 msgid "Signature:" msgstr "Signature:" -#: composer/e-msg-composer.c:2316 +#: composer/e-msg-composer.c:2350 #, 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:2345 +#: composer/e-msg-composer.c:2379 msgid "Hide _Attachment Bar (drop attachments here)" msgstr "Hide _Attachment Bar (drop attachments here)" -#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240 +#: composer/e-msg-composer.c:2382 composer/e-msg-composer.c:3273 msgid "Show _Attachment Bar (drop attachments here)" msgstr "Show _Attachment Bar (drop attachments here)" -#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122 -#: composer/e-msg-composer.c:3123 +#: composer/e-msg-composer.c:2399 composer/e-msg-composer.c:3156 +#: composer/e-msg-composer.c:3157 msgid "Compose a message" msgstr "Compose a message" -#: composer/e-msg-composer.c:3152 +#: composer/e-msg-composer.c:3186 msgid "" "Could not create composer window:\n" "Unable to activate address selector control." @@ -11557,7 +11561,7 @@ msgstr "" "Could not create composer window:\n" "Unable to activate address selector control." -#: composer/e-msg-composer.c:3181 +#: composer/e-msg-composer.c:3214 msgid "" "Could not create composer window:\n" "Unable to activate HTML editor component.\n" @@ -11569,7 +11573,7 @@ msgstr "" "Please make sure you have the correct version\n" "of gtkhtml and libgtkhtml installed.\n" -#: composer/e-msg-composer.c:3285 +#: composer/e-msg-composer.c:3318 msgid "" "Could not create composer window:\n" "Unable to activate HTML editor component." @@ -11577,7 +11581,7 @@ msgstr "" "Could not create composer window:\n" "Unable to activate HTML editor component." -#: composer/e-msg-composer.c:4290 +#: composer/e-msg-composer.c:4323 msgid "" "<b>(The composer contains a non-text message body, which cannot be edited.)" "<b>" @@ -11916,7 +11920,7 @@ msgid "You must specify a folder." msgstr "You must specify a folder." #: filter/filter-folder.c:243 filter/vfolder-rule.c:507 -#: mail/mail-account-gui.c:1153 +#: mail/mail-account-gui.c:1177 msgid "Select Folder" msgstr "Select Folder" @@ -11929,19 +11933,19 @@ msgstr "" "Error in regular expression '%s':\n" "%s" -#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923 +#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:924 #: mail/mail-config.c:65 mail/mail-config.glade.h:90 msgid "Important" msgstr "Important" #. forest green -#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68 +#: filter/filter-label.c:124 mail/em-migrate.c:927 mail/mail-config.c:68 #: mail/mail-config.glade.h:145 msgid "To Do" msgstr "To Do" #. blue -#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69 +#: filter/filter-label.c:125 mail/em-migrate.c:928 mail/mail-config.c:69 #: mail/mail-config.glade.h:94 msgid "Later" msgstr "Later" @@ -12207,7 +12211,7 @@ msgstr "is not Flagged" msgid "Junk Test" msgstr "Junk Test" -#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773 +#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:807 #: widgets/misc/e-expander.c:189 msgid "Label" msgstr "Label" @@ -12442,7 +12446,8 @@ msgstr "Evolution Mail preferences control" #: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873 -#: mail/importers/pine-importer.c:473 +#: mail/importers/pine-importer.c:474 mail/mail-component.c:467 +#: mail/mail-component.c:512 msgid "Mail" msgstr "Mail" @@ -12475,25 +12480,24 @@ msgstr "Account name" msgid "Protocol" msgstr "Protocol" -#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461 -#: mail/mail-config.c:1048 +#: mail/em-composer-prefs.c:295 mail/em-composer-prefs.c:418 +#: mail/mail-config.c:1037 msgid "Unnamed" msgstr "Unnamed" -#: mail/em-composer-prefs.c:445 +#: mail/em-composer-prefs.c:402 msgid "You must specify a valid script name." msgstr "You must specify a valid script name." -#: mail/em-composer-prefs.c:952 +#: mail/em-composer-prefs.c:902 msgid "Language(s)" msgstr "Language(s)" -#: mail/em-composer-prefs.c:1000 -#, fuzzy +#: mail/em-composer-prefs.c:948 msgid "Add signature script" -msgstr "_Add Signature" +msgstr "Add signature script" -#: mail/em-composer-prefs.c:1020 +#: mail/em-composer-prefs.c:968 msgid "Signature(s)" msgstr "Signature(s)" @@ -12542,7 +12546,7 @@ msgstr "" msgid "You must specify recipients in order to send this message." msgstr "You must specify recipients in order to send this message." -#: mail/em-composer-utils.c:578 +#: mail/em-composer-utils.c:574 msgid "" "Unable to open the drafts folder for this account.\n" "Would you like to use the default drafts folder?" @@ -12580,18 +12584,16 @@ msgstr "Unread messages" msgid "<click here to select a folder>" msgstr "<click here to select a folder>" -#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318 +#: mail/em-folder-selector.c:166 msgid "Create New Folder" msgstr "Create New Folder" -#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230 -#: mail/mail-component.c:638 -#: shell/glade/e-shell-folder-creation-dialog.glade.h:4 +#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2277 +#: mail/mail-component.c:673 msgid "Specify where to create the folder:" msgstr "Specify where to create the folder:" #: mail/em-folder-selector.c:303 -#: shell/glade/e-shell-folder-creation-dialog.glade.h:2 msgid "Folder _name:" msgstr "Folder _name:" @@ -12609,272 +12611,272 @@ msgstr "UNMATCHED" msgid "Inbox" msgstr "Inbox" -#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792 +#: mail/em-folder-tree-model.c:493 mail/em-folder-tree-model.c:802 msgid "Loading..." msgstr "Loading..." -#: mail/em-folder-tree.c:877 +#: mail/em-folder-tree.c:922 #, c-format msgid "Moving folder %s" msgstr "Moving folder %s" -#: mail/em-folder-tree.c:879 +#: mail/em-folder-tree.c:924 #, c-format msgid "Copying folder %s" msgstr "Copying folder %s" -#: mail/em-folder-tree.c:886 +#: mail/em-folder-tree.c:931 #, c-format msgid "Moving messages into folder %s" msgstr "Moving messages into folder %s" -#: mail/em-folder-tree.c:888 +#: mail/em-folder-tree.c:933 #, c-format msgid "Copying messages into folder %s" msgstr "Copying messages into folder %s" -#: mail/em-folder-tree.c:904 +#: mail/em-folder-tree.c:949 msgid "Cannot drop message(s) into toplevel store" msgstr "Cannot drop message(s) into toplevel store" -#: mail/em-folder-tree.c:1950 +#: mail/em-folder-tree.c:1997 #, c-format msgid "Cannot move folder `%s': illegal operation" msgstr "Cannot move folder `%s': illegal operation" -#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156 +#: mail/em-folder-tree.c:2026 mail/em-folder-tree.c:2203 #, c-format msgid "%s" msgstr "%s" -#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008 -#: mail/em-folder-view.c:642 mail/em-folder-view.c:656 +#: mail/em-folder-tree.c:2042 mail/em-folder-tree.c:2055 +#: mail/em-folder-view.c:676 mail/em-folder-view.c:690 #: mail/importers/evolution-mbox-importer.c:119 msgid "Select folder" msgstr "Select folder" -#: mail/em-folder-tree.c:2035 +#: mail/em-folder-tree.c:2082 #, c-format msgid "Creating folder `%s'" msgstr "Creating folder `%s'" -#: mail/em-folder-tree.c:2230 mail/mail-component.c:638 +#: mail/em-folder-tree.c:2277 mail/mail-component.c:673 msgid "Create folder" msgstr "Create folder" -#: mail/em-folder-tree.c:2347 +#: mail/em-folder-tree.c:2396 #, c-format msgid "Could not delete folder: %s" msgstr "Could not delete folder: %s" -#: mail/em-folder-tree.c:2372 +#: mail/em-folder-tree.c:2423 #, c-format msgid "Cannot delete local %s folder." msgstr "Cannot delete local %s folder." -#: mail/em-folder-tree.c:2378 +#: mail/em-folder-tree.c:2429 #, c-format msgid "Really delete folder \"%s\" and all of its subfolders?" msgstr "Really delete folder \"%s\" and all of its subfolders?" -#: mail/em-folder-tree.c:2388 +#: mail/em-folder-tree.c:2439 #, c-format msgid "Delete \"%s\"" msgstr "Delete \"%s\"" -#: mail/em-folder-tree.c:2422 +#: mail/em-folder-tree.c:2475 #, c-format msgid "Cannot rename local %s folder." msgstr "Cannot rename local %s folder." -#: mail/em-folder-tree.c:2431 +#: mail/em-folder-tree.c:2484 #, c-format msgid "Rename the \"%s\" folder to:" msgstr "Rename the \"%s\" folder to:" -#: mail/em-folder-tree.c:2433 +#: mail/em-folder-tree.c:2486 msgid "Rename Folder" msgstr "Rename Folder" -#: mail/em-folder-tree.c:2457 +#: mail/em-folder-tree.c:2510 #, c-format msgid "A folder named \"%s\" already exists. Please use a different name." msgstr "A folder named \"%s\" already exists. Please use a different name." -#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44 +#: mail/em-folder-tree.c:2558 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:35 msgid "_View" msgstr "_View" -#: mail/em-folder-tree.c:2504 +#: mail/em-folder-tree.c:2559 msgid "Open in _New Window" msgstr "Open in _New Window" -#: mail/em-folder-tree.c:2509 +#: mail/em-folder-tree.c:2564 msgid "_Move" msgstr "_Move" #. FIXME: need to disable for nochildren folders -#: mail/em-folder-tree.c:2513 +#: mail/em-folder-tree.c:2568 msgid "_New Folder..." msgstr "_New Folder..." -#: mail/em-folder-tree.c:2516 +#: mail/em-folder-tree.c:2571 msgid "_Rename" msgstr "_Rename" -#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27 +#: mail/em-folder-tree.c:2574 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:741 mail/em-popup.c:688 +#: mail/em-folder-view.c:775 mail/em-popup.c:688 msgid "_Edit as New Message..." msgstr "_Edit as New Message..." -#: mail/em-folder-view.c:743 +#: mail/em-folder-view.c:777 msgid "_Print" msgstr "_Print" -#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126 +#: mail/em-folder-view.c:780 ui/evolution-mail-message.xml.h:126 msgid "_Reply to Sender" msgstr "_Reply to Sender" -#: mail/em-folder-view.c:747 mail/em-popup.c:808 +#: mail/em-folder-view.c:781 mail/em-popup.c:808 #: ui/evolution-mail-message.xml.h:88 msgid "Reply to _List" msgstr "Reply to _List" -#: mail/em-folder-view.c:748 mail/em-popup.c:809 +#: mail/em-folder-view.c:782 mail/em-popup.c:809 #: ui/evolution-mail-message.xml.h:87 msgid "Reply to _All" msgstr "Reply to _All" -#: mail/em-folder-view.c:749 mail/em-popup.c:811 +#: mail/em-folder-view.c:783 mail/em-popup.c:811 #: ui/evolution-mail-message.xml.h:113 msgid "_Forward" msgstr "_Forward" -#: mail/em-folder-view.c:752 +#: mail/em-folder-view.c:786 msgid "Follo_w Up..." msgstr "Follo_w Up..." -#: mail/em-folder-view.c:753 +#: mail/em-folder-view.c:787 msgid "Fla_g Completed" msgstr "Fla_g Completed" -#: mail/em-folder-view.c:754 +#: mail/em-folder-view.c:788 msgid "Cl_ear Flag" msgstr "Cl_ear Flag" -#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50 +#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:50 msgid "Mar_k as Read" msgstr "Mar_k as Read" -#: mail/em-folder-view.c:758 +#: mail/em-folder-view.c:792 msgid "Mark as _Unread" msgstr "Mark as _Unread" -#: mail/em-folder-view.c:759 +#: mail/em-folder-view.c:793 msgid "Mark as _Important" msgstr "Mark as _Important" -#: mail/em-folder-view.c:760 +#: mail/em-folder-view.c:794 msgid "_Mark as Unimportant" msgstr "_Mark as Unimportant" -#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54 +#: mail/em-folder-view.c:795 ui/evolution-mail-message.xml.h:54 msgid "Mark as _Junk" msgstr "Mark as _Junk" -#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55 +#: mail/em-folder-view.c:796 ui/evolution-mail-message.xml.h:55 msgid "Mark as _Not Junk" msgstr "Mark as _Not Junk" -#: mail/em-folder-view.c:766 +#: mail/em-folder-view.c:800 msgid "U_ndelete" msgstr "U_ndelete" -#: mail/em-folder-view.c:769 +#: mail/em-folder-view.c:803 msgid "Mo_ve to Folder..." msgstr "Mo_ve to Folder..." -#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32 +#: mail/em-folder-view.c:804 ui/evolution-addressbook.xml.h:32 msgid "_Copy to Folder..." msgstr "_Copy to Folder..." -#: mail/em-folder-view.c:778 +#: mail/em-folder-view.c:812 msgid "Add Sender to Address_book" msgstr "Add Sender to Address_book" -#: mail/em-folder-view.c:781 +#: mail/em-folder-view.c:815 msgid "Appl_y Filters" msgstr "Appl_y Filters" -#: mail/em-folder-view.c:782 +#: mail/em-folder-view.c:816 msgid "F_ilter Junk" msgstr "F_ilter Junk" -#: mail/em-folder-view.c:785 +#: mail/em-folder-view.c:819 msgid "Crea_te Rule From Message" msgstr "Crea_te Rule From Message" -#: mail/em-folder-view.c:786 +#: mail/em-folder-view.c:820 msgid "VFolder on _Subject" msgstr "VFolder on _Subject" -#: mail/em-folder-view.c:787 +#: mail/em-folder-view.c:821 msgid "VFolder on Se_nder" msgstr "VFolder on Se_nder" -#: mail/em-folder-view.c:788 +#: mail/em-folder-view.c:822 msgid "VFolder on _Recipients" msgstr "VFolder on _Recipients" -#: mail/em-folder-view.c:789 +#: mail/em-folder-view.c:823 msgid "VFolder on Mailing _List" msgstr "VFolder on Mailing _List" -#: mail/em-folder-view.c:791 +#: mail/em-folder-view.c:825 msgid "VFolder on Thread" msgstr "VFolder on Thread" -#: mail/em-folder-view.c:795 +#: mail/em-folder-view.c:829 msgid "Filter on Sub_ject" msgstr "Filter on Sub_ject" -#: mail/em-folder-view.c:796 +#: mail/em-folder-view.c:830 msgid "Filter on Sen_der" msgstr "Filter on Sen_der" -#: mail/em-folder-view.c:797 +#: mail/em-folder-view.c:831 msgid "Filter on Re_cipients" msgstr "Filter on Re_cipients" -#: mail/em-folder-view.c:798 +#: mail/em-folder-view.c:832 msgid "Filter on _Mailing List" msgstr "Filter on _Mailing List" -#: mail/em-folder-view.c:800 +#: mail/em-folder-view.c:834 msgid "Filter on Thread" msgstr "Filter on Thread" #. default charset used in mail view -#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621 +#: mail/em-folder-view.c:1617 mail/em-folder-view.c:1655 #: mail/mail-config.glade.h:66 msgid "Default" msgstr "Default" -#: mail/em-folder-view.c:1657 +#: mail/em-folder-view.c:1693 msgid "Print Message" msgstr "Print Message" -#: mail/em-folder-view.c:1904 +#: mail/em-folder-view.c:1942 msgid "_Copy Link Location" msgstr "_Copy Link Location" -#: mail/em-folder-view.c:2168 +#: mail/em-folder-view.c:2201 #, c-format msgid "Click to mail %s" msgstr "Click to mail %s" @@ -12985,31 +12987,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:741 +#: mail/em-format-html-display.c:754 msgid "_View Certificate" msgstr "_View Certificate" -#: mail/em-format-html-display.c:746 +#: mail/em-format-html-display.c:769 msgid "This certificate is not viewable" msgstr "This certificate is not viewable" -#: mail/em-format-html-display.c:979 +#: mail/em-format-html-display.c:1001 msgid "Completed on %B %d, %Y, %l:%M %p" msgstr "Completed on %d %B, %Y, %l:%M %p" -#: mail/em-format-html-display.c:987 +#: mail/em-format-html-display.c:1009 msgid "Overdue:" msgstr "Overdue:" -#: mail/em-format-html-display.c:990 +#: mail/em-format-html-display.c:1012 msgid "by %B %d, %Y, %l:%M %p" msgstr "by %d %B, %Y, %l:%M %p" -#: mail/em-format-html-display.c:1060 +#: mail/em-format-html-display.c:1082 msgid "_View Inline" msgstr "_View Inline" -#: mail/em-format-html-display.c:1061 +#: mail/em-format-html-display.c:1083 msgid "_Hide" msgstr "_Hide" @@ -13084,7 +13086,7 @@ msgstr "Bcc" #. pseudo-header #: mail/em-format-html.c:1542 mail/em-format-quote.c:308 -#: mail/em-mailer-prefs.c:771 +#: mail/em-mailer-prefs.c:918 msgid "Mailer" msgstr "Mailer" @@ -13167,7 +13169,7 @@ msgstr "Once per week" msgid "Once per month" msgstr "Once per month" -#: mail/em-migrate.c:1079 +#: mail/em-migrate.c:1080 msgid "" "The location and hierarchy of the Evolution mailbox folders has changed " "since Evolution 1.x.\n" @@ -13179,22 +13181,22 @@ msgstr "" "\n" "Please be patient while Evolution migrates your folders..." -#: mail/em-migrate.c:1845 mail/em-migrate.c:1860 +#: mail/em-migrate.c:1935 mail/em-migrate.c:1950 #, c-format msgid "Failed to migrate pop3 uid caches: %s" msgstr "Failed to migrate pop3 uid caches: %s" -#: mail/em-migrate.c:1948 mail/em-migrate.c:2049 +#: mail/em-migrate.c:2038 mail/em-migrate.c:2139 #, c-format msgid "Failed to migrate folder expand state: %s" msgstr "Failed to migrate folder expand state: %s" -#: mail/em-migrate.c:2173 mail/em-migrate.c:2345 +#: mail/em-migrate.c:2263 mail/em-migrate.c:2435 #, c-format msgid "Failed to create directory `%s': %s" msgstr "Failed to create directory `%s': %s" -#: mail/em-migrate.c:2185 +#: mail/em-migrate.c:2275 #, c-format msgid "Failed to open store for `%s': %s" msgstr "Failed to open store for `%s': %s" @@ -13553,8 +13555,8 @@ msgid "Mark citations in the message \"Preview\"." msgstr "Mark citations in the message \"Preview\"." #: mail/evolution-mail.schemas.in.in.h:45 -msgid "Message Window default hight" -msgstr "Message Window default hight" +msgid "Message Window default height" +msgstr "Message Window default height" #: mail/evolution-mail.schemas.in.in.h:46 msgid "Message Window default width" @@ -13998,15 +14000,15 @@ msgstr "" msgid "Evolution is importing your old Pine data" msgstr "Evolution is importing your old Pine data" -#: mail/importers/pine-importer.c:313 +#: mail/importers/pine-importer.c:314 msgid "Importing Pine data" msgstr "Importing Pine data" -#: mail/importers/pine-importer.c:478 +#: mail/importers/pine-importer.c:479 msgid "Addressbook" msgstr "Addressbook" -#: mail/importers/pine-importer.c:497 +#: mail/importers/pine-importer.c:498 msgid "" "Evolution has found Pine mail files.\n" "Would you like to import them into Evolution?" @@ -14014,7 +14016,7 @@ msgstr "" "Evolution has found Pine mail files.\n" "Would you like to import them into Evolution?" -#: mail/importers/pine-importer.c:505 +#: mail/importers/pine-importer.c:506 msgid "Pine" msgstr "Pine" @@ -14039,7 +14041,7 @@ msgstr "User_name:" msgid "_Path:" msgstr "_Path:" -#: mail/mail-account-gui.c:2095 +#: mail/mail-account-gui.c:2119 msgid "You may not create two accounts with the same name." msgstr "You may not create two accounts with the same name." @@ -14087,35 +14089,41 @@ msgstr "" " '%s'\n" "And have been updated." -#: mail/mail-component.c:519 +#. Format of text for component information area +#: mail/mail-component.c:462 +#, c-format +msgid "%d total, %d unread" +msgstr "%d total, %d unread" + +#: mail/mail-component.c:552 msgid "You have unsent messages, do you wish to quit anyway?" msgstr "You have unsent messages, do you wish to quit anyway?" -#: mail/mail-component.c:587 +#: mail/mail-component.c:620 msgid "New Mail Message" msgstr "New Mail Message" -#: mail/mail-component.c:588 +#: mail/mail-component.c:621 msgid "_Mail Message" msgstr "_Mail Message" -#: mail/mail-component.c:589 +#: mail/mail-component.c:622 msgid "Compose a new mail message" msgstr "Compose a new mail message" -#: mail/mail-component.c:594 +#: mail/mail-component.c:628 msgid "New Mail Folder" msgstr "New Mail Folder" -#: mail/mail-component.c:595 +#: mail/mail-component.c:629 msgid "Mail _Folder" msgstr "Mail _Folder" -#: mail/mail-component.c:596 +#: mail/mail-component.c:630 msgid "Create a new mail folder" msgstr "Create a new mail folder" -#: mail/mail-component.c:760 +#: mail/mail-component.c:793 msgid "URI of the mail source that the view will display" msgstr "URI of the mail source that the view will display" @@ -14180,11 +14188,11 @@ msgstr "" "name for this account in the space below. This name will be used for display " "purposes only." -#: mail/mail-config.c:898 +#: mail/mail-config.c:887 msgid "Checking Service" msgstr "Checking Service" -#: mail/mail-config.c:976 mail/mail-config.c:980 +#: mail/mail-config.c:965 mail/mail-config.c:969 msgid "Connecting to server..." msgstr "Connecting to server..." @@ -14787,18 +14795,14 @@ msgid "_Use the same fonts as other applications" msgstr "_Use the same fonts as other applications" #: mail/mail-config.glade.h:180 -msgid "_minute(s)" -msgstr "_minute(s)" - -#: mail/mail-config.glade.h:181 msgid "color" msgstr "colour" -#: mail/mail-config.glade.h:182 +#: mail/mail-config.glade.h:181 msgid "description" msgstr "description" -#: mail/mail-folder-cache.c:796 +#: mail/mail-folder-cache.c:786 #, c-format msgid "Pinging %s" msgstr "Pinging %s" @@ -14885,77 +14889,77 @@ msgstr "Copying messages to %s" msgid "Scanning folders in \"%s\"" msgstr "Scanning folders in \"%s\"" -#: mail/mail-ops.c:1190 +#: mail/mail-ops.c:1123 msgid "Forwarded messages" msgstr "Forwarded messages" -#: mail/mail-ops.c:1233 +#: mail/mail-ops.c:1166 #, c-format msgid "Opening folder %s" msgstr "Opening folder %s" -#: mail/mail-ops.c:1305 +#: mail/mail-ops.c:1238 #, c-format msgid "Opening store %s" msgstr "Opening store %s" -#: mail/mail-ops.c:1383 +#: mail/mail-ops.c:1316 #, c-format msgid "Removing folder %s" msgstr "Removing folder %s" -#: mail/mail-ops.c:1477 +#: mail/mail-ops.c:1410 #, c-format msgid "Storing folder '%s'" msgstr "Storing folder '%s'" -#: mail/mail-ops.c:1542 +#: mail/mail-ops.c:1475 #, c-format msgid "Expunging and storing account '%s'" msgstr "Expunging and storing account '%s'" -#: mail/mail-ops.c:1543 +#: mail/mail-ops.c:1476 #, c-format msgid "Storing account '%s'" msgstr "Storing account '%s'" -#: mail/mail-ops.c:1598 +#: mail/mail-ops.c:1531 msgid "Refreshing folder" msgstr "Refreshing folder" -#: mail/mail-ops.c:1634 mail/mail-ops.c:1685 +#: mail/mail-ops.c:1567 mail/mail-ops.c:1618 msgid "Expunging folder" msgstr "Expunging folder" -#: mail/mail-ops.c:1682 +#: mail/mail-ops.c:1615 #, c-format msgid "Emptying trash in '%s'" msgstr "Emptying trash in '%s'" -#: mail/mail-ops.c:1683 +#: mail/mail-ops.c:1616 msgid "Local Folders" msgstr "Local Folders" -#: mail/mail-ops.c:1766 +#: mail/mail-ops.c:1699 #, c-format msgid "Retrieving message %s" msgstr "Retrieving message %s" -#: mail/mail-ops.c:1838 +#: mail/mail-ops.c:1771 #, c-format msgid "Retrieving %d message" msgid_plural "Retrieving %d messages" msgstr[0] "Retrieving %d message" msgstr[1] "Retreiving %d messages" -#: mail/mail-ops.c:1924 +#: mail/mail-ops.c:1857 #, c-format msgid "Saving %d message" msgid_plural "Saving %d messsages" msgstr[0] "Saving %d message" msgstr[1] "Saving %d messages" -#: mail/mail-ops.c:1974 +#: mail/mail-ops.c:1907 #, c-format msgid "" "Unable to create output file: %s\n" @@ -14964,7 +14968,7 @@ msgstr "" "Unable to create output file: %s\n" " %s" -#: mail/mail-ops.c:2002 +#: mail/mail-ops.c:1935 #, c-format msgid "" "Error saving messages to: %s:\n" @@ -14973,11 +14977,11 @@ msgstr "" "Error saving messages to: %s:\n" " %s" -#: mail/mail-ops.c:2073 +#: mail/mail-ops.c:2006 msgid "Saving attachment" msgstr "Saving attachment" -#: mail/mail-ops.c:2090 +#: mail/mail-ops.c:2023 #, c-format msgid "" "Cannot create output file: %s:\n" @@ -14986,17 +14990,17 @@ msgstr "" "Cannot create output file: %s:\n" " %s" -#: mail/mail-ops.c:2120 +#: mail/mail-ops.c:2053 #, c-format msgid "Could not write data: %s" msgstr "Could not write data: %s" -#: mail/mail-ops.c:2268 +#: mail/mail-ops.c:2201 #, c-format msgid "Disconnecting from %s" msgstr "Disconnecting from %s" -#: mail/mail-ops.c:2268 +#: mail/mail-ops.c:2201 #, c-format msgid "Reconnecting to %s" msgstr "Reconnecting to %s" @@ -15180,67 +15184,67 @@ msgstr "Trying to edit a vfolder '%s' which doesn't exist." msgid "New VFolder" msgstr "New VFolder" -#: mail/message-list.c:935 +#: mail/message-list.c:933 msgid "Unseen" msgstr "Unseen" -#: mail/message-list.c:936 +#: mail/message-list.c:934 msgid "Seen" msgstr "Seen" -#: mail/message-list.c:937 +#: mail/message-list.c:935 msgid "Answered" msgstr "Answered" -#: mail/message-list.c:938 +#: mail/message-list.c:936 msgid "Multiple Unseen Messages" msgstr "Multiple Unseen Messages" -#: mail/message-list.c:939 +#: mail/message-list.c:937 msgid "Multiple Messages" msgstr "Multiple Messages" -#: mail/message-list.c:943 +#: mail/message-list.c:941 msgid "Lowest" msgstr "Lowest" -#: mail/message-list.c:944 +#: mail/message-list.c:942 msgid "Lower" msgstr "Lower" -#: mail/message-list.c:948 +#: mail/message-list.c:946 msgid "Higher" msgstr "Higher" -#: mail/message-list.c:949 +#: mail/message-list.c:947 msgid "Highest" msgstr "Highest" -#: mail/message-list.c:1270 +#: mail/message-list.c:1268 msgid "?" msgstr "?" -#: mail/message-list.c:1277 +#: mail/message-list.c:1275 msgid "Today %l:%M %p" msgstr "Today %l:%M %p" -#: mail/message-list.c:1286 +#: mail/message-list.c:1284 msgid "Yesterday %l:%M %p" msgstr "Yesterday %l:%M %p" -#: mail/message-list.c:1298 +#: mail/message-list.c:1296 msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: mail/message-list.c:1306 +#: mail/message-list.c:1304 msgid "%b %d %l:%M %p" msgstr "%d %b %l:%M %p" -#: mail/message-list.c:1308 +#: mail/message-list.c:1306 msgid "%b %d %Y" msgstr "%d %b %Y" -#: mail/message-list.c:3124 +#: mail/message-list.c:3103 msgid "Generating message list" msgstr "Generating message list" @@ -15474,40 +15478,6 @@ msgstr "mail" msgid "Brought to you by" msgstr "Brought to you by" -#: shell/e-shell-config-autocompletion.c:110 -msgid "Extra Completion folders" -msgstr "Extra Completion folders" - -#: shell/e-shell-config-default-folders.c:149 -msgid "Select Default Folder" -msgstr "Select Default Folder" - -#: shell/e-shell-config-folder-settings.c:70 -msgid "Default Folders" -msgstr "Default Folders" - -#: shell/e-shell-config-folder-settings.c:73 -msgid "Offline Folders" -msgstr "Offline Folders" - -#: shell/e-shell-config-folder-settings.c:76 -msgid "Autocompletion Folders" -msgstr "Autocompletion Folders" - -#: shell/e-shell-folder-creation-dialog.c:137 -#, c-format -msgid "" -"Cannot create the specified folder:\n" -"%s" -msgstr "" -"Cannot create the specified folder:\n" -"%s" - -#: shell/e-shell-folder-creation-dialog.c:180 -#, c-format -msgid "The specified folder name is not valid: %s" -msgstr "The specified folder name is not valid: %s" - #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593 msgid "(Untitled)" msgstr "(Untitled)" @@ -15653,36 +15623,6 @@ msgstr "Closing connections..." msgid "Evolution Settings" msgstr "Evolution Settings" -#. It would be nice to insensitivize the OK button appropriately -#. instead of doing this, but unfortunately we can't do this for the -#. Bonobo control. -#: shell/e-shell-shared-folder-picker-dialog.c:281 -msgid "Please select a user." -msgstr "Please select a user." - -#: shell/e-shell-shared-folder-picker-dialog.c:387 -msgid "Opening Folder" -msgstr "Opening Folder" - -#: shell/e-shell-shared-folder-picker-dialog.c:393 -#, c-format -msgid "Opening Folder \"%s\"" -msgstr "Opening Folder \"%s\"" - -#: shell/e-shell-shared-folder-picker-dialog.c:398 -#, c-format -msgid "in \"%s\" ..." -msgstr "in \"%s\" ..." - -#: shell/e-shell-shared-folder-picker-dialog.c:482 -#, c-format -msgid "Could not open shared folder: %s." -msgstr "Could not open shared folder: %s." - -#: shell/e-shell-shared-folder-picker-dialog.c:535 -msgid "Cannot find the specified shared folder." -msgstr "Cannot find the specified shared folder." - #: shell/e-shell-startup-wizard.c:570 msgid "Starting import" msgstr "Starting import" @@ -15746,7 +15686,7 @@ msgstr "About Ximian Evolution" msgid "_Work Online" msgstr "_Work Online" -#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37 +#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36 msgid "_Work Offline" msgstr "_Work Offline" @@ -15770,7 +15710,7 @@ msgid "" msgstr "" "Ximian Evolution is currently offline. Click on this button to work online." -#: shell/e-shell.c:537 +#: shell/e-shell.c:536 #, c-format msgid "" "Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n" @@ -15781,19 +15721,19 @@ msgstr "" "The data hasn't been deleted, but it will not be seen by this version of " "Evolution.\n" -#: shell/e-shell.c:1063 +#: shell/e-shell.c:1081 msgid "Invalid arguments" msgstr "Invalid arguments" -#: shell/e-shell.c:1065 +#: shell/e-shell.c:1083 msgid "Cannot register on OAF" msgstr "Cannot register on OAF" -#: shell/e-shell.c:1067 +#: shell/e-shell.c:1085 msgid "Configuration Database not found" msgstr "Configuration Database not found" -#: shell/e-shell.c:1069 +#: shell/e-shell.c:1087 msgid "Generic error" msgstr "Generic error" @@ -15801,8 +15741,7 @@ msgstr "Generic error" msgid "Checkbox" msgstr "Checkbox" -#: shell/e-user-creatable-items-handler.c:601 -#: shell/e-user-creatable-items-handler.c:642 +#: shell/e-user-creatable-items-handler.c:686 msgid "New" msgstr "New" @@ -15867,42 +15806,6 @@ msgstr "Active Connections" msgid "Click OK to close these connections and go offline" msgstr "Click OK to close these connections and go offline" -#: shell/glade/e-shell-config-default-folders.glade.h:1 -msgid "C_alendar:" -msgstr "C_alendar:" - -#: shell/glade/e-shell-config-default-folders.glade.h:2 -msgid "_Contacts:" -msgstr "_Contacts:" - -#: shell/glade/e-shell-config-default-folders.glade.h:3 -msgid "_Mail:" -msgstr "_Mail:" - -#: shell/glade/e-shell-config-default-folders.glade.h:4 -msgid "_Tasks:" -msgstr "_Tasks:" - -#: shell/glade/e-shell-folder-creation-dialog.glade.h:3 -msgid "Folder _type:" -msgstr "Folder _type:" - -#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1 -msgid "Open Other User's Folder" -msgstr "Open Other User's Folder" - -#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2 -msgid "_Account:" -msgstr "_Account:" - -#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3 -msgid "_Folder Name:" -msgstr "_Folder Name:" - -#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4 -msgid "_User:" -msgstr "_User:" - #: shell/glade/evolution-startup-wizard.glade.h:2 msgid "Evolution Setup Assistant" msgstr "Evolution Setup Assistant" @@ -16052,8 +15955,8 @@ msgid "Don't tell me again" msgstr "Don't tell me again" #: shell/main.c:392 -msgid "Cannot access the Ximian Evolution shell." -msgstr "Cannot access the Ximian Evolution shell." +msgid "Cannot register the Ximian Evolution shell." +msgstr "Cannot register the Ximian Evolution shell." #: shell/main.c:401 #, c-format @@ -17851,8 +17754,8 @@ msgid "Change Evolution's settings" msgstr "Change Evolution's settings" #: ui/evolution.xml.h:5 -msgid "Create a new window" -msgstr "Create a new window" +msgid "Create a new window displaying this folder" +msgstr "Create a new window displaying this folder" #: ui/evolution.xml.h:6 msgid "E_xit" @@ -17875,8 +17778,8 @@ msgid "Import data from other programs" msgstr "Import data from other programs" #: ui/evolution.xml.h:12 -msgid "Open a new window" -msgstr "Open a new window" +msgid "New _Window" +msgstr "New _Window" #: ui/evolution.xml.h:13 msgid "Pi_lot Settings..." @@ -17942,10 +17845,6 @@ msgstr "_Quick Reference" msgid "_Send / Receive" msgstr "_Send / Receive" -#: ui/evolution.xml.h:36 -msgid "_Window" -msgstr "_Window" - #: views/addressbook/galview.xml.h:1 msgid "By _Company" msgstr "By _Company" @@ -17967,9 +17866,8 @@ msgid "_Day View" msgstr "_Day View" #: views/calendar/galview.xml.h:3 -#, fuzzy msgid "_List View" -msgstr "Synchronising \"%s\"" +msgstr "_List View" #: views/calendar/galview.xml.h:4 msgid "_Month View" @@ -18004,14 +17902,12 @@ msgid "_Messages" msgstr "_Messages" #: views/tasks/galview.xml.h:1 -#, fuzzy msgid "With _Due Date" -msgstr "Due Date:" +msgstr "With _Due Date" #: views/tasks/galview.xml.h:2 -#, fuzzy msgid "With _Status" -msgstr "Set Status" +msgstr "With _Status" #: views/tasks/galview.xml.h:3 msgid "_Tasks" @@ -18130,9 +18026,8 @@ msgid "Western European" msgstr "Western European" #: widgets/misc/e-charset-picker.c:73 -#, fuzzy msgid "Western European, New" -msgstr "Western European" +msgstr "Western European, New" #: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91 #: widgets/misc/e-charset-picker.c:92 @@ -18296,6 +18191,109 @@ msgstr "%s (...)" msgid "%s (%d%% complete)" msgstr "%s (%d%% complete)" +#~ msgid "New Addressbook Book" +#~ msgstr "New Addressbook Book" + +#~ msgid "_Address Book" +#~ msgstr "_Address Book" + +#~ msgid "Create a new address book" +#~ msgstr "Create a new address book" + +#~ msgid "The view showing when the calendar starts" +#~ msgstr "The view showing when the calendar starts" + +#~ msgid "Enter the password for %s" +#~ msgstr "Enter the password for %s" + +#~ msgid "New task list" +#~ msgstr "New task list" + +#~ msgid "_Task List" +#~ msgstr "_Task List" + +#~ msgid "Create a new task list" +#~ msgstr "Create a new task list" + +#~ msgid "_minute(s)" +#~ msgstr "_minute(s)" + +#~ msgid "Extra Completion folders" +#~ msgstr "Extra Completion folders" + +#~ msgid "Select Default Folder" +#~ msgstr "Select Default Folder" + +#~ msgid "Default Folders" +#~ msgstr "Default Folders" + +#~ msgid "Offline Folders" +#~ msgstr "Offline Folders" + +#~ msgid "Autocompletion Folders" +#~ msgstr "Autocompletion Folders" + +#~ msgid "" +#~ "Cannot create the specified folder:\n" +#~ "%s" +#~ msgstr "" +#~ "Cannot create the specified folder:\n" +#~ "%s" + +#~ msgid "The specified folder name is not valid: %s" +#~ msgstr "The specified folder name is not valid: %s" + +#~ msgid "Please select a user." +#~ msgstr "Please select a user." + +#~ msgid "Opening Folder" +#~ msgstr "Opening Folder" + +#~ msgid "Opening Folder \"%s\"" +#~ msgstr "Opening Folder \"%s\"" + +#~ msgid "in \"%s\" ..." +#~ msgstr "in \"%s\" ..." + +#~ msgid "Could not open shared folder: %s." +#~ msgstr "Could not open shared folder: %s." + +#~ msgid "Cannot find the specified shared folder." +#~ msgstr "Cannot find the specified shared folder." + +#~ msgid "C_alendar:" +#~ msgstr "C_alendar:" + +#~ msgid "_Contacts:" +#~ msgstr "_Contacts:" + +#~ msgid "_Mail:" +#~ msgstr "_Mail:" + +#~ msgid "_Tasks:" +#~ msgstr "_Tasks:" + +#~ msgid "Folder _type:" +#~ msgstr "Folder _type:" + +#~ msgid "Open Other User's Folder" +#~ msgstr "Open Other User's Folder" + +#~ msgid "_Account:" +#~ msgstr "_Account:" + +#~ msgid "_Folder Name:" +#~ msgstr "_Folder Name:" + +#~ msgid "_User:" +#~ msgstr "_User:" + +#~ msgid "Create a new window" +#~ msgstr "Create a new window" + +#~ msgid "Open a new window" +#~ msgstr "Open a new window" + #~ msgid "2:30" #~ msgstr "2:30" |