diff options
| author | JP Rosevear <jpr@ximian.com> | 2003-12-08 09:52:00 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2003-12-08 09:52:00 +0800 |
| commit | f41f003b62ed1307bc2ccc80466b51cae848c02e (patch) | |
| tree | 56562654c9d3ff146f649d5b9a15b0e20a97e6b8 /po/en_GB.po | |
| parent | aaa2bb33507ee09cfe5387a270f5712f4618fc0e (diff) | |
| download | gsoc2013-evolution-f41f003b62ed1307bc2ccc80466b51cae848c02e.tar.gz gsoc2013-evolution-f41f003b62ed1307bc2ccc80466b51cae848c02e.tar.zst gsoc2013-evolution-f41f003b62ed1307bc2ccc80466b51cae848c02e.zip | |
update version reliance
2003-12-07 JP Rosevear <jpr@ximian.com>
* configure.in: update version reliance
svn path=/trunk/; revision=23667
Diffstat (limited to 'po/en_GB.po')
| -rw-r--r-- | po/en_GB.po | 5264 |
1 files changed, 3176 insertions, 2088 deletions
diff --git a/po/en_GB.po b/po/en_GB.po index ac2cd771b5..064b12eba2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: evolution 0.6\n" -"POT-Creation-Date: 2003-11-07 01:11-0500\n" +"POT-Creation-Date: 2003-12-07 17:06-0500\n" "PO-Revision-Date: 2000-10-22 16:19+0100\n" "Last-Translator: Robert Brady <rwb197@zepler.org>\n" "Language-Team: \n" @@ -28,65 +28,202 @@ msgstr "Cannot initialise the Evolution shell." msgid "Could not read pilot's Address application block" msgstr "" -#: addressbook/gui/component/addressbook-config.c:205 -msgid "Failed to connect to LDAP server" -msgstr "" +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1 +#, fuzzy +msgid "Autocompletion" +msgstr "Synchronising \"%s\"" -#: addressbook/gui/component/addressbook-config.c:230 -msgid "Failed to authenticate with LDAP server" +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2 +msgid "Certificates" msgstr "" -#: addressbook/gui/component/addressbook-config.c:258 -msgid "Could not perform query on Root DSE" +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3 +msgid "Configure autocomple here" msgstr "" -#: addressbook/gui/component/addressbook-config.c:681 -msgid "The server responded with no supported search bases" +#. Fix me * +#. can not get name, should be a bug of e-book.Anyway, should set a default name. +#. +#. name = e_book_get_name (book); +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4 +#: addressbook/tools/evolution-addressbook-export-list-folders.c:51 +#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088 +msgid "Contacts" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1192 -msgid "This server does not support LDAPv3 schema information" +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5 +#, fuzzy +msgid "Evolution Addressbook" +msgstr "Cannot initialise the Evolution shell." + +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6 +msgid "Evolution Addressbook address pop-up" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1214 -msgid "Error retrieving schema information" +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7 +msgid "Evolution Addressbook address viewer" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1222 -msgid "Server did not respond with valid schema information" +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8 +msgid "Evolution Addressbook card viewer" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1636 -msgid "Account Name" +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9 +#, fuzzy +msgid "Evolution Addressbook component" +msgstr "Cannot initialise Evolution's mail component." + +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10 +msgid "Evolution Addressbook folder viewer" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1638 -msgid "Server Name" +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11 +#, fuzzy +msgid "Evolution S/Mime Certificate Management Control" +msgstr "Cannot initialise Evolution's mail summary component." + +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12 +#: shell/GNOME_Evolution_Shell.server.in.in.h:3 +#, fuzzy +msgid "Evolution folder settings configuration control" +msgstr "Cannot initialise Evolution's mail component." + +#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13 +msgid "Manager your S/Mime certificates here" msgstr "" -#: addressbook/gui/component/addressbook-config.c:1675 -msgid "LDAP was not enabled in this build of Evolution" +#: addressbook/gui/component/addressbook-component.c:145 +#: addressbook/gui/component/ldap-config.glade.h:28 +#, fuzzy +msgid "New Addressbook" +msgstr "Cannot initialise the Evolution shell." + +#: addressbook/gui/component/addressbook-component.c:146 +#, fuzzy +msgid "Properties..." +msgstr "Synchronising \"%s\"" + +#: addressbook/gui/component/addressbook-component.c:147 +#: addressbook/gui/widgets/e-addressbook-view.c:910 +#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403 +#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236 +#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4 +#: ui/evolution-contact-editor.xml.h:3 +#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24 +msgid "Delete" msgstr "" -#: addressbook/gui/component/addressbook-storage.c:178 +#: addressbook/gui/component/addressbook-component.c:148 +#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401 +#, fuzzy +msgid "Rename" +msgstr "Synchronising \"%s\"" + +#: addressbook/gui/component/addressbook-component.c:217 #, fuzzy -msgid "Other Contacts" +msgid "New Contact" msgstr "Organisation:" -#: addressbook/gui/component/addressbook.c:494 +#: addressbook/gui/component/addressbook-component.c:218 +#, fuzzy +msgid "_Contact" +msgstr "Organisation:" + +#: addressbook/gui/component/addressbook-component.c:219 +#, fuzzy +msgid "Create a new contact" +msgstr "Synchronising \"%s\"" + +#: addressbook/gui/component/addressbook-component.c:224 +#, fuzzy +msgid "New Contact List" +msgstr "Organisation:" + +#: addressbook/gui/component/addressbook-component.c:225 +#, fuzzy +msgid "Contact _List" +msgstr "Organisation:" + +#: addressbook/gui/component/addressbook-component.c:226 +#, fuzzy +msgid "Create a new contact list" +msgstr "Synchronising \"%s\"" + +#: addressbook/gui/component/addressbook-component.c:375 +#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764 +msgid "On This Computer" +msgstr "" + +#. orange +#: addressbook/gui/component/addressbook-component.c:385 +#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123 +#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772 +#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86 +#: shell/e-config-upgrade.c:1456 +msgid "Personal" +msgstr "" + +#. red +#: addressbook/gui/component/addressbook-component.c:392 +#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122 +#: mail/mail-config.c:64 mail/mail-config.glade.h:133 +#: shell/e-config-upgrade.c:1455 +msgid "Work" +msgstr "" + +#. Create the LDAP source group +#: addressbook/gui/component/addressbook-component.c:400 +msgid "On LDAP Servers" +msgstr "" + +#. FIXME: parent +#: addressbook/gui/component/addressbook-config.c:244 +#, fuzzy +msgid "Could not create a directory for the new addressbook." +msgstr "Cannot initialise Evolution's mail component." + +#: addressbook/gui/component/addressbook-config.c:416 +msgid "Failed to connect to LDAP server" +msgstr "" + +#: addressbook/gui/component/addressbook-config.c:440 +msgid "Failed to authenticate with LDAP server" +msgstr "" + +#: addressbook/gui/component/addressbook-config.c:468 +msgid "Could not perform query on Root DSE" +msgstr "" + +#: addressbook/gui/component/addressbook-config.c:792 +msgid "The server responded with no supported search bases" +msgstr "" + +#: addressbook/gui/component/addressbook-config.c:1203 +msgid "This server does not support LDAPv3 schema information" +msgstr "" + +#: addressbook/gui/component/addressbook-config.c:1225 +msgid "Error retrieving schema information" +msgstr "" + +#: addressbook/gui/component/addressbook-config.c:1233 +msgid "Server did not respond with valid schema information" +msgstr "" + +#: addressbook/gui/component/addressbook.c:500 msgid "" "We were unable to open this addressbook. Please check that the\n" "path exists and that you have permission to access it." msgstr "" -#: addressbook/gui/component/addressbook.c:504 +#: addressbook/gui/component/addressbook.c:507 msgid "" "We were unable to open this addressbook. This either\n" "means you have entered an incorrect URI, or the LDAP server\n" "is unreachable." msgstr "" -#: addressbook/gui/component/addressbook.c:509 +#: addressbook/gui/component/addressbook.c:512 msgid "" "This version of Evolution does not have LDAP support\n" "compiled in to it. If you want to use LDAP in Evolution\n" @@ -94,7 +231,7 @@ msgid "" "retrieving OpenLDAP from the link below.\n" msgstr "" -#: addressbook/gui/component/addressbook.c:519 +#: addressbook/gui/component/addressbook.c:521 msgid "" "We were unable to open this addressbook. This either\n" "means you have entered an incorrect URI, or the server\n" @@ -105,45 +242,44 @@ msgstr "" msgid "Unable to open addressbook" msgstr "" -#: addressbook/gui/component/addressbook.c:599 +#: addressbook/gui/component/addressbook.c:600 msgid "Accessing LDAP Server anonymously" msgstr "" -#: addressbook/gui/component/addressbook.c:644 +#: addressbook/gui/component/addressbook.c:670 #, fuzzy msgid "Failed to authenticate.\n" msgstr "Synchronising \"%s\"" -#: addressbook/gui/component/addressbook.c:652 -#: addressbook/gui/component/addressbook.c:655 +#: addressbook/gui/component/addressbook.c:676 #, c-format msgid "%sEnter password for %s (user %s)" msgstr "" -#: addressbook/gui/component/addressbook.c:780 +#: addressbook/gui/component/addressbook.c:802 msgid "Name begins with" msgstr "" -#: addressbook/gui/component/addressbook.c:781 +#: addressbook/gui/component/addressbook.c:803 msgid "Email begins with" msgstr "" -#: addressbook/gui/component/addressbook.c:782 -#: calendar/gui/cal-search-bar.c:53 +#: addressbook/gui/component/addressbook.c:804 +#: calendar/gui/cal-search-bar.c:52 msgid "Category is" msgstr "" #. We attach subitems below -#: addressbook/gui/component/addressbook.c:783 -#: calendar/gui/cal-search-bar.c:49 +#: addressbook/gui/component/addressbook.c:805 +#: calendar/gui/cal-search-bar.c:48 msgid "Any field contains" msgstr "" -#: addressbook/gui/component/addressbook.c:784 +#: addressbook/gui/component/addressbook.c:806 msgid "Advanced..." msgstr "" -#: addressbook/gui/component/addressbook.c:930 +#: addressbook/gui/component/addressbook.c:927 msgid "" "More cards matched this query than either the server is \n" "configured to return or Evolution is configured to display.\n" @@ -151,7 +287,7 @@ msgid "" "the directory server preferences for this addressbook." msgstr "" -#: addressbook/gui/component/addressbook.c:936 +#: addressbook/gui/component/addressbook.c:933 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" @@ -159,89 +295,40 @@ msgid "" "preferences for this addressbook." msgstr "" -#: addressbook/gui/component/addressbook.c:942 +#: addressbook/gui/component/addressbook.c:939 msgid "The backend for this addressbook was unable to parse this query." msgstr "" -#: addressbook/gui/component/addressbook.c:945 +#: addressbook/gui/component/addressbook.c:942 msgid "The backend for this addressbook refused to perform this query." msgstr "" -#: addressbook/gui/component/addressbook.c:948 +#: addressbook/gui/component/addressbook.c:945 msgid "This query did not complete successfully." msgstr "" #. All, unmatched, separator -#: addressbook/gui/component/addressbook.c:1021 -#: calendar/gui/cal-search-bar.c:354 +#: addressbook/gui/component/addressbook.c:982 +#: calendar/gui/cal-search-bar.c:353 msgid "Any Category" msgstr "" -#: addressbook/gui/component/addressbook.c:1102 -msgid "URI of the contacts that the control will display" -msgstr "" - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1 -msgid "Certificates" -msgstr "" - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2 -msgid "Configure access to LDAP directory servers here" -msgstr "" - -#. Fix me * -#. can not get name, should be a bug of e-book.Anyway, should set a default name. -#. -#. name = e_book_get_name (book); -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3 -#: addressbook/tools/evolution-addressbook-export-list-folders.c:51 -#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178 -#: shell/e-shortcuts.c:1087 -msgid "Contacts" -msgstr "" - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4 -msgid "Directory Servers" -msgstr "" - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5 -#, fuzzy -msgid "Evolution Addressbook" -msgstr "Cannot initialise the Evolution shell." - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6 -#, fuzzy -msgid "Evolution Addressbook LDAP Configuration Control" -msgstr "Cannot initialise Evolution's mail component." - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7 -msgid "Evolution Addressbook address pop-up" -msgstr "" - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8 -msgid "Evolution Addressbook address viewer" +#: addressbook/gui/component/addressbook.c:1063 +msgid "UID of the contacts source that the view will display" msgstr "" -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9 -msgid "Evolution Addressbook card viewer" +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1 +msgid "EFolderList xml for the list of completion uris" msgstr "" -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10 -#, fuzzy -msgid "Evolution Addressbook component" -msgstr "Cannot initialise Evolution's mail component." - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11 -msgid "Evolution Addressbook folder viewer" +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2 +msgid "" +"The number of characters that must be typed before evolution will attempt to " +"autocomplete" msgstr "" -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12 -#, fuzzy -msgid "Evolution S/Mime Certificate Management Control" -msgstr "Cannot initialise Evolution's mail summary component." - -#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13 -msgid "Manager your S/Mime certificates here" +#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3 +msgid "URI for the folder last used in the select names dialog" msgstr "" #: addressbook/gui/component/ldap-config.glade.h:1 @@ -264,6 +351,7 @@ msgstr "" #: calendar/gui/dialogs/event-page.glade.h:1 #: calendar/gui/dialogs/meeting-page.glade.h:1 #: calendar/gui/dialogs/new-calendar.glade.h:1 +#: calendar/gui/dialogs/new-task-list.glade.h:1 #: calendar/gui/dialogs/task-page.glade.h:1 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1 @@ -297,8 +385,9 @@ msgid "636" msgstr "" #: addressbook/gui/component/ldap-config.glade.h:11 -msgid "Add LDAP Server" -msgstr "" +#, fuzzy +msgid "Addressbook Creation Assistant" +msgstr "Cannot initialise the Evolution shell." #: addressbook/gui/component/ldap-config.glade.h:12 msgid "Addressbook Sources" @@ -315,57 +404,55 @@ msgstr "" #: addressbook/gui/component/ldap-config.glade.h:15 msgid "" -"Congratulations, you are finished setting up this LDAP server. You\n" -"are now ready to access this directory.\n" +"Congratulations, you are finished setting up this addressbook.\n" "\n" "Please click the \"Finish\" button to save the settings you have entered " "here." msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:19 +#: addressbook/gui/component/ldap-config.glade.h:18 #, fuzzy msgid "Connecting" msgstr "Synchronise \"%s\"" -#: addressbook/gui/component/ldap-config.glade.h:20 +#: addressbook/gui/component/ldap-config.glade.h:19 msgid "Distinguished _name:" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:21 +#: addressbook/gui/component/ldap-config.glade.h:20 msgid "Edit LDAP Server" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:22 +#: addressbook/gui/component/ldap-config.glade.h:21 #, fuzzy msgid "Email address:" msgstr "Synchronising \"%s\"" -#: addressbook/gui/component/ldap-config.glade.h:23 +#: addressbook/gui/component/ldap-config.glade.h:22 msgid "Evolution will use this DN to authenticate you with the server" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:24 +#: addressbook/gui/component/ldap-config.glade.h:23 msgid "" "Evolution will use this email address to authenticate you with the server" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:25 +#: addressbook/gui/component/ldap-config.glade.h:24 msgid "Finished" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:26 +#: addressbook/gui/component/ldap-config.glade.h:25 #: addressbook/gui/contact-editor/contact-editor.glade.h:16 -#: smime/gui/smime-ui.glade.h:20 +#: smime/gui/smime-ui.glade.h:27 msgid "General" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:27 -#, fuzzy -msgid "LDAP Configuration Assistant" -msgstr "Cannot initialise the Evolution shell." +#: addressbook/gui/component/ldap-config.glade.h:26 +msgid "Group:" +msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68 -#: mail/mail-config.glade.h:73 +#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68 +#: mail/mail-config.glade.h:76 msgid "Never" msgstr "" @@ -388,8 +475,8 @@ msgid "S_earch scope: " msgstr "" #: addressbook/gui/component/ldap-config.glade.h:34 -#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718 -#: calendar/gui/gnome-cal.c:587 +#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589 +#: calendar/gui/gnome-cal.c:585 msgid "Searching" msgstr "" @@ -434,26 +521,27 @@ msgstr "" #: addressbook/gui/component/ldap-config.glade.h:47 msgid "" -"Specifying a display name is the last required step in configuring an LDAP " -"server." +"Specifying a display name and group is the first step in setting up an " +"addressbook." msgstr "" #: addressbook/gui/component/ldap-config.glade.h:48 -msgid "Step 1: Server Information" +msgid "Step 1: Folder Characteristics" msgstr "" #: addressbook/gui/component/ldap-config.glade.h:49 -#, fuzzy -msgid "Step 2: Connecting to Server" -msgstr "Synchronise \"%s\"" +msgid "Step 2: Server Information" +msgstr "" #: addressbook/gui/component/ldap-config.glade.h:50 -msgid "Step 3: Searching the Directory" -msgstr "" +#, fuzzy +msgid "Step 3: Connecting to Server" +msgstr "Synchronise \"%s\"" #: addressbook/gui/component/ldap-config.glade.h:51 -msgid "Step 4: Display Name" -msgstr "" +#, fuzzy +msgid "Step 4: Searching the Directory" +msgstr "Synchronise \"%s\"" #: addressbook/gui/component/ldap-config.glade.h:52 msgid "Sub" @@ -465,14 +553,6 @@ msgstr "" #: addressbook/gui/component/ldap-config.glade.h:54 msgid "" -"The first step in configuring an LDAP server is to provide its name, and " -"your log in\n" -"information. Please ask your system administrator if you are unsure of this " -"information." -msgstr "" - -#: addressbook/gui/component/ldap-config.glade.h:56 -msgid "" "The options on this page control how many entries should be included in " "your\n" "searches, and how long a search should take. Ask your system administrator " @@ -480,7 +560,7 @@ msgid "" "need to change these options." msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:59 +#: addressbook/gui/component/ldap-config.glade.h:57 msgid "" "The search base is the distinguished name (DN) of the entry where your " "searches will \n" @@ -488,7 +568,7 @@ msgid "" "directory tree." msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:61 +#: addressbook/gui/component/ldap-config.glade.h:59 msgid "" "The search scope defines how deep you would like the search to extend down " "the \n" @@ -498,43 +578,48 @@ msgid "" "your base.\n" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:65 +#: addressbook/gui/component/ldap-config.glade.h:63 msgid "" -"This assistant will help you to access online directory services\n" -"using LDAP (Lightweight Directory Access Protocol) servers. \n" +"This assistant will help you create a new addressbook. \n" "\n" -"Adding a new LDAP server requires some specialized information about the " -"server. Please contact your system administrator if you need help finding " -"this information." +"Depending on the type of addressbook you create, additional\n" +"parameters may be required. Please contact your system\n" +"administrator if you need help finding this information." msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:69 +#: addressbook/gui/component/ldap-config.glade.h:68 msgid "" "This is the full name of your ldap server. For example, \"ldap.mycompany.com" "\"." msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:70 +#: addressbook/gui/component/ldap-config.glade.h:69 msgid "" "This is the maximum number of entries to download. Setting this number to " "be \n" "too large will slow down your addressbook." msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:72 +#: addressbook/gui/component/ldap-config.glade.h:71 msgid "" "This is the method evolution will use to authenticate you. Note that " "setting this to \"Email Address\" requires anonymous access to your ldap " "server." msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:73 +#: addressbook/gui/component/ldap-config.glade.h:72 msgid "" "This is the name for this server that will appear in your Evolution folder " "list.\n" "It is for display purposes only. " msgstr "" +#: addressbook/gui/component/ldap-config.glade.h:74 +msgid "" +"This is the name that will appear in your Evolution folder list. It is for " +"display purposes only. " +msgstr "" + #: addressbook/gui/component/ldap-config.glade.h:75 msgid "" "This is the port on the LDAP server that Evolution will try to connect to. " @@ -560,22 +645,30 @@ msgid "Using email address" msgstr "" #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67 -#: mail/mail-config.glade.h:128 +#: mail/mail-config.glade.h:132 msgid "Whenever Possible" msgstr "" #: addressbook/gui/component/ldap-config.glade.h:83 +msgid "" +"You have decided to configure an LDAP server. The first step in doing this " +"is to provide its name and your\n" +"log in information. Please ask your system administrator if you are unsure " +"of this information." +msgstr "" + +#: addressbook/gui/component/ldap-config.glade.h:85 #, fuzzy msgid "_Display name:" msgstr "Synchronising \"%s\"" -#: addressbook/gui/component/ldap-config.glade.h:84 +#: addressbook/gui/component/ldap-config.glade.h:86 msgid "_Download limit:" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14 -#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33 -#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8 +#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14 +#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33 +#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6 #: ui/evolution-message-composer.xml.h:41 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10 @@ -583,47 +676,45 @@ msgstr "" msgid "_Edit" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:86 +#: addressbook/gui/component/ldap-config.glade.h:88 msgid "_Log in method:" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:87 +#: addressbook/gui/component/ldap-config.glade.h:89 msgid "_Port number:" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:88 +#: addressbook/gui/component/ldap-config.glade.h:90 msgid "_Search base:" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:89 +#: addressbook/gui/component/ldap-config.glade.h:91 msgid "_Server name:" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:90 +#: addressbook/gui/component/ldap-config.glade.h:92 msgid "_Timeout (minutes):" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:91 +#: addressbook/gui/component/ldap-config.glade.h:93 msgid "cards" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:92 +#: addressbook/gui/component/ldap-config.glade.h:94 #, fuzzy msgid "connecting-tab" msgstr "Synchronise \"%s\"" -#: addressbook/gui/component/ldap-config.glade.h:93 +#: addressbook/gui/component/ldap-config.glade.h:95 msgid "general-tab" msgstr "" -#: addressbook/gui/component/ldap-config.glade.h:94 +#: addressbook/gui/component/ldap-config.glade.h:96 msgid "searching-tab" msgstr "" -#: addressbook/gui/component/select-names/e-select-names.etspec.h:1 -#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1 -#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89 -msgid "Name" +#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1 +msgid "Evolution Addressbook name selection interface" msgstr "" #: addressbook/gui/component/select-names/e-select-names-popup.c:205 @@ -631,7 +722,7 @@ msgid "Remove All" msgstr "" #: addressbook/gui/component/select-names/e-select-names-popup.c:212 -#: addressbook/gui/component/select-names/e-select-names.c:691 +#: addressbook/gui/component/select-names/e-select-names.c:694 #: composer/e-msg-composer-attachment-bar.c:444 msgid "Remove" msgstr "" @@ -659,23 +750,21 @@ msgstr "" msgid "Unnamed Contact" msgstr "" +#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1 +#: addressbook/gui/component/select-names/e-select-names.etspec.h:1 +#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89 +msgid "Name" +msgstr "" + #: addressbook/gui/component/select-names/e-select-names-table-model.c:351 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104 msgid "Source" msgstr "" -#: addressbook/gui/component/select-names/e-select-names.c:504 +#: addressbook/gui/component/select-names/e-select-names.c:518 msgid "Select Contacts from Addressbook" msgstr "" -#: addressbook/gui/component/select-names/e-select-names.c:647 -msgid "Find contact in" -msgstr "" - -#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1 -msgid "Evolution Addressbook name selection interface" -msgstr "" - #: addressbook/gui/component/select-names/select-names.glade.h:2 msgid "Find" msgstr "" @@ -751,7 +840,8 @@ msgid "D_epartment:" msgstr "" #: addressbook/gui/contact-editor/contact-editor.glade.h:12 -#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15 +#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1 +#: smime/gui/smime-ui.glade.h:19 msgid "Details" msgstr "" @@ -816,12 +906,12 @@ msgid "_Categories..." msgstr "" #: addressbook/gui/contact-editor/contact-editor.glade.h:29 -#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300 -#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010 -#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681 -#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32 -#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17 -#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104 +#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223 +#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009 +#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501 +#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32 +#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17 +#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110 #: ui/evolution-tasks.xml.h:18 msgid "_Delete" msgstr "" @@ -1950,7 +2040,7 @@ msgid "Esq." msgstr "" #: addressbook/gui/contact-editor/fullname.glade.h:4 -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15 msgid "Full Name" msgstr "" @@ -2044,11 +2134,25 @@ msgstr "" msgid "Save List as VCard" msgstr "" -#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1 +#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1 +msgid "Changed Contact:" +msgstr "" + +#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2 +msgid "Conflicting Contact:" +msgstr "" + #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3 +#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1 msgid "Duplicate Contact Detected" msgstr "" +#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4 +msgid "" +"The changed email or name of this contact already\n" +"exists in this folder. Would you like to add it anyway?" +msgstr "" + #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2 msgid "New Contact:" msgstr "" @@ -2063,20 +2167,6 @@ msgid "" "in this folder. Would you like to add it anyway?" msgstr "" -#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1 -msgid "Changed Contact:" -msgstr "" - -#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2 -msgid "Conflicting Contact:" -msgstr "" - -#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4 -msgid "" -"The changed email or name of this contact already\n" -"exists in this folder. Would you like to add it anyway?" -msgstr "" - #. FIXME: get the toplevel window... #: addressbook/gui/search/e-addressbook-search-dialog.c:116 #: widgets/misc/e-filter-bar.c:148 @@ -2175,9 +2265,9 @@ msgstr "" msgid "Send Message to Contact" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453 +#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8 -#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72 +#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78 #: ui/my-evolution.xml.h:1 msgid "Print" msgstr "" @@ -2201,9 +2291,12 @@ msgstr "Synchronising \"%s\"" msgid "Cut" msgstr "" +#. create the dialog #: addressbook/gui/widgets/e-addressbook-view.c:908 -#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9 -#: ui/evolution-tasks.xml.h:2 +#: calendar/gui/calendar-component.c:429 +#: calendar/gui/dialogs/copy-source-dialog.c:135 +#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2 +#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2 msgid "Copy" msgstr "" @@ -2212,16 +2305,8 @@ msgstr "" msgid "Paste" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.c:910 -#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10 -#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8 -#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3 -#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24 -msgid "Delete" -msgstr "" - #: addressbook/gui/widgets/e-addressbook-view.c:914 -#: calendar/gui/e-cal-view.c:1265 +#: calendar/gui/e-cal-view.c:1192 msgid "Current View" msgstr "" @@ -2234,166 +2319,168 @@ msgid "" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1 -msgid "* Click here to add a contact *" +msgid "Assistant" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2 -msgid "Assistant" +msgid "Assistant Phone" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:3 -msgid "Assistant Phone" +msgid "Business Fax" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:4 -msgid "Business Address" +msgid "Business Phone" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5 -msgid "Business Fax" +msgid "Business Phone 2" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:6 -msgid "Business Phone" +msgid "Callback Phone" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:7 -msgid "Business Phone 2" +msgid "Car Phone" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8 -msgid "Callback Phone" +#: calendar/gui/e-cal-list-view.etspec.h:1 +#: calendar/gui/e-calendar-table.etspec.h:4 +msgid "Categories" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:9 -msgid "Car Phone" -msgstr "" - -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10 msgid "Company Phone" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11 -msgid "Department" -msgstr "" - -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10 #: addressbook/gui/widgets/eab-contact-display.c:216 #: addressbook/gui/widgets/eab-contact-display.c:217 #: addressbook/gui/widgets/eab-contact-display.c:218 -#: addressbook/gui/widgets/eab-contact-display.c:348 +#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769 msgid "Email" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11 #: addressbook/gui/widgets/eab-popup-control.c:460 msgid "Email 2" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12 #: addressbook/gui/widgets/eab-popup-control.c:470 msgid "Email 3" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13 +#, fuzzy +msgid "Family Name" +msgstr "Synchronising \"%s\"" + +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14 msgid "File As" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16 -msgid "Free-busy URL" +#, fuzzy +msgid "Given Name" +msgstr "Synchronising \"%s\"" + +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17 +msgid "Home Fax" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:18 -#: addressbook/gui/widgets/eab-contact-display.c:221 -msgid "Home Address" +msgid "Home Phone" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19 -msgid "Home Fax" +msgid "Home Phone 2" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:20 -msgid "Home Phone" +msgid "ISDN Phone" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:21 -msgid "Home Phone 2" -msgstr "" +#, fuzzy +msgid "Journal" +msgstr "Colours" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22 -msgid "ISDN" -msgstr "" - -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23 msgid "Manager" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23 msgid "Mobile Phone" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24 msgid "Nickname" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25 msgid "Note" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26 msgid "Office" msgstr "" -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28 +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27 msgid "Organization" msgstr "Organisation" +#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28 +msgid "Other Fax" +msgstr "" + #: addressbook/gui/widgets/e-addressbook-view.etspec.h:29 -#: addressbook/gui/widgets/eab-contact-display.c:223 -msgid "Other Address" +msgid "Other Phone" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30 -msgid "Other Fax" +msgid "Pager" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:31 -msgid "Other Phone" +msgid "Primary Phone" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32 -msgid "Pager" +msgid "Radio" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33 -msgid "Primary Phone" +#: calendar/gui/dialogs/meeting-page.etspec.h:9 +#: calendar/gui/e-meeting-list-view.c:256 +#: calendar/gui/e-meeting-time-sel.etspec.h:9 +msgid "Role" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34 -msgid "Profession" +msgid "Spouse" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35 -msgid "Radio" +msgid "TTYTDD" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36 -msgid "Spouse" +msgid "Telex" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:37 -msgid "TTY" +msgid "Title" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38 -msgid "Telex" +msgid "Unit" msgstr "" #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39 -msgid "Title" -msgstr "" - -#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40 msgid "Web Site" msgstr "" @@ -2477,11 +2564,19 @@ msgstr "Synchronising \"%s\"" msgid "Job Title" msgstr "" +#: addressbook/gui/widgets/eab-contact-display.c:221 +msgid "Home Address" +msgstr "" + #: addressbook/gui/widgets/eab-contact-display.c:222 #, fuzzy msgid "Work Address" msgstr "Colours" +#: addressbook/gui/widgets/eab-contact-display.c:223 +msgid "Other Address" +msgstr "" + #: addressbook/gui/widgets/eab-contact-display.c:227 #: addressbook/gui/widgets/eab-contact-display.c:375 msgid "Home page" @@ -2492,163 +2587,160 @@ msgstr "" msgid "Blog" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:45 -#: shell/evolution-shell-component.c:1183 +#: addressbook/gui/widgets/eab-gui-util.c:43 msgid "Success" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:46 +#: addressbook/gui/widgets/eab-gui-util.c:44 #: camel/providers/imap/camel-imap-command.c:306 #: camel/providers/imap/camel-imap-command.c:403 #: camel/providers/pop3/camel-pop3-store.c:536 -#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914 -#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222 +#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011 msgid "Unknown error" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:47 +#: addressbook/gui/widgets/eab-gui-util.c:45 msgid "Repository offline" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587 -#: shell/evolution-shell-component.c:1213 +#: addressbook/gui/widgets/eab-gui-util.c:46 msgid "Permission denied" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:49 +#: addressbook/gui/widgets/eab-gui-util.c:47 msgid "Contact not found" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:50 +#: addressbook/gui/widgets/eab-gui-util.c:48 msgid "Contact ID already exists" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:51 +#: addressbook/gui/widgets/eab-gui-util.c:49 msgid "Protocol not supported" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:52 +#: addressbook/gui/widgets/eab-gui-util.c:50 #: calendar/gui/dialogs/task-details-page.glade.h:3 -#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604 -#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211 -#: calendar/gui/print.c:2321 camel/camel-service.c:734 +#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600 +#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213 +#: calendar/gui/print.c:2320 camel/camel-service.c:734 #: camel/camel-service.c:772 camel/camel-service.c:856 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453 #: camel/providers/pop3/camel-pop3-store.c:530 msgid "Cancelled" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:53 +#: addressbook/gui/widgets/eab-gui-util.c:51 msgid "Authentication Failed" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:54 +#: addressbook/gui/widgets/eab-gui-util.c:52 msgid "Authentication Required" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:55 +#: addressbook/gui/widgets/eab-gui-util.c:53 msgid "TLS not Available" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:56 +#: addressbook/gui/widgets/eab-gui-util.c:54 msgid "Addressbook does not exist" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:57 +#: addressbook/gui/widgets/eab-gui-util.c:55 msgid "Other error" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:84 +#: addressbook/gui/widgets/eab-gui-util.c:82 msgid "Do you want to save changes?" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:86 +#: addressbook/gui/widgets/eab-gui-util.c:84 msgid "_Discard" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:105 +#: addressbook/gui/widgets/eab-gui-util.c:103 msgid "Error adding list" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:105 -#: addressbook/gui/widgets/eab-gui-util.c:459 +#: addressbook/gui/widgets/eab-gui-util.c:103 +#: addressbook/gui/widgets/eab-gui-util.c:457 msgid "Error adding contact" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:114 +#: addressbook/gui/widgets/eab-gui-util.c:112 msgid "Error modifying list" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:114 +#: addressbook/gui/widgets/eab-gui-util.c:112 msgid "Error modifying contact" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:124 +#: addressbook/gui/widgets/eab-gui-util.c:122 msgid "Error removing list" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:124 -#: addressbook/gui/widgets/eab-gui-util.c:417 +#: addressbook/gui/widgets/eab-gui-util.c:122 +#: addressbook/gui/widgets/eab-gui-util.c:415 msgid "Error removing contact" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:206 +#: addressbook/gui/widgets/eab-gui-util.c:204 #, c-format msgid "" "Opening %d contacts will open %d new windows as well.\n" "Do you really want to display all of these contacts?" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:232 +#: addressbook/gui/widgets/eab-gui-util.c:230 #, c-format msgid "" "%s already exists\n" "Do you want to overwrite it?" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:236 +#: addressbook/gui/widgets/eab-gui-util.c:234 msgid "Overwrite" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:272 +#: addressbook/gui/widgets/eab-gui-util.c:270 #, c-format msgid "Error saving %s: %s" msgstr "" #. This is a filename. Translators take note. -#: addressbook/gui/widgets/eab-gui-util.c:309 +#: addressbook/gui/widgets/eab-gui-util.c:307 msgid "card.vcf" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:378 +#: addressbook/gui/widgets/eab-gui-util.c:376 msgid "list" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:514 +#: addressbook/gui/widgets/eab-gui-util.c:513 #, fuzzy msgid "Move contact to" msgstr "Organisation:" -#: addressbook/gui/widgets/eab-gui-util.c:516 +#: addressbook/gui/widgets/eab-gui-util.c:515 #, fuzzy msgid "Copy contact to" msgstr "Organisation:" -#: addressbook/gui/widgets/eab-gui-util.c:519 +#: addressbook/gui/widgets/eab-gui-util.c:518 #, fuzzy msgid "Move contacts to" msgstr "Organisation:" -#: addressbook/gui/widgets/eab-gui-util.c:521 +#: addressbook/gui/widgets/eab-gui-util.c:520 #, fuzzy msgid "Copy contacts to" msgstr "Organisation:" -#: addressbook/gui/widgets/eab-gui-util.c:710 +#: addressbook/gui/widgets/eab-gui-util.c:706 msgid "Multiple VCards" msgstr "" -#: addressbook/gui/widgets/eab-gui-util.c:718 +#: addressbook/gui/widgets/eab-gui-util.c:714 #, c-format msgid "VCard for %s" msgstr "" @@ -2841,7 +2933,7 @@ msgstr "" msgid "Number of columns:" msgstr "" -#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78 +#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81 msgid "Options" msgstr "" @@ -3024,18 +3116,18 @@ msgstr "" msgid "Split Multi-Day Events:" msgstr "" -#: calendar/conduits/calendar/calendar-conduit.c:1349 -#: calendar/conduits/todo/todo-conduit.c:887 +#: calendar/conduits/calendar/calendar-conduit.c:1320 +#: calendar/conduits/todo/todo-conduit.c:857 msgid "Could not start wombat server" msgstr "" -#: calendar/conduits/calendar/calendar-conduit.c:1350 -#: calendar/conduits/todo/todo-conduit.c:888 +#: calendar/conduits/calendar/calendar-conduit.c:1321 +#: calendar/conduits/todo/todo-conduit.c:858 msgid "Could not start wombat" msgstr "" -#: calendar/conduits/calendar/calendar-conduit.c:1465 -#: calendar/conduits/calendar/calendar-conduit.c:1468 +#: calendar/conduits/calendar/calendar-conduit.c:1436 +#: calendar/conduits/calendar/calendar-conduit.c:1439 msgid "Could not read pilot's Calendar application block" msgstr "" @@ -3043,26 +3135,90 @@ msgstr "" msgid "Default Priority:" msgstr "" -#: calendar/conduits/todo/todo-conduit.c:975 -#: calendar/conduits/todo/todo-conduit.c:978 +#: calendar/conduits/todo/todo-conduit.c:945 +#: calendar/conduits/todo/todo-conduit.c:948 msgid "Could not read pilot's ToDo application block" msgstr "" -#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213 +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1 +msgid "Calendar and Tasks" +msgstr "" + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2 +#, fuzzy +msgid "Calendars" +msgstr "Colours" + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3 +msgid "Configure your timezone, Calendar and Task List here " +msgstr "" + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4 +#, fuzzy +msgid "Evolution Calendar and Tasks" +msgstr "Cannot initialise the Evolution shell." + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5 +#, fuzzy +msgid "Evolution Calendar configuration control" +msgstr "Cannot initialise Evolution's mail component." + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6 +msgid "Evolution Calendar scheduling message viewer" +msgstr "" + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7 +#, fuzzy +msgid "Evolution Calendar viewer" +msgstr "Cannot initialise the Evolution shell." + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8 +msgid "Evolution Calendar/Task editor" +msgstr "" + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9 +#, fuzzy +msgid "Evolution Tasks viewer" +msgstr "Cannot initialise the Evolution shell." + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10 +#, fuzzy +msgid "Evolution's Calendar component" +msgstr "Cannot initialise Evolution's mail summary component." + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11 +#, fuzzy +msgid "Evolution's Tasks component" +msgstr "Cannot initialise Evolution's mail component." + +#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 +#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796 +#: calendar/gui/tasks-control.c:486 +#: calendar/importers/icalendar-importer.c:716 +#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087 +msgid "Tasks" +msgstr "" + +#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1 +#, fuzzy +msgid "Evolution Calendar alarm notification service" +msgstr "Cannot initialise Evolution's mail component." + +#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212 #, fuzzy msgid "Starting:" msgstr "Synchronise \"%s\"" -#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215 +#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214 msgid "Ending:" msgstr "" -#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254 +#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253 #, fuzzy msgid "Evolution Alarm" msgstr "Cannot initialise the Evolution shell." -#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347 +#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346 #, c-format msgid "Alarm on %s" msgstr "" @@ -3128,78 +3284,199 @@ msgstr "" msgid "Do not ask me about this program again." msgstr "" -#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1 -#, fuzzy -msgid "Evolution Calendar alarm notification service" -msgstr "Cannot initialise Evolution's mail component." - -#: calendar/gui/alarm-notify/notify-main.c:172 +#: calendar/gui/alarm-notify/notify-main.c:157 msgid "Could not initialize Bonobo" msgstr "Could not initialise Bonobo" -#: calendar/gui/alarm-notify/notify-main.c:175 +#: calendar/gui/alarm-notify/notify-main.c:160 #, fuzzy msgid "Could not initialize gnome-vfs" msgstr "Could not initialise Bonobo" -#: calendar/gui/alarm-notify/notify-main.c:184 +#: calendar/gui/alarm-notify/notify-main.c:169 msgid "Could not create the alarm notify service factory" msgstr "" -#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109 +#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111 msgid "invalid time" msgstr "" -#: calendar/gui/cal-search-bar.c:50 +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1 +msgid "Allocate less space to weekend appointments" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2 +msgid "Calendars to run alarms for" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3 +#, fuzzy +msgid "Color of tasks that are due today" +msgstr "Colours for display" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4 +#, fuzzy +msgid "Color of tasks that are overdue" +msgstr "Colours for display" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5 +msgid "Days that are work days" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6 +msgid "Default timezone for meetings" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7 +msgid "Hour the workday ends on" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8 +msgid "Hour the workday starts on" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9 +msgid "Intervals shown in Day and Work Week views" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10 +msgid "Minute the workday ends on" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11 +msgid "Minute the workday starts on" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12 +msgid "Number of units for default reminder" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13 +msgid "Number of units for determining when to hide tasks" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14 +msgid "Position of the horizontal pane" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15 +msgid "Position of the horizontal pane in the month view" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16 +msgid "Position of the vertical pane" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17 +msgid "Position of the vertical pane in the month view" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18 +msgid "Position of the vertical pane in the task view" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19 +msgid "Programs that can run as part of alarms" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20 +msgid "Show where events end in week and month views" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21 +msgid "The view showing when the calendar starts" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22 +msgid "Time last alarm ran" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23 +msgid "Units for determining when to hide tasks" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24 +msgid "Units of default reminder" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25 +msgid "Weekday the week starts on" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26 +msgid "Whether to ask for confirmation on appointment deletion" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27 +msgid "Whether to ask for confirmation when folder is expunged" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28 +msgid "Whether to hide completed tasks" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29 +msgid "Whether to set a default reminder for events" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30 +msgid "Whether to show times in 24h format instead of using am/pm" +msgstr "" + +#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31 +msgid "Whether to show week numbers in date navigator" +msgstr "" + +#: calendar/gui/cal-search-bar.c:49 msgid "Summary contains" msgstr "" -#: calendar/gui/cal-search-bar.c:51 +#: calendar/gui/cal-search-bar.c:50 msgid "Description contains" msgstr "" -#: calendar/gui/cal-search-bar.c:52 +#: calendar/gui/cal-search-bar.c:51 msgid "Comment contains" msgstr "" -#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124 +#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134 msgid "Unmatched" msgstr "" -#: calendar/gui/calendar-commands.c:422 +#: calendar/gui/calendar-commands.c:370 msgid "" "This operation will permanently erase all events older than the selected " "amount of time. If you continue, you will not be able to recover these " "events." msgstr "" -#: calendar/gui/calendar-commands.c:428 +#: calendar/gui/calendar-commands.c:376 msgid "Purge events older than" msgstr "" -#: calendar/gui/calendar-commands.c:433 +#: calendar/gui/calendar-commands.c:381 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17 msgid "days" msgstr "" -#: calendar/gui/calendar-commands.c:531 +#: calendar/gui/calendar-commands.c:450 msgid "%A %d %B %Y" msgstr "" #. strftime format %a = abbreviated weekday name, %d = day of month, #. %b = abbreviated month name. Don't use any other specifiers. -#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692 +#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325 msgid "%a %d %b" msgstr "" -#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541 -#: calendar/gui/calendar-commands.c:543 +#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460 +#: calendar/gui/calendar-commands.c:462 msgid "%a %d %b %Y" msgstr "" -#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566 -#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574 +#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485 +#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493 #, fuzzy msgid "%d %B %Y" msgstr "%m/%d/%Y" @@ -3207,47 +3484,76 @@ msgstr "%m/%d/%Y" #. strftime format %d = day of month, %B = full #. month name. You can change the order but don't #. change the specifiers or add anything. -#: calendar/gui/calendar-commands.c:564 -#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518 +#: calendar/gui/calendar-commands.c:483 +#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517 msgid "%d %B" msgstr "" -#: calendar/gui/calendar-component.c:177 +#: calendar/gui/calendar-component.c:368 #, c-format msgid "Calendar '%s' will be removed. Are you sure you want to continue?" msgstr "" -#: calendar/gui/calendar-component.c:205 +#: calendar/gui/calendar-component.c:408 +msgid "Rename this calendar to" +msgstr "" + +#: calendar/gui/calendar-component.c:428 #, fuzzy msgid "New Calendar" msgstr "Colours" -#: calendar/gui/calendar-component.c:207 +#: calendar/gui/calendar-component.c:632 +msgid "New appointment" +msgstr "" + +#: calendar/gui/calendar-component.c:633 +msgid "_Appointment" +msgstr "" + +#: calendar/gui/calendar-component.c:634 +msgid "Create a new appointment" +msgstr "" + +#: calendar/gui/calendar-component.c:639 #, fuzzy -msgid "Rename" +msgid "New meeting" +msgstr "Cannot initialise the Evolution shell." + +#: calendar/gui/calendar-component.c:640 +#, fuzzy +msgid "M_eeting" +msgstr "Cannot initialise the Evolution shell." + +#: calendar/gui/calendar-component.c:641 +#, fuzzy +msgid "Create a new meeting request" msgstr "Synchronising \"%s\"" -#: calendar/gui/calendar-component.c:408 -msgid "On This Computer" +#: calendar/gui/calendar-component.c:646 +msgid "New all day appointment" msgstr "" -#. orange -#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123 -#: calendar/gui/migration.c:146 filter/filter-label.c:123 -#: mail/mail-config.c:67 mail/mail-config.glade.h:83 -#: shell/e-config-upgrade.c:1456 -msgid "Personal" +#: calendar/gui/calendar-component.c:647 +msgid "All _Day Appointment" msgstr "" -#. red -#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122 -#: mail/mail-config.c:66 mail/mail-config.glade.h:129 -#: shell/e-config-upgrade.c:1455 -msgid "Work" +#: calendar/gui/calendar-component.c:648 +#, fuzzy +msgid "Create a new all-day appointment" +msgstr "Synchronising \"%s\"" + +#: calendar/gui/calendar-component.c:715 +#, c-format +msgid "Unable to open the calendar '%s' for creating events and meetings" +msgstr "" + +#: calendar/gui/calendar-component.c:727 +msgid "There is no calendar available for creating events and meetings" msgstr "" #. create the remote source group -#: calendar/gui/calendar-component.c:432 +#: calendar/gui/calendar-component.c:858 msgid "On The Web" msgstr "" @@ -3367,7 +3673,7 @@ msgstr "" msgid "With these arguments:" msgstr "" -#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35 +#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47 msgid "dialog1" msgstr "" @@ -3383,6 +3689,10 @@ msgstr "" msgid "minutes" msgstr "" +#: calendar/gui/dialogs/alarm-page.c:798 +msgid "Action/Trigger" +msgstr "" + #: calendar/gui/dialogs/alarm-page.glade.h:1 #: calendar/gui/dialogs/recurrence-page.glade.h:2 msgid "Basics" @@ -3415,8 +3725,8 @@ msgstr "" #: calendar/gui/dialogs/alarm-page.glade.h:8 #: calendar/gui/dialogs/recurrence-page.glade.h:8 -#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11 -#: calendar/gui/e-tasks.c:166 +#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11 +#: calendar/gui/e-tasks.c:168 msgid "Summary:" msgstr "" @@ -3445,7 +3755,7 @@ msgstr "" msgid "hour(s)" msgstr "" -#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174 +#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180 msgid "minute(s)" msgstr "" @@ -3500,7 +3810,7 @@ msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12 #: calendar/gui/dialogs/recurrence-page.c:1048 -#: calendar/gui/e-itip-control.c:609 +#: calendar/gui/e-itip-control.c:607 msgid "Friday" msgstr "" @@ -3514,7 +3824,7 @@ msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 #: calendar/gui/dialogs/recurrence-page.c:1044 -#: calendar/gui/e-itip-control.c:605 +#: calendar/gui/e-itip-control.c:603 msgid "Monday" msgstr "" @@ -3524,7 +3834,7 @@ msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 #: calendar/gui/dialogs/recurrence-page.c:1049 -#: calendar/gui/e-itip-control.c:610 +#: calendar/gui/e-itip-control.c:608 msgid "Saturday" msgstr "" @@ -3538,7 +3848,7 @@ msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 #: calendar/gui/dialogs/recurrence-page.c:1050 -#: calendar/gui/e-itip-control.c:604 +#: calendar/gui/e-itip-control.c:602 msgid "Sunday" msgstr "" @@ -3557,7 +3867,7 @@ msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24 #: calendar/gui/dialogs/recurrence-page.c:1047 -#: calendar/gui/e-itip-control.c:608 +#: calendar/gui/e-itip-control.c:606 msgid "Thursday" msgstr "" @@ -3575,7 +3885,7 @@ msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28 #: calendar/gui/dialogs/recurrence-page.c:1045 -#: calendar/gui/e-itip-control.c:606 +#: calendar/gui/e-itip-control.c:604 msgid "Tuesday" msgstr "" @@ -3585,12 +3895,12 @@ msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30 #: calendar/gui/dialogs/recurrence-page.c:1046 -#: calendar/gui/e-itip-control.c:607 +#: calendar/gui/e-itip-control.c:605 msgid "Wednesday" msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31 -#: ui/evolution-calendar.xml.h:41 +#: ui/evolution-calendar.xml.h:33 msgid "Work Week" msgstr "" @@ -3627,7 +3937,7 @@ msgid "_Fri" msgstr "" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40 -#: mail/mail-config.glade.h:147 +#: mail/mail-config.glade.h:151 msgid "_General" msgstr "" @@ -3667,76 +3977,76 @@ msgstr "" msgid "before every appointment" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:58 +#: calendar/gui/dialogs/cancel-comp.c:57 msgid "" "The event being deleted is a meeting, would you like to send a cancellation " "notice?" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:61 +#: calendar/gui/dialogs/cancel-comp.c:60 msgid "Are you sure you want to cancel and delete this meeting?" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:67 +#: calendar/gui/dialogs/cancel-comp.c:66 msgid "" "The task being deleted is assigned, would you like to send a cancellation " "notice?" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:70 +#: calendar/gui/dialogs/cancel-comp.c:69 msgid "Are you sure you want to cancel and delete this task?" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:76 +#: calendar/gui/dialogs/cancel-comp.c:75 msgid "" "The journal entry being deleted is published, would you like to send a " "cancellation notice?" msgstr "" -#: calendar/gui/dialogs/cancel-comp.c:79 +#: calendar/gui/dialogs/cancel-comp.c:78 msgid "Are you sure you want to cancel and delete this journal entry?" msgstr "" -#: calendar/gui/dialogs/changed-comp.c:59 +#: calendar/gui/dialogs/changed-comp.c:58 msgid "This event has been deleted." msgstr "" -#: calendar/gui/dialogs/changed-comp.c:63 +#: calendar/gui/dialogs/changed-comp.c:62 msgid "This task has been deleted." msgstr "" -#: calendar/gui/dialogs/changed-comp.c:67 +#: calendar/gui/dialogs/changed-comp.c:66 msgid "This journal entry has been deleted." msgstr "" -#: calendar/gui/dialogs/changed-comp.c:76 +#: calendar/gui/dialogs/changed-comp.c:75 #, c-format msgid "%s You have made changes. Forget those changes and close the editor?" msgstr "" -#: calendar/gui/dialogs/changed-comp.c:78 +#: calendar/gui/dialogs/changed-comp.c:77 #, c-format msgid "%s You have made no changes, close the editor?" msgstr "" -#: calendar/gui/dialogs/changed-comp.c:83 +#: calendar/gui/dialogs/changed-comp.c:82 msgid "This event has been changed." msgstr "" -#: calendar/gui/dialogs/changed-comp.c:87 +#: calendar/gui/dialogs/changed-comp.c:86 msgid "This task has been changed." msgstr "" -#: calendar/gui/dialogs/changed-comp.c:91 +#: calendar/gui/dialogs/changed-comp.c:90 msgid "This journal entry has been changed." msgstr "" -#: calendar/gui/dialogs/changed-comp.c:100 +#: calendar/gui/dialogs/changed-comp.c:99 #, c-format msgid "%s You have made changes. Forget those changes and update the editor?" msgstr "" -#: calendar/gui/dialogs/changed-comp.c:102 +#: calendar/gui/dialogs/changed-comp.c:101 #, c-format msgid "%s You have made no changes, update the editor?" msgstr "" @@ -3746,162 +4056,166 @@ msgstr "" msgid "Validation error: %s" msgstr "" -#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230 +#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229 msgid " to " msgstr "" -#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234 +#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233 msgid " (Completed " msgstr "" -#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236 +#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235 msgid "Completed " msgstr "" -#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241 +#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240 msgid " (Due " msgstr "" -#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243 +#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242 msgid "Due " msgstr "" -#: calendar/gui/dialogs/comp-editor.c:336 +#: calendar/gui/dialogs/comp-editor.c:335 #, fuzzy msgid "Could not update object" msgstr "Could not initialise Bonobo" -#: calendar/gui/dialogs/comp-editor.c:787 -#: calendar/gui/dialogs/comp-editor.c:824 +#: calendar/gui/dialogs/comp-editor.c:786 +#: calendar/gui/dialogs/comp-editor.c:823 msgid "Edit Appointment" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:792 -#: calendar/gui/dialogs/comp-editor.c:829 +#: calendar/gui/dialogs/comp-editor.c:791 +#: calendar/gui/dialogs/comp-editor.c:828 #, c-format msgid "Appointment - %s" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:795 -#: calendar/gui/dialogs/comp-editor.c:832 +#: calendar/gui/dialogs/comp-editor.c:794 +#: calendar/gui/dialogs/comp-editor.c:831 #, c-format msgid "Task - %s" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:798 -#: calendar/gui/dialogs/comp-editor.c:835 +#: calendar/gui/dialogs/comp-editor.c:797 +#: calendar/gui/dialogs/comp-editor.c:834 #, c-format msgid "Journal entry - %s" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:809 -#: calendar/gui/dialogs/comp-editor.c:845 +#: calendar/gui/dialogs/comp-editor.c:808 +#: calendar/gui/dialogs/comp-editor.c:844 msgid "No summary" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043 -#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138 +#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979 +#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138 msgid "Save as..." msgstr "" -#: calendar/gui/dialogs/comp-editor.c:1378 -#: calendar/gui/dialogs/comp-editor.c:1402 -#: calendar/gui/dialogs/comp-editor.c:1428 +#: calendar/gui/dialogs/comp-editor.c:1377 +#: calendar/gui/dialogs/comp-editor.c:1401 +#: calendar/gui/dialogs/comp-editor.c:1427 msgid "Changes made to this item may be discarded if an update arrives" msgstr "" -#: calendar/gui/dialogs/comp-editor.c:1456 -#: calendar/gui/dialogs/comp-editor.c:1465 +#: calendar/gui/dialogs/comp-editor.c:1455 +#: calendar/gui/dialogs/comp-editor.c:1464 msgid "Unable to obtain current version!" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:96 +#: calendar/gui/dialogs/copy-source-dialog.c:141 +msgid "Select destination source" +msgstr "" + +#: calendar/gui/dialogs/delete-comp.c:95 #, c-format msgid "Are you sure you want to delete the appointment `%s'?" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:99 +#: calendar/gui/dialogs/delete-comp.c:98 msgid "Are you sure you want to delete this untitled appointment?" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:105 +#: calendar/gui/dialogs/delete-comp.c:104 #, c-format msgid "Are you sure you want to delete the task `%s'?" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:108 +#: calendar/gui/dialogs/delete-comp.c:107 msgid "Are you sure you want to delete this untitled task?" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:114 +#: calendar/gui/dialogs/delete-comp.c:113 #, c-format msgid "Are you sure you want to delete the journal entry `%s'?" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:117 +#: calendar/gui/dialogs/delete-comp.c:116 msgid "Are you sure want to delete this untitled journal entry?" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:132 +#: calendar/gui/dialogs/delete-comp.c:131 #, c-format msgid "Are you sure you want to delete %d appointments?" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:137 +#: calendar/gui/dialogs/delete-comp.c:136 #, c-format msgid "Are you sure you want to delete %d tasks?" msgstr "" -#: calendar/gui/dialogs/delete-comp.c:142 +#: calendar/gui/dialogs/delete-comp.c:141 #, c-format msgid "Are you sure you want to delete %d journal entries?" msgstr "" -#: calendar/gui/dialogs/delete-error.c:53 +#: calendar/gui/dialogs/delete-error.c:52 msgid "The event could not be deleted due to a corba error" msgstr "" -#: calendar/gui/dialogs/delete-error.c:56 +#: calendar/gui/dialogs/delete-error.c:55 msgid "The task could not be deleted due to a corba error" msgstr "" -#: calendar/gui/dialogs/delete-error.c:59 +#: calendar/gui/dialogs/delete-error.c:58 msgid "The journal entry could not be deleted due to a corba error" msgstr "" -#: calendar/gui/dialogs/delete-error.c:62 +#: calendar/gui/dialogs/delete-error.c:61 msgid "The item could not be deleted due to a corba error" msgstr "" -#: calendar/gui/dialogs/delete-error.c:69 +#: calendar/gui/dialogs/delete-error.c:68 msgid "The event could not be deleted because permission was denied" msgstr "" -#: calendar/gui/dialogs/delete-error.c:72 +#: calendar/gui/dialogs/delete-error.c:71 msgid "The task could not be deleted because permission was denied" msgstr "" -#: calendar/gui/dialogs/delete-error.c:75 +#: calendar/gui/dialogs/delete-error.c:74 msgid "The journal entry could not be deleted because permission was denied" msgstr "" -#: calendar/gui/dialogs/delete-error.c:78 +#: calendar/gui/dialogs/delete-error.c:77 msgid "The item could not be deleted because permission was denied" msgstr "" -#: calendar/gui/dialogs/delete-error.c:85 +#: calendar/gui/dialogs/delete-error.c:84 msgid "The event could not be deleted due to an error" msgstr "" -#: calendar/gui/dialogs/delete-error.c:88 +#: calendar/gui/dialogs/delete-error.c:87 msgid "The task could not be deleted due to an error" msgstr "" -#: calendar/gui/dialogs/delete-error.c:91 +#: calendar/gui/dialogs/delete-error.c:90 msgid "The journal entry could not be deleted due to an error" msgstr "" -#: calendar/gui/dialogs/delete-error.c:94 +#: calendar/gui/dialogs/delete-error.c:93 msgid "The item could not be deleted due to an error" msgstr "" @@ -3917,43 +4231,43 @@ msgstr "" msgid "Enter Delegate" msgstr "" -#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267 +#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266 msgid "Appointment" msgstr "" -#: calendar/gui/dialogs/event-editor.c:208 +#: calendar/gui/dialogs/event-editor.c:207 msgid "Reminder" msgstr "" -#: calendar/gui/dialogs/event-editor.c:215 +#: calendar/gui/dialogs/event-editor.c:214 msgid "Recurrence" msgstr "" -#: calendar/gui/dialogs/event-editor.c:222 -#: calendar/gui/dialogs/event-editor.c:295 -#: calendar/gui/dialogs/event-editor.c:439 +#: calendar/gui/dialogs/event-editor.c:221 +#: calendar/gui/dialogs/event-editor.c:294 +#: calendar/gui/dialogs/event-editor.c:438 msgid "Scheduling" msgstr "" -#: calendar/gui/dialogs/event-editor.c:229 -#: calendar/gui/dialogs/event-editor.c:298 -#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6 +#: calendar/gui/dialogs/event-editor.c:228 +#: calendar/gui/dialogs/event-editor.c:297 +#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6 msgid "Meeting" msgstr "" -#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504 +#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503 msgid "Start date is wrong" msgstr "" -#: calendar/gui/dialogs/event-page.c:610 +#: calendar/gui/dialogs/event-page.c:609 msgid "End date is wrong" msgstr "" -#: calendar/gui/dialogs/event-page.c:633 +#: calendar/gui/dialogs/event-page.c:632 msgid "Start time is wrong" msgstr "" -#: calendar/gui/dialogs/event-page.c:640 +#: calendar/gui/dialogs/event-page.c:639 msgid "End time is wrong" msgstr "" @@ -4022,31 +4336,31 @@ msgid "_Start time:" msgstr "" #. an empty string is the same as 'None' -#: calendar/gui/dialogs/meeting-page.c:312 +#: calendar/gui/dialogs/meeting-page.c:310 #: calendar/gui/dialogs/meeting-page.glade.h:2 -#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040 -#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690 -#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749 -#: mail/mail-config.glade.h:75 +#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050 +#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714 +#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783 +#: mail/mail-config.glade.h:78 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445 -#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598 +#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597 msgid "None" msgstr "" -#: calendar/gui/dialogs/meeting-page.c:417 +#: calendar/gui/dialogs/meeting-page.c:415 msgid "The organizer selected no longer has an account." msgstr "" -#: calendar/gui/dialogs/meeting-page.c:423 +#: calendar/gui/dialogs/meeting-page.c:421 msgid "An organizer is required." msgstr "" -#: calendar/gui/dialogs/meeting-page.c:438 +#: calendar/gui/dialogs/meeting-page.c:436 msgid "At least one attendee is required." msgstr "" -#: calendar/gui/dialogs/meeting-page.c:631 +#: calendar/gui/dialogs/meeting-page.c:629 msgid "_Delegate To..." msgstr "" @@ -4087,21 +4401,15 @@ msgid "Member" msgstr "" #: calendar/gui/dialogs/meeting-page.etspec.h:8 -#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263 +#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263 #: calendar/gui/e-meeting-time-sel.etspec.h:8 msgid "RSVP" msgstr "" -#: calendar/gui/dialogs/meeting-page.etspec.h:9 -#: calendar/gui/e-meeting-list-view.c:256 -#: calendar/gui/e-meeting-time-sel.etspec.h:9 -msgid "Role" -msgstr "" - #: calendar/gui/dialogs/meeting-page.etspec.h:10 #: calendar/gui/e-calendar-table.etspec.h:14 #: calendar/gui/e-meeting-list-view.c:270 -#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36 +#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37 #: mail/message-list.etspec.h:12 msgid "Status" msgstr "" @@ -4123,6 +4431,7 @@ msgid "_Invite Others..." msgstr "" #: calendar/gui/dialogs/new-calendar.c:102 +#: calendar/gui/dialogs/new-task-list.c:46 #, c-format msgid "Source with name '%s' already exists in the selected group" msgstr "" @@ -4155,6 +4464,7 @@ msgid "Could not create directory for new calendar" msgstr "Cannot initialise Evolution's mail component." #: calendar/gui/dialogs/new-calendar.c:254 +#: calendar/gui/dialogs/new-task-list.c:131 msgid "A group must be selected" msgstr "" @@ -4182,32 +4492,55 @@ msgstr "Colours" msgid "Calendar Name" msgstr "Colours" -#: calendar/gui/dialogs/recur-comp.c:51 +#: calendar/gui/dialogs/new-task-list.c:56 +#, fuzzy +msgid "Could not create directory for new task list" +msgstr "Cannot initialise Evolution's mail component." + +#: calendar/gui/dialogs/new-task-list.glade.h:2 +msgid "<b>Task List Options</b>" +msgstr "" + +#: calendar/gui/dialogs/new-task-list.glade.h:3 +#, fuzzy +msgid "Add New Task List" +msgstr "Colours" + +#: calendar/gui/dialogs/new-task-list.glade.h:4 +msgid "Task List Group" +msgstr "" + +#: calendar/gui/dialogs/new-task-list.glade.h:5 +#, fuzzy +msgid "Task List Name" +msgstr "Synchronising \"%s\"" + +#: calendar/gui/dialogs/recur-comp.c:50 msgid "You are modifying a recurring event, what would you like to modify?" msgstr "" -#: calendar/gui/dialogs/recur-comp.c:55 +#: calendar/gui/dialogs/recur-comp.c:54 msgid "You are modifying a recurring task, what would you like to modify?" msgstr "" -#: calendar/gui/dialogs/recur-comp.c:59 +#: calendar/gui/dialogs/recur-comp.c:58 msgid "" "You are modifying a recurring journal entry, what would you like to modify?" msgstr "" -#: calendar/gui/dialogs/recur-comp.c:73 +#: calendar/gui/dialogs/recur-comp.c:72 msgid "This Instance Only" msgstr "" -#: calendar/gui/dialogs/recur-comp.c:77 +#: calendar/gui/dialogs/recur-comp.c:76 msgid "This and Prior Instances" msgstr "" -#: calendar/gui/dialogs/recur-comp.c:83 +#: calendar/gui/dialogs/recur-comp.c:82 msgid "This and Future Instances" msgstr "" -#: calendar/gui/dialogs/recur-comp.c:88 +#: calendar/gui/dialogs/recur-comp.c:87 msgid "All Instances" msgstr "" @@ -4256,10 +4589,14 @@ msgstr "" msgid "on the" msgstr "" -#: calendar/gui/dialogs/recurrence-page.c:1365 +#: calendar/gui/dialogs/recurrence-page.c:1366 msgid "occurrences" msgstr "" +#: calendar/gui/dialogs/recurrence-page.c:2334 +msgid "Date/Time" +msgstr "" + #: calendar/gui/dialogs/recurrence-page.glade.h:1 msgid "A_dd" msgstr "" @@ -4324,39 +4661,39 @@ msgstr "" msgid "year(s)" msgstr "" -#: calendar/gui/dialogs/save-comp.c:54 +#: calendar/gui/dialogs/save-comp.c:53 msgid "" "This event has been changed, but has not been saved.\n" "\n" "Do you wish to save your changes?" msgstr "" -#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546 +#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555 msgid "_Discard Changes" msgstr "" -#: calendar/gui/dialogs/save-comp.c:63 +#: calendar/gui/dialogs/save-comp.c:62 #, fuzzy msgid "Save Event" msgstr "Synchronising \"%s\"" -#: calendar/gui/dialogs/send-comp.c:58 +#: calendar/gui/dialogs/send-comp.c:57 msgid "The meeting information has been created. Send it?" msgstr "" -#: calendar/gui/dialogs/send-comp.c:61 +#: calendar/gui/dialogs/send-comp.c:60 msgid "The meeting information has changed. Send an updated version?" msgstr "" -#: calendar/gui/dialogs/send-comp.c:68 +#: calendar/gui/dialogs/send-comp.c:67 msgid "The task assignment information has been created. Send it?" msgstr "" -#: calendar/gui/dialogs/send-comp.c:72 +#: calendar/gui/dialogs/send-comp.c:71 msgid "The task information has changed. Send an updated version?" msgstr "" -#: calendar/gui/dialogs/task-details-page.c:405 +#: calendar/gui/dialogs/task-details-page.c:404 msgid "Completed date is wrong" msgstr "" @@ -4366,43 +4703,43 @@ msgid "% _Complete" msgstr "" #: calendar/gui/dialogs/task-details-page.glade.h:4 -#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602 -#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289 +#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598 +#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187 -#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208 -#: calendar/gui/print.c:2318 +#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210 +#: calendar/gui/print.c:2317 msgid "Completed" msgstr "" #: calendar/gui/dialogs/task-details-page.glade.h:5 -#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229 -#: mail/message-list.c:912 +#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231 +#: mail/message-list.c:916 msgid "High" msgstr "" #: calendar/gui/dialogs/task-details-page.glade.h:6 -#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600 -#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477 -#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315 +#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596 +#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476 +#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314 msgid "In Progress" msgstr "" #: calendar/gui/dialogs/task-details-page.glade.h:7 -#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233 -#: mail/message-list.c:910 +#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235 +#: mail/message-list.c:914 msgid "Low" msgstr "" #: calendar/gui/dialogs/task-details-page.glade.h:8 -#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404 -#: calendar/gui/e-tasks.c:231 mail/message-list.c:911 +#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403 +#: calendar/gui/e-tasks.c:233 mail/message-list.c:915 msgid "Normal" msgstr "" #: calendar/gui/dialogs/task-details-page.glade.h:9 -#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598 -#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215 -#: calendar/gui/print.c:2312 +#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594 +#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217 +#: calendar/gui/print.c:2311 msgid "Not Started" msgstr "" @@ -4411,7 +4748,7 @@ msgid "Progress" msgstr "" #: calendar/gui/dialogs/task-details-page.glade.h:11 -#: calendar/gui/e-calendar-table.c:406 +#: calendar/gui/e-calendar-table.c:405 msgid "Undefined" msgstr "" @@ -4431,21 +4768,21 @@ msgstr "" msgid "_Web Page:" msgstr "" -#: calendar/gui/dialogs/task-editor.c:194 +#: calendar/gui/dialogs/task-editor.c:193 msgid "Basic" msgstr "" -#: calendar/gui/dialogs/task-editor.c:208 -#: calendar/gui/dialogs/task-editor.c:271 -#: calendar/gui/dialogs/task-editor.c:408 +#: calendar/gui/dialogs/task-editor.c:207 +#: calendar/gui/dialogs/task-editor.c:270 +#: calendar/gui/dialogs/task-editor.c:407 msgid "Assignment" msgstr "" -#: calendar/gui/dialogs/task-page.c:477 +#: calendar/gui/dialogs/task-page.c:476 msgid "Due date is wrong" msgstr "" -#: calendar/gui/dialogs/task-page.c:537 +#: calendar/gui/dialogs/task-page.c:536 msgid "Due date is before start date!" msgstr "" @@ -4453,9 +4790,9 @@ msgstr "" msgid "Con_fidential" msgstr "" -#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040 -#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245 -#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42 +#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038 +#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247 +#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44 msgid "Description:" msgstr "" @@ -4560,26 +4897,21 @@ msgstr "" msgid "%s for an unknown trigger type" msgstr "" -#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283 -#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381 +#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283 +#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380 msgid "Public" msgstr "" -#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292 -#: calendar/gui/e-calendar-table.c:382 +#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292 +#: calendar/gui/e-calendar-table.c:381 msgid "Private" msgstr "" -#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294 -#: calendar/gui/e-calendar-table.c:383 +#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294 +#: calendar/gui/e-calendar-table.c:382 msgid "Confidential" msgstr "" -#: calendar/gui/e-cal-list-view.etspec.h:1 -#: calendar/gui/e-calendar-table.etspec.h:4 -msgid "Categories" -msgstr "" - #: calendar/gui/e-cal-list-view.etspec.h:3 #: calendar/gui/e-calendar-table.etspec.h:9 #, fuzzy @@ -4592,28 +4924,26 @@ msgid "Start Date" msgstr "" #: calendar/gui/e-cal-list-view.etspec.h:5 -#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082 +#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5 +#: shell/e-shortcuts.c:1083 msgid "Summary" msgstr "" -#: calendar/gui/e-cal-list-view.etspec.h:6 -#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172 +#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178 #, fuzzy msgid "color" msgstr "Colours" #: calendar/gui/e-cal-list-view.etspec.h:7 -#: calendar/gui/e-calendar-table.etspec.h:20 msgid "component" msgstr "" -#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455 +#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454 msgid "Free" msgstr "" -#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456 +#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455 #: calendar/gui/e-meeting-time-sel.c:399 -#: shell/evolution-shell-component.c:1207 msgid "Busy" msgstr "" @@ -4625,7 +4955,7 @@ msgstr "" msgid "S" msgstr "" -#: calendar/gui/e-cal-model-tasks.c:277 +#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624 msgid "E" msgstr "" @@ -4633,14 +4963,14 @@ msgstr "" msgid "W" msgstr "" -#: calendar/gui/e-cal-model-tasks.c:550 +#: calendar/gui/e-cal-model-tasks.c:546 msgid "" "The geographical position must be entered in the format: \n" "\n" "45.436845,125.862501" msgstr "" -#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841 +#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159 @@ -4648,7 +4978,7 @@ msgstr "" msgid "Yes" msgstr "" -#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841 +#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171 msgid "No" @@ -4656,17 +4986,17 @@ msgstr "" #. This is the default filename used for temporary file creation #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299 -#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241 +#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239 #: calendar/gui/e-meeting-list-view.c:144 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770 #: 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:1619 -#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631 +#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654 +#: camel/camel-gpg-context.c:1705 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:1902 -#: widgets/misc/e-charset-picker.c:60 +#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952 +#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60 msgid "Unknown" msgstr "" @@ -4678,181 +5008,179 @@ msgstr "" msgid "Assigned" msgstr "" -#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348 -msgid "Updating objects" +#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723 +msgid "Deleting selected objects" msgstr "" -#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724 -msgid "Deleting selected objects" +#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347 +msgid "Updating objects" msgstr "" -#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339 +#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262 msgid "New _Appointment..." msgstr "" -#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341 -#: ui/evolution-calendar.xml.h:23 +#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264 msgid "New All Day _Event" msgstr "" -#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343 +#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266 msgid "New Meeting" msgstr "" -#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345 +#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268 msgid "New Task" msgstr "" -#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284 -#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993 -#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38 -#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19 -#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116 +#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207 +#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992 +#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38 +#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19 +#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6 msgid "_Print..." msgstr "" -#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291 -#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999 -#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37 -#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9 -#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20 +#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214 +#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998 +#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37 +#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9 +#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20 msgid "_Paste" msgstr "" -#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335 -#: ui/evolution-calendar.xml.h:18 +#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258 +#: ui/evolution-calendar.xml.h:14 msgid "Go to _Today" msgstr "" -#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337 +#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260 msgid "_Go to Date..." msgstr "" -#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48 +#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40 msgid "_Publish Free/Busy Information" msgstr "" -#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355 -#: ui/evolution.xml.h:28 -#, fuzzy -msgid "_Settings..." -msgstr "Cannot initialise the Evolution shell." - -#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347 -#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031 -#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422 +#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270 +#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030 +#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422 #: ui/evolution-addressbook.xml.h:36 msgid "_Open" msgstr "" -#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353 -#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037 -#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640 -#: ui/evolution-mail-message.xml.h:120 +#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276 +#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036 +#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646 +#: ui/evolution-mail-message.xml.h:126 msgid "_Save As..." msgstr "" -#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329 -#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026 +#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252 +#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1 #: ui/evolution-tasks.xml.h:1 msgid "C_ut" msgstr "" -#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327 -#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024 -#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30 -#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7 -#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17 +#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250 +#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023 +#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30 +#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7 +#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17 msgid "_Copy" msgstr "" -#: calendar/gui/e-cal-view.c:1295 +#: calendar/gui/e-cal-view.c:1218 msgid "_Schedule Meeting..." msgstr "" -#: calendar/gui/e-cal-view.c:1296 +#: calendar/gui/e-cal-view.c:1219 msgid "_Forward as iCalendar..." msgstr "" -#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332 +#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255 msgid "Delete this _Occurrence" msgstr "" -#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333 +#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256 msgid "Delete _All Occurrences" msgstr "" -#: calendar/gui/e-calendar-table.c:425 +#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30 +#, fuzzy +msgid "_Settings..." +msgstr "Cannot initialise the Evolution shell." + +#: calendar/gui/e-calendar-table.c:424 msgid "0%" msgstr "" -#: calendar/gui/e-calendar-table.c:426 +#: calendar/gui/e-calendar-table.c:425 msgid "10%" msgstr "" -#: calendar/gui/e-calendar-table.c:427 +#: calendar/gui/e-calendar-table.c:426 msgid "20%" msgstr "" -#: calendar/gui/e-calendar-table.c:428 +#: calendar/gui/e-calendar-table.c:427 msgid "30%" msgstr "" -#: calendar/gui/e-calendar-table.c:429 +#: calendar/gui/e-calendar-table.c:428 msgid "40%" msgstr "" -#: calendar/gui/e-calendar-table.c:430 +#: calendar/gui/e-calendar-table.c:429 msgid "50%" msgstr "" -#: calendar/gui/e-calendar-table.c:431 +#: calendar/gui/e-calendar-table.c:430 msgid "60%" msgstr "" -#: calendar/gui/e-calendar-table.c:432 +#: calendar/gui/e-calendar-table.c:431 msgid "70%" msgstr "" -#: calendar/gui/e-calendar-table.c:433 +#: calendar/gui/e-calendar-table.c:432 msgid "80%" msgstr "" -#: calendar/gui/e-calendar-table.c:434 +#: calendar/gui/e-calendar-table.c:433 msgid "90%" msgstr "" -#: calendar/gui/e-calendar-table.c:435 +#: calendar/gui/e-calendar-table.c:434 msgid "100%" msgstr "" -#: calendar/gui/e-calendar-table.c:991 +#: calendar/gui/e-calendar-table.c:990 msgid "Open _Web Page" msgstr "" -#: calendar/gui/e-calendar-table.c:1003 +#: calendar/gui/e-calendar-table.c:1002 msgid "_Assign Task" msgstr "" -#: calendar/gui/e-calendar-table.c:1004 +#: calendar/gui/e-calendar-table.c:1003 msgid "_Forward as iCalendar" msgstr "" -#: calendar/gui/e-calendar-table.c:1005 +#: calendar/gui/e-calendar-table.c:1004 msgid "_Mark as Complete" msgstr "" -#: calendar/gui/e-calendar-table.c:1006 +#: calendar/gui/e-calendar-table.c:1005 msgid "_Mark Selected Tasks as Complete" msgstr "" -#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029 +#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028 msgid "_Delete Selected Tasks" msgstr "" -#: calendar/gui/e-calendar-table.c:1431 +#: calendar/gui/e-calendar-table.c:1430 #: calendar/gui/e-calendar-table.etspec.h:6 msgid "Click to add a task" msgstr "" @@ -4866,8 +5194,8 @@ msgstr "" msgid "Alarms" msgstr "" -#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173 -#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579 +#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167 +#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576 msgid "Complete" msgstr "" @@ -4896,18 +5224,18 @@ msgid "URL" msgstr "" #. strftime format of a weekday, a date and a time, 24-hour. -#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180 +#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180 #: e-util/e-time-utils.c:393 msgid "%a %m/%d/%Y %H:%M:%S" msgstr "%a %d/%m/%Y %H:%M:%S" #. strftime format of a weekday, a date and a time, 12-hour. -#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175 +#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175 #: e-util/e-time-utils.c:402 msgid "%a %m/%d/%Y %I:%M:%S %p" msgstr "%a %d/%m/%Y %I:%M:%S %p" -#: calendar/gui/e-cell-date-edit-text.c:126 +#: calendar/gui/e-cell-date-edit-text.c:125 #, c-format msgid "" "The date must be entered in the format: \n" @@ -4923,7 +5251,7 @@ msgstr "" #. strftime format %A = full weekday name, %d = day of month, #. %B = full month name. Don't use any other specifiers. #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342 -#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534 +#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533 msgid "%A %d %B" msgstr "" @@ -4936,444 +5264,443 @@ msgstr "" #. String to use in 12-hour time format for times in the morning. #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325 -#: calendar/gui/print.c:819 +#: calendar/gui/print.c:818 msgid "am" msgstr "" #. String to use in 12-hour time format for times in the afternoon. #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328 -#: calendar/gui/print.c:821 +#: calendar/gui/print.c:820 msgid "pm" msgstr "" -#: calendar/gui/e-itip-control.c:142 +#: calendar/gui/e-itip-control.c:139 #, c-format msgid "start_calendar_server(): %s" msgstr "" -#: calendar/gui/e-itip-control.c:638 +#: calendar/gui/e-itip-control.c:636 msgid "Yes. (Complex Recurrence)" msgstr "" -#: calendar/gui/e-itip-control.c:650 +#: calendar/gui/e-itip-control.c:648 msgid "Every day" msgstr "" -#: calendar/gui/e-itip-control.c:652 +#: calendar/gui/e-itip-control.c:650 #, c-format msgid "Every %d days" msgstr "" -#: calendar/gui/e-itip-control.c:658 +#: calendar/gui/e-itip-control.c:656 msgid "Every week" msgstr "" -#: calendar/gui/e-itip-control.c:660 +#: calendar/gui/e-itip-control.c:658 #, c-format msgid "Every %d weeks" msgstr "" -#: calendar/gui/e-itip-control.c:663 +#: calendar/gui/e-itip-control.c:661 msgid "Every week on " msgstr "" -#: calendar/gui/e-itip-control.c:665 +#: calendar/gui/e-itip-control.c:663 #, c-format msgid "Every %d weeks on " msgstr "" -#: calendar/gui/e-itip-control.c:673 +#: calendar/gui/e-itip-control.c:671 msgid " and " msgstr "" -#: calendar/gui/e-itip-control.c:680 +#: calendar/gui/e-itip-control.c:678 #, c-format msgid "The %s day of " msgstr "" -#: calendar/gui/e-itip-control.c:693 +#: calendar/gui/e-itip-control.c:691 #, c-format msgid "The %s %s of " msgstr "" -#: calendar/gui/e-itip-control.c:698 +#: calendar/gui/e-itip-control.c:696 msgid "every month" msgstr "" -#: calendar/gui/e-itip-control.c:703 +#: calendar/gui/e-itip-control.c:701 #, c-format msgid "every %d months" msgstr "" -#: calendar/gui/e-itip-control.c:709 +#: calendar/gui/e-itip-control.c:707 msgid "Every year" msgstr "" -#: calendar/gui/e-itip-control.c:711 +#: calendar/gui/e-itip-control.c:709 #, c-format msgid "Every %d years" msgstr "" -#: calendar/gui/e-itip-control.c:723 +#: calendar/gui/e-itip-control.c:721 #, c-format msgid " a total of %d times" msgstr "" -#: calendar/gui/e-itip-control.c:732 +#: calendar/gui/e-itip-control.c:730 msgid ", ending on " msgstr "" -#: calendar/gui/e-itip-control.c:756 +#: calendar/gui/e-itip-control.c:754 msgid "<b>Starts:</b> " msgstr "" -#: calendar/gui/e-itip-control.c:766 +#: calendar/gui/e-itip-control.c:764 msgid "<b>Ends:</b> " msgstr "" -#: calendar/gui/e-itip-control.c:786 +#: calendar/gui/e-itip-control.c:784 msgid "<b>Completed:</b> " msgstr "" -#: calendar/gui/e-itip-control.c:796 +#: calendar/gui/e-itip-control.c:794 msgid "<b>Due:</b> " msgstr "" -#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886 +#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884 msgid "iCalendar Information" msgstr "" #. Title -#: calendar/gui/e-itip-control.c:848 +#: calendar/gui/e-itip-control.c:846 msgid "iCalendar Error" msgstr "" -#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933 -#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961 +#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931 +#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959 msgid "An unknown person" msgstr "" #. Describe what the user can do -#: calendar/gui/e-itip-control.c:968 +#: calendar/gui/e-itip-control.c:966 msgid "" "<br> Please review the following information, and then select an action from " "the menu below." msgstr "" -#: calendar/gui/e-itip-control.c:983 +#: calendar/gui/e-itip-control.c:981 msgid "<i>None</i>" msgstr "" -#: calendar/gui/e-itip-control.c:994 +#: calendar/gui/e-itip-control.c:992 #, fuzzy msgid "Location:" msgstr "Organisation" #. write status -#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201 +#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203 msgid "Status:" msgstr "" -#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180 +#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179 -#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419 +#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418 msgid "Accepted" msgstr "" -#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422 +#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421 msgid "Tentatively Accepted" msgstr "" -#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181 +#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181 -#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425 -#: calendar/gui/itip-utils.c:451 +#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424 +#: calendar/gui/itip-utils.c:450 msgid "Declined" msgstr "" -#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108 -#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147 -#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173 +#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106 +#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145 +#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171 msgid "Choose an action:" msgstr "" -#: calendar/gui/e-itip-control.c:1081 +#: calendar/gui/e-itip-control.c:1079 msgid "Update" msgstr "" -#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113 -#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149 -#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175 -#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265 +#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111 +#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147 +#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173 +#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265 msgid "OK" msgstr "" -#: calendar/gui/e-itip-control.c:1109 +#: calendar/gui/e-itip-control.c:1107 msgid "Accept" msgstr "" -#: calendar/gui/e-itip-control.c:1110 +#: calendar/gui/e-itip-control.c:1108 msgid "Tentatively accept" msgstr "" -#: calendar/gui/e-itip-control.c:1111 +#: calendar/gui/e-itip-control.c:1109 msgid "Decline" msgstr "" -#: calendar/gui/e-itip-control.c:1135 +#: calendar/gui/e-itip-control.c:1133 msgid "Send Free/Busy Information" msgstr "" -#: calendar/gui/e-itip-control.c:1148 +#: calendar/gui/e-itip-control.c:1146 msgid "Update respondent status" msgstr "" -#: calendar/gui/e-itip-control.c:1161 +#: calendar/gui/e-itip-control.c:1159 msgid "Send Latest Information" msgstr "" -#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439 -#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441 -#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185 -#: ui/evolution-mail-global.xml.h:1 +#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438 +#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438 +#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1 msgid "Cancel" msgstr "" -#: calendar/gui/e-itip-control.c:1263 +#: calendar/gui/e-itip-control.c:1261 #, c-format msgid "<b>%s</b> has published meeting information." msgstr "" -#: calendar/gui/e-itip-control.c:1264 +#: calendar/gui/e-itip-control.c:1262 msgid "Meeting Information" msgstr "" -#: calendar/gui/e-itip-control.c:1269 +#: calendar/gui/e-itip-control.c:1267 #, c-format msgid "<b>%s</b> requests the presence of %s at a meeting." msgstr "" -#: calendar/gui/e-itip-control.c:1271 +#: calendar/gui/e-itip-control.c:1269 #, c-format msgid "<b>%s</b> requests your presence at a meeting." msgstr "" -#: calendar/gui/e-itip-control.c:1272 +#: calendar/gui/e-itip-control.c:1270 msgid "Meeting Proposal" msgstr "" -#: calendar/gui/e-itip-control.c:1276 +#: calendar/gui/e-itip-control.c:1274 #, c-format msgid "<b>%s</b> wishes to add to an existing meeting." msgstr "" -#: calendar/gui/e-itip-control.c:1277 +#: calendar/gui/e-itip-control.c:1275 msgid "Meeting Update" msgstr "" -#: calendar/gui/e-itip-control.c:1281 +#: calendar/gui/e-itip-control.c:1279 #, c-format msgid "<b>%s</b> wishes to receive the latest meeting information." msgstr "" -#: calendar/gui/e-itip-control.c:1282 +#: calendar/gui/e-itip-control.c:1280 msgid "Meeting Update Request" msgstr "" -#: calendar/gui/e-itip-control.c:1289 +#: calendar/gui/e-itip-control.c:1287 #, c-format msgid "<b>%s</b> has replied to a meeting request." msgstr "" -#: calendar/gui/e-itip-control.c:1290 +#: calendar/gui/e-itip-control.c:1288 msgid "Meeting Reply" msgstr "" -#: calendar/gui/e-itip-control.c:1297 +#: calendar/gui/e-itip-control.c:1295 #, c-format msgid "<b>%s</b> has cancelled a meeting." msgstr "" -#: calendar/gui/e-itip-control.c:1298 +#: calendar/gui/e-itip-control.c:1296 msgid "Meeting Cancellation" msgstr "" -#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372 -#: calendar/gui/e-itip-control.c:1407 +#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370 +#: calendar/gui/e-itip-control.c:1405 #, c-format msgid "<b>%s</b> has sent an unintelligible message." msgstr "" -#: calendar/gui/e-itip-control.c:1306 +#: calendar/gui/e-itip-control.c:1304 msgid "Bad Meeting Message" msgstr "" -#: calendar/gui/e-itip-control.c:1330 +#: calendar/gui/e-itip-control.c:1328 #, c-format msgid "<b>%s</b> has published task information." msgstr "" -#: calendar/gui/e-itip-control.c:1331 +#: calendar/gui/e-itip-control.c:1329 msgid "Task Information" msgstr "" -#: calendar/gui/e-itip-control.c:1336 +#: calendar/gui/e-itip-control.c:1334 #, c-format msgid "<b>%s</b> requests %s to perform a task." msgstr "" -#: calendar/gui/e-itip-control.c:1338 +#: calendar/gui/e-itip-control.c:1336 #, c-format msgid "<b>%s</b> requests you perform a task." msgstr "" -#: calendar/gui/e-itip-control.c:1339 +#: calendar/gui/e-itip-control.c:1337 msgid "Task Proposal" msgstr "" -#: calendar/gui/e-itip-control.c:1343 +#: calendar/gui/e-itip-control.c:1341 #, c-format msgid "<b>%s</b> wishes to add to an existing task." msgstr "" -#: calendar/gui/e-itip-control.c:1344 +#: calendar/gui/e-itip-control.c:1342 msgid "Task Update" msgstr "" -#: calendar/gui/e-itip-control.c:1348 +#: calendar/gui/e-itip-control.c:1346 #, c-format msgid "<b>%s</b> wishes to receive the latest task information." msgstr "" -#: calendar/gui/e-itip-control.c:1349 +#: calendar/gui/e-itip-control.c:1347 msgid "Task Update Request" msgstr "" -#: calendar/gui/e-itip-control.c:1356 +#: calendar/gui/e-itip-control.c:1354 #, c-format msgid "<b>%s</b> has replied to a task assignment." msgstr "" -#: calendar/gui/e-itip-control.c:1357 +#: calendar/gui/e-itip-control.c:1355 msgid "Task Reply" msgstr "" -#: calendar/gui/e-itip-control.c:1364 +#: calendar/gui/e-itip-control.c:1362 #, c-format msgid "<b>%s</b> has cancelled a task." msgstr "" -#: calendar/gui/e-itip-control.c:1365 +#: calendar/gui/e-itip-control.c:1363 msgid "Task Cancellation" msgstr "" -#: calendar/gui/e-itip-control.c:1373 +#: calendar/gui/e-itip-control.c:1371 msgid "Bad Task Message" msgstr "" -#: calendar/gui/e-itip-control.c:1392 +#: calendar/gui/e-itip-control.c:1390 #, c-format msgid "<b>%s</b> has published free/busy information." msgstr "" -#: calendar/gui/e-itip-control.c:1393 +#: calendar/gui/e-itip-control.c:1391 msgid "Free/Busy Information" msgstr "" -#: calendar/gui/e-itip-control.c:1397 +#: calendar/gui/e-itip-control.c:1395 #, c-format msgid "<b>%s</b> requests your free/busy information." msgstr "" -#: calendar/gui/e-itip-control.c:1398 +#: calendar/gui/e-itip-control.c:1396 msgid "Free/Busy Request" msgstr "" -#: calendar/gui/e-itip-control.c:1402 +#: calendar/gui/e-itip-control.c:1400 #, c-format msgid "<b>%s</b> has replied to a free/busy request." msgstr "" -#: calendar/gui/e-itip-control.c:1403 +#: calendar/gui/e-itip-control.c:1401 msgid "Free/Busy Reply" msgstr "" -#: calendar/gui/e-itip-control.c:1408 +#: calendar/gui/e-itip-control.c:1406 msgid "Bad Free/Busy Message" msgstr "" -#: calendar/gui/e-itip-control.c:1484 +#: calendar/gui/e-itip-control.c:1482 msgid "The message does not appear to be properly formed" msgstr "" -#: calendar/gui/e-itip-control.c:1552 +#: calendar/gui/e-itip-control.c:1550 msgid "The message contains only unsupported requests." msgstr "" -#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589 +#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587 msgid "The attachment does not contain a valid calendar message" msgstr "" -#: calendar/gui/e-itip-control.c:1614 +#: calendar/gui/e-itip-control.c:1612 msgid "The attachment has no viewable calendar items" msgstr "" -#: calendar/gui/e-itip-control.c:1853 +#: calendar/gui/e-itip-control.c:1851 msgid "Calendar file could not be updated!\n" msgstr "" -#: calendar/gui/e-itip-control.c:1855 +#: calendar/gui/e-itip-control.c:1853 msgid "Update complete\n" msgstr "" -#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957 +#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955 msgid "Attendee status can not be updated because the item no longer exists" msgstr "" -#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939 +#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937 msgid "Object is invalid and cannot be updated\n" msgstr "" -#: calendar/gui/e-itip-control.c:1911 +#: calendar/gui/e-itip-control.c:1909 msgid "This response is not from a current attendee. Add as an attendee?" msgstr "" -#: calendar/gui/e-itip-control.c:1923 +#: calendar/gui/e-itip-control.c:1921 msgid "Attendee status could not be updated because of an invalid status!\n" msgstr "" -#: calendar/gui/e-itip-control.c:1942 +#: calendar/gui/e-itip-control.c:1940 msgid "There was an error on the CORBA system\n" msgstr "" -#: calendar/gui/e-itip-control.c:1945 +#: calendar/gui/e-itip-control.c:1943 msgid "Object could not be found\n" msgstr "" -#: calendar/gui/e-itip-control.c:1948 +#: calendar/gui/e-itip-control.c:1946 #, fuzzy msgid "You don't have the right permissions to update the calendar\n" msgstr "Synchronising \"%s\"" -#: calendar/gui/e-itip-control.c:1951 +#: calendar/gui/e-itip-control.c:1949 msgid "Attendee status updated\n" msgstr "" -#: calendar/gui/e-itip-control.c:1954 +#: calendar/gui/e-itip-control.c:1952 msgid "Attendee status could not be updated!\n" msgstr "" -#: calendar/gui/e-itip-control.c:1992 +#: calendar/gui/e-itip-control.c:1990 msgid "Removal Complete" msgstr "" -#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074 +#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072 msgid "Item sent!\n" msgstr "" -#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078 +#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076 msgid "The item could not be sent!\n" msgstr "" @@ -5535,7 +5862,7 @@ msgstr "%a %d/%m/%Y" #. This is a strftime() format string %m = month number, #. %d = month day, %Y = full year. #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238 -#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607 +#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606 msgid "%m/%d/%Y" msgstr "%d/%m/%Y" @@ -5599,95 +5926,81 @@ msgstr "" msgid "Meeting _end time:" msgstr "" -#: calendar/gui/e-tasks.c:179 +#: calendar/gui/e-tasks.c:181 #, fuzzy msgid "Start Date:" msgstr "Organisation:" -#: calendar/gui/e-tasks.c:195 +#: calendar/gui/e-tasks.c:197 #, fuzzy msgid "Due Date:" msgstr "Organisation:" #. write priority -#: calendar/gui/e-tasks.c:223 +#: calendar/gui/e-tasks.c:225 msgid "Priority:" msgstr "" #. URL -#: calendar/gui/e-tasks.c:279 +#: calendar/gui/e-tasks.c:281 msgid "Web Page:" msgstr "" -#: calendar/gui/e-tasks.c:715 -#, c-format -msgid "Opening tasks at %s" -msgstr "" - -#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199 +#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200 #, c-format msgid "Could not load the tasks in `%s'" msgstr "" -#: calendar/gui/e-tasks.c:779 +#: calendar/gui/e-tasks.c:725 #, c-format msgid "The method required to load `%s' is not supported" msgstr "" -#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766 +#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765 #, fuzzy, c-format msgid "You don't have permission to open the folder in `%s'" msgstr "Synchronising \"%s\"" -#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981 +#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979 #, c-format msgid "" "Error on %s:\n" " %s" msgstr "" -#: calendar/gui/e-tasks.c:904 +#: calendar/gui/e-tasks.c:958 msgid "Completing tasks..." msgstr "" -#: calendar/gui/e-tasks.c:927 +#: calendar/gui/e-tasks.c:981 msgid "Deleting selected objects..." msgstr "" -#: calendar/gui/e-tasks.c:967 +#: calendar/gui/e-tasks.c:1006 msgid "Expunging" msgstr "" -#: calendar/gui/e-tasks.c:1032 -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 -#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487 -#: calendar/importers/icalendar-importer.c:713 -#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183 +#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843 #: shell/e-shortcuts.c:1086 -msgid "Tasks" -msgstr "" - -#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843 -#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085 msgid "Calendar" msgstr "" -#: calendar/gui/gnome-cal.c:1738 +#: calendar/gui/gnome-cal.c:1737 #, c-format msgid "Could not open the folder in `%s'" msgstr "" -#: calendar/gui/gnome-cal.c:1752 +#: calendar/gui/gnome-cal.c:1751 #, c-format msgid "The method required to open `%s' is not supported" msgstr "" -#: calendar/gui/gnome-cal.c:1809 +#: calendar/gui/gnome-cal.c:1808 #, fuzzy, c-format msgid "Adding alarms for %s" msgstr "Synchronising \"%s\"" -#: calendar/gui/gnome-cal.c:2002 +#: calendar/gui/gnome-cal.c:2000 #, c-format msgid "" "The task backend for\n" @@ -5695,7 +6008,7 @@ msgid "" " has crashed. You will have to restart Evolution in order to use it again" msgstr "" -#: calendar/gui/gnome-cal.c:2010 +#: calendar/gui/gnome-cal.c:2008 #, c-format msgid "" "The calendar backend for\n" @@ -5703,61 +6016,10 @@ msgid "" " has crashed. You will have to restart Evolution in order to use it again" msgstr "" -#: calendar/gui/gnome-cal.c:2902 +#: calendar/gui/gnome-cal.c:2848 msgid "Purging" msgstr "" -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1 -msgid "Calendar and Tasks" -msgstr "" - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2 -#, fuzzy -msgid "Calendars" -msgstr "Colours" - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3 -msgid "Configure your timezone, Calendar and Task List here " -msgstr "" - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4 -#, fuzzy -msgid "Evolution Calendar and Tasks" -msgstr "Cannot initialise the Evolution shell." - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5 -#, fuzzy -msgid "Evolution Calendar configuration control" -msgstr "Cannot initialise Evolution's mail component." - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6 -msgid "Evolution Calendar scheduling message viewer" -msgstr "" - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7 -#, fuzzy -msgid "Evolution Calendar viewer" -msgstr "Cannot initialise the Evolution shell." - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8 -msgid "Evolution Calendar/Task editor" -msgstr "" - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9 -#, fuzzy -msgid "Evolution Tasks viewer" -msgstr "Cannot initialise the Evolution shell." - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10 -#, fuzzy -msgid "Evolution's Calendar component" -msgstr "Cannot initialise Evolution's mail summary component." - -#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11 -#, fuzzy -msgid "Evolution's Tasks component" -msgstr "Cannot initialise Evolution's mail component." - #: calendar/gui/goto-dialog.glade.h:1 msgid "April" msgstr "" @@ -5814,296 +6076,331 @@ msgstr "" msgid "September" msgstr "" -#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316 -#: calendar/gui/itip-utils.c:348 +#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315 +#: calendar/gui/itip-utils.c:347 msgid "An organizer must be set." msgstr "" -#: calendar/gui/itip-utils.c:303 +#: calendar/gui/itip-utils.c:302 msgid "At least one attendee is necessary" msgstr "" -#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500 +#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499 msgid "Event information" msgstr "" -#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502 +#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501 msgid "Task information" msgstr "" -#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504 +#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503 msgid "Journal information" msgstr "" -#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522 +#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521 msgid "Free/Busy information" msgstr "" -#: calendar/gui/itip-utils.c:399 +#: calendar/gui/itip-utils.c:398 msgid "Calendar information" msgstr "" -#: calendar/gui/itip-utils.c:435 +#: calendar/gui/itip-utils.c:434 msgid "Updated" msgstr "" -#: calendar/gui/itip-utils.c:443 +#: calendar/gui/itip-utils.c:442 msgid "Refresh" msgstr "" -#: calendar/gui/itip-utils.c:447 +#: calendar/gui/itip-utils.c:446 msgid "Counter-proposal" msgstr "" -#: calendar/gui/itip-utils.c:518 +#: calendar/gui/itip-utils.c:517 #, c-format msgid "Free/Busy information (%s to %s)" msgstr "" -#: calendar/gui/itip-utils.c:528 +#: calendar/gui/itip-utils.c:527 msgid "iCalendar information" msgstr "" -#: calendar/gui/itip-utils.c:668 +#: calendar/gui/itip-utils.c:667 msgid "You must be an attendee of the event." msgstr "" -#: calendar/gui/print.c:477 +#: calendar/gui/print.c:476 msgid "1st" msgstr "" -#: calendar/gui/print.c:477 +#: calendar/gui/print.c:476 msgid "2nd" msgstr "" -#: calendar/gui/print.c:477 +#: calendar/gui/print.c:476 msgid "3rd" msgstr "" -#: calendar/gui/print.c:477 +#: calendar/gui/print.c:476 msgid "4th" msgstr "" -#: calendar/gui/print.c:477 +#: calendar/gui/print.c:476 msgid "5th" msgstr "" -#: calendar/gui/print.c:478 +#: calendar/gui/print.c:477 msgid "6th" msgstr "" -#: calendar/gui/print.c:478 +#: calendar/gui/print.c:477 msgid "7th" msgstr "" -#: calendar/gui/print.c:478 +#: calendar/gui/print.c:477 msgid "8th" msgstr "" -#: calendar/gui/print.c:478 +#: calendar/gui/print.c:477 msgid "9th" msgstr "" -#: calendar/gui/print.c:478 +#: calendar/gui/print.c:477 msgid "10th" msgstr "" -#: calendar/gui/print.c:479 +#: calendar/gui/print.c:478 msgid "11th" msgstr "" -#: calendar/gui/print.c:479 +#: calendar/gui/print.c:478 msgid "12th" msgstr "" -#: calendar/gui/print.c:479 +#: calendar/gui/print.c:478 msgid "13th" msgstr "" -#: calendar/gui/print.c:479 +#: calendar/gui/print.c:478 msgid "14th" msgstr "" -#: calendar/gui/print.c:479 +#: calendar/gui/print.c:478 msgid "15th" msgstr "" -#: calendar/gui/print.c:480 +#: calendar/gui/print.c:479 msgid "16th" msgstr "" -#: calendar/gui/print.c:480 +#: calendar/gui/print.c:479 msgid "17th" msgstr "" -#: calendar/gui/print.c:480 +#: calendar/gui/print.c:479 msgid "18th" msgstr "" -#: calendar/gui/print.c:480 +#: calendar/gui/print.c:479 msgid "19th" msgstr "" -#: calendar/gui/print.c:480 +#: calendar/gui/print.c:479 msgid "20th" msgstr "" -#: calendar/gui/print.c:481 +#: calendar/gui/print.c:480 msgid "21st" msgstr "" -#: calendar/gui/print.c:481 +#: calendar/gui/print.c:480 msgid "22nd" msgstr "" -#: calendar/gui/print.c:481 +#: calendar/gui/print.c:480 msgid "23rd" msgstr "" -#: calendar/gui/print.c:481 +#: calendar/gui/print.c:480 msgid "24th" msgstr "" -#: calendar/gui/print.c:481 +#: calendar/gui/print.c:480 msgid "25th" msgstr "" -#: calendar/gui/print.c:482 +#: calendar/gui/print.c:481 msgid "26th" msgstr "" -#: calendar/gui/print.c:482 +#: calendar/gui/print.c:481 msgid "27th" msgstr "" -#: calendar/gui/print.c:482 +#: calendar/gui/print.c:481 msgid "28th" msgstr "" -#: calendar/gui/print.c:482 +#: calendar/gui/print.c:481 msgid "29th" msgstr "" -#: calendar/gui/print.c:482 +#: calendar/gui/print.c:481 msgid "30th" msgstr "" -#: calendar/gui/print.c:483 +#: calendar/gui/print.c:482 msgid "31st" msgstr "" -#: calendar/gui/print.c:557 +#: calendar/gui/print.c:556 msgid "Su" msgstr "" -#: calendar/gui/print.c:557 +#: calendar/gui/print.c:556 msgid "Mo" msgstr "" -#: calendar/gui/print.c:557 +#: calendar/gui/print.c:556 msgid "Tu" msgstr "" -#: calendar/gui/print.c:557 +#: calendar/gui/print.c:556 msgid "We" msgstr "" -#: calendar/gui/print.c:558 +#: calendar/gui/print.c:557 msgid "Th" msgstr "" -#: calendar/gui/print.c:558 +#: calendar/gui/print.c:557 msgid "Fr" msgstr "" -#: calendar/gui/print.c:558 +#: calendar/gui/print.c:557 msgid "Sa" msgstr "" #. Day -#: calendar/gui/print.c:1892 +#: calendar/gui/print.c:1891 msgid "Selected day (%a %b %d %Y)" msgstr "" -#: calendar/gui/print.c:1917 calendar/gui/print.c:1921 +#: calendar/gui/print.c:1916 calendar/gui/print.c:1920 msgid "%a %b %d" msgstr "" -#: calendar/gui/print.c:1918 +#: calendar/gui/print.c:1917 msgid "%a %d %Y" msgstr "" -#: calendar/gui/print.c:1922 calendar/gui/print.c:1924 -#: calendar/gui/print.c:1925 +#: calendar/gui/print.c:1921 calendar/gui/print.c:1923 +#: calendar/gui/print.c:1924 msgid "%a %b %d %Y" msgstr "" -#: calendar/gui/print.c:1929 +#: calendar/gui/print.c:1928 #, c-format msgid "Selected week (%s - %s)" msgstr "" #. Month -#: calendar/gui/print.c:1937 +#: calendar/gui/print.c:1936 msgid "Selected month (%b %Y)" msgstr "" #. Year -#: calendar/gui/print.c:1944 +#: calendar/gui/print.c:1943 msgid "Selected year (%Y)" msgstr "" -#: calendar/gui/print.c:2269 +#: calendar/gui/print.c:2268 msgid "Task" msgstr "" -#: calendar/gui/print.c:2328 +#: calendar/gui/print.c:2327 #, c-format msgid "Status: %s" msgstr "" -#: calendar/gui/print.c:2345 +#: calendar/gui/print.c:2344 #, c-format msgid "Priority: %s" msgstr "" -#: calendar/gui/print.c:2357 +#: calendar/gui/print.c:2356 #, c-format msgid "Percent Complete: %i" msgstr "" -#: calendar/gui/print.c:2369 +#: calendar/gui/print.c:2368 #, c-format msgid "URL: %s" msgstr "" -#: calendar/gui/print.c:2383 +#: calendar/gui/print.c:2382 #, c-format msgid "Categories: %s" msgstr "" -#: calendar/gui/print.c:2394 +#: calendar/gui/print.c:2393 msgid "Contacts: " msgstr "" -#: calendar/gui/print.c:2532 calendar/gui/print.c:2618 -#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147 +#: calendar/gui/print.c:2531 calendar/gui/print.c:2617 +#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147 msgid "Print Preview" msgstr "" -#: calendar/gui/print.c:2566 +#: calendar/gui/print.c:2565 msgid "Print Item" msgstr "" -#: calendar/gui/print.c:2639 +#: calendar/gui/print.c:2638 msgid "Print Setup" msgstr "" +#: calendar/gui/tasks-component.c:338 +#, c-format +msgid "Task List '%s' will be removed. Are you sure you want to continue?" +msgstr "" + +#: calendar/gui/tasks-component.c:378 +msgid "Rename this task list to" +msgstr "" + +#: calendar/gui/tasks-component.c:398 +#, fuzzy +msgid "New Task List" +msgstr "Organisation:" + +#: calendar/gui/tasks-component.c:590 +msgid "New task" +msgstr "" + +#: calendar/gui/tasks-component.c:591 +msgid "_Task" +msgstr "" + +#: calendar/gui/tasks-component.c:592 +msgid "Create a new task" +msgstr "" + +#: calendar/gui/tasks-component.c:659 +#, c-format +msgid "Unable to open the task list '%s' for creating events and meetings" +msgstr "" + +#: calendar/gui/tasks-component.c:671 +msgid "There is no calendar available for creating tasks" +msgstr "" + #: calendar/gui/tasks-control.c:148 msgid "The URI of the tasks folder to display" msgstr "" -#: calendar/gui/tasks-control.c:448 +#: calendar/gui/tasks-control.c:447 msgid "" "This operation will permanently erase all tasks marked as completed. If you " "continue, you will not be able to recover these tasks.\n" @@ -6111,11 +6408,11 @@ msgid "" "Really erase these tasks?" msgstr "" -#: calendar/gui/tasks-control.c:451 +#: calendar/gui/tasks-control.c:450 msgid "Do not ask me again." msgstr "" -#: calendar/gui/tasks-control.c:593 +#: calendar/gui/tasks-control.c:592 msgid "Print Tasks" msgstr "" @@ -6146,21 +6443,21 @@ msgstr "" msgid "vCalendar files (.vcf)" msgstr "" -#: calendar/importers/icalendar-importer.c:466 +#: calendar/importers/icalendar-importer.c:469 msgid "Reminder!!" msgstr "" -#: calendar/importers/icalendar-importer.c:706 +#: calendar/importers/icalendar-importer.c:709 msgid "Calendar Events" msgstr "" -#: calendar/importers/icalendar-importer.c:731 +#: calendar/importers/icalendar-importer.c:734 msgid "" "Evolution has found Gnome Calendar files.\n" "Would you like to import them into Evolution?" msgstr "" -#: calendar/importers/icalendar-importer.c:738 +#: calendar/importers/icalendar-importer.c:741 msgid "Gnome Calendar" msgstr "" @@ -7694,27 +7991,27 @@ msgstr "" msgid "Pacific/Yap" msgstr "" -#: camel/camel-cipher-context.c:99 +#: camel/camel-cipher-context.c:101 msgid "Signing is not supported by this cipher" msgstr "" -#: camel/camel-cipher-context.c:139 +#: camel/camel-cipher-context.c:140 msgid "Verifying is not supported by this cipher" msgstr "" -#: camel/camel-cipher-context.c:181 +#: camel/camel-cipher-context.c:180 msgid "Encryption is not supported by this cipher" msgstr "" -#: camel/camel-cipher-context.c:220 +#: camel/camel-cipher-context.c:219 msgid "Decryption is not supported by this cipher" msgstr "" -#: camel/camel-cipher-context.c:256 +#: camel/camel-cipher-context.c:254 msgid "You may not import keys with this cipher" msgstr "" -#: camel/camel-cipher-context.c:286 +#: camel/camel-cipher-context.c:284 msgid "You may not export keys with this cipher" msgstr "" @@ -7760,88 +8057,88 @@ msgstr "Synchronising \"%s\"" msgid "You must be working online to complete this operation" msgstr "" -#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511 +#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513 #: camel/camel-process.c:48 #, fuzzy, c-format msgid "Failed to create pipe to '%s': %s" msgstr "Synchronising \"%s\"" -#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551 -#: camel/camel-process.c:92 +#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549 +#: camel/camel-process.c:90 #, fuzzy, c-format msgid "Failed to create create child process '%s': %s" msgstr "Synchronising \"%s\"" -#: camel/camel-filter-driver.c:759 +#: camel/camel-filter-driver.c:754 #, fuzzy, c-format msgid "Invalid message stream received from %s: %s" msgstr "Synchronising \"%s\"" -#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949 +#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943 #, fuzzy msgid "Syncing folders" msgstr "Synchronising \"%s\"" -#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411 +#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405 #, c-format msgid "Error parsing filter: %s: %s" msgstr "" -#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417 +#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411 #, c-format msgid "Error executing filter: %s: %s" msgstr "" -#: camel/camel-filter-driver.c:1114 +#: camel/camel-filter-driver.c:1108 msgid "Unable to open spool folder" msgstr "" -#: camel/camel-filter-driver.c:1123 +#: camel/camel-filter-driver.c:1117 msgid "Unable to process spool folder" msgstr "" -#: camel/camel-filter-driver.c:1138 +#: camel/camel-filter-driver.c:1132 #, c-format msgid "Getting message %d (%d%%)" msgstr "" -#: camel/camel-filter-driver.c:1142 +#: camel/camel-filter-driver.c:1136 msgid "Cannot open message" msgstr "" -#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155 +#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149 #, c-format msgid "Failed on message %d" msgstr "" -#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263 +#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257 #, fuzzy msgid "Syncing folder" msgstr "Synchronising \"%s\"" -#: camel/camel-filter-driver.c:1230 +#: camel/camel-filter-driver.c:1224 #, c-format msgid "Getting message %d of %d" msgstr "" -#: camel/camel-filter-driver.c:1245 +#: camel/camel-filter-driver.c:1239 #, c-format msgid "Failed at message %d of %d" msgstr "" -#: camel/camel-filter-search.c:134 +#: camel/camel-filter-search.c:136 msgid "Failed to retrieve message" msgstr "" -#: camel/camel-filter-search.c:384 +#: camel/camel-filter-search.c:386 msgid "Invalid arguments to (system-flag)" msgstr "" -#: camel/camel-filter-search.c:399 +#: camel/camel-filter-search.c:401 msgid "Invalid arguments to (user-tag)" msgstr "" -#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665 +#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678 #, c-format msgid "Error executing filter search: %s: %s" msgstr "" @@ -7869,34 +8166,34 @@ msgstr "" msgid "Performing query on unknown header: %s" msgstr "" -#: camel/camel-folder.c:585 +#: camel/camel-folder.c:586 #, c-format msgid "Unsupported operation: append message: for %s" msgstr "" -#: camel/camel-folder.c:1163 +#: camel/camel-folder.c:1164 #, c-format msgid "Unsupported operation: search by expression: for %s" msgstr "" -#: camel/camel-folder.c:1203 +#: camel/camel-folder.c:1204 #, c-format msgid "Unsupported operation: search by uids: for %s" msgstr "" -#: camel/camel-folder.c:1321 +#: camel/camel-folder.c:1322 msgid "Moving messages" msgstr "" -#: camel/camel-folder.c:1321 +#: camel/camel-folder.c:1322 msgid "Copying messages" msgstr "" -#: camel/camel-folder.c:1571 +#: camel/camel-folder.c:1572 msgid "Filtering new message(s)" msgstr "" -#: camel/camel-gpg-context.c:696 +#: camel/camel-gpg-context.c:703 #, c-format msgid "" "Unexpected GnuPG status message encountered:\n" @@ -7904,45 +8201,45 @@ msgid "" "%s" msgstr "" -#: camel/camel-gpg-context.c:710 +#: camel/camel-gpg-context.c:717 msgid "Failed to parse gpg userid hint." msgstr "" -#: camel/camel-gpg-context.c:735 +#: camel/camel-gpg-context.c:742 msgid "Failed to parse gpg passphrase request." msgstr "" -#: camel/camel-gpg-context.c:743 +#: camel/camel-gpg-context.c:750 #, c-format msgid "" "You need a passphrase to unlock the key for\n" "user: \"%s\"" msgstr "" -#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253 -#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465 -#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575 +#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260 +#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497 +#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572 msgid "Cancelled." msgstr "" -#: camel/camel-gpg-context.c:781 +#: camel/camel-gpg-context.c:788 msgid "Failed to unlock secret key: 3 bad passphrases given." msgstr "" -#: camel/camel-gpg-context.c:787 +#: camel/camel-gpg-context.c:794 #, c-format msgid "Unexpected response from GnuPG: %s" msgstr "" -#: camel/camel-gpg-context.c:799 +#: camel/camel-gpg-context.c:806 msgid "No data provided" msgstr "" -#: camel/camel-gpg-context.c:837 +#: camel/camel-gpg-context.c:844 msgid "Failed to encrypt: No valid recipients specified." msgstr "" -#: camel/camel-gpg-context.c:1114 +#: camel/camel-gpg-context.c:1121 #, fuzzy, c-format msgid "" "Failed to GPG %s: %s\n" @@ -7950,48 +8247,58 @@ msgid "" "%s" msgstr "Synchronising \"%s\"" -#: camel/camel-gpg-context.c:1119 +#: camel/camel-gpg-context.c:1126 #, fuzzy, c-format msgid "Failed to GPG %s: %s\n" msgstr "Synchronising \"%s\"" -#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351 +#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406 #, fuzzy, c-format msgid "Could not generate signing data: %s" msgstr "Synchronising \"%s\"" -#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618 -#: camel/camel-gpg-context.c:1669 +#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653 +#: camel/camel-gpg-context.c:1704 #, fuzzy, c-format msgid "Failed to execute gpg: %s" msgstr "Synchronising \"%s\"" -#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380 -#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481 -#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587 -#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691 +#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409 +#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513 +#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621 +#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726 msgid "Failed to execute gpg." msgstr "" -#: camel/camel-gpg-context.c:1289 +#: camel/camel-gpg-context.c:1296 msgid "This is a digitally signed message part" msgstr "" -#: camel/camel-gpg-context.c:1365 +#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385 +#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712 +#: camel/camel-smime-context.c:719 +msgid "Cannot verify message signature: Incorrect message format" +msgstr "" + +#: camel/camel-gpg-context.c:1392 #, c-format msgid "Cannot verify message signature: could not create temp file: %s" msgstr "" -#: camel/camel-gpg-context.c:1441 +#: camel/camel-gpg-context.c:1473 #, fuzzy, c-format msgid "Could not generate encrypting data: %s" msgstr "Synchronising \"%s\"" -#: camel/camel-gpg-context.c:1499 +#: camel/camel-gpg-context.c:1531 msgid "This is a digitally encrypted message part" msgstr "" -#: camel/camel-gpg-context.c:1595 +#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974 +msgid "Encrypted content" +msgstr "" + +#: camel/camel-gpg-context.c:1632 #, fuzzy msgid "Unable to parse message content" msgstr "Synchronising \"%s\"" @@ -8090,15 +8397,15 @@ msgstr "" msgid "Error copying mail temp file: %s" msgstr "" -#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243 +#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244 msgid "Failed to decrypt MIME part: protocol error" msgstr "" -#: camel/camel-multipart-encrypted.c:256 +#: camel/camel-multipart-encrypted.c:257 msgid "Failed to decrypt MIME part: invalid structure" msgstr "" -#: camel/camel-multipart-signed.c:687 +#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724 msgid "parse error" msgstr "" @@ -8395,77 +8702,87 @@ msgstr "" msgid "For reading mail as a query of another set of folders" msgstr "" -#: camel/camel-session.c:350 camel/camel-session.c:400 +#: camel/camel-session.c:352 camel/camel-session.c:402 #, c-format msgid "No provider available for protocol `%s'" msgstr "" -#: camel/camel-session.c:523 +#: camel/camel-session.c:525 #, c-format msgid "" "Could not create directory %s:\n" "%s" msgstr "" -#: camel/camel-smime-context.c:167 +#: camel/camel-smime-context.c:96 #, c-format msgid "Enter security pass-phrase for `%s'" msgstr "" -#: camel/camel-smime-context.c:446 +#: camel/camel-smime-context.c:501 msgid "Unverified" msgstr "" -#: camel/camel-smime-context.c:448 +#: camel/camel-smime-context.c:503 msgid "Good signature" msgstr "" -#: camel/camel-smime-context.c:450 +#: camel/camel-smime-context.c:505 msgid "Bad signature" msgstr "" -#: camel/camel-smime-context.c:452 +#: camel/camel-smime-context.c:507 msgid "Content tampered with or altered in transit" msgstr "" -#: camel/camel-smime-context.c:454 +#: camel/camel-smime-context.c:509 msgid "Signing certificate not found" msgstr "" -#: camel/camel-smime-context.c:456 +#: camel/camel-smime-context.c:511 msgid "Signing certificate not trusted" msgstr "" -#: camel/camel-smime-context.c:458 +#: camel/camel-smime-context.c:513 msgid "Signature algorithm unknown" msgstr "" -#: camel/camel-smime-context.c:460 +#: camel/camel-smime-context.c:515 msgid "Siganture algorithm unsupported" msgstr "" -#: camel/camel-smime-context.c:462 +#: camel/camel-smime-context.c:517 msgid "Malformed signature" msgstr "" -#: camel/camel-smime-context.c:464 +#: camel/camel-smime-context.c:519 msgid "Processing error" msgstr "" -#: camel/camel-smime-context.c:593 +#: camel/camel-smime-context.c:634 #, c-format msgid "Signer: %s <%s>: %s\n" msgstr "" -#: camel/camel-store.c:212 +#: camel/camel-store.c:217 #, fuzzy msgid "Cannot get folder: Invalid operation on this store" msgstr "Synchronising \"%s\"" -#: camel/camel-store.c:266 +#: camel/camel-store.c:273 msgid "Cannot create folder: Invalid operation on this store" msgstr "" +#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842 +#: mail/mail-ops.c:1119 +msgid "Trash" +msgstr "" + +#: camel/camel-store.c:793 mail/mail-ops.c:1125 +#: ui/evolution-mail-message.xml.h:46 +msgid "Junk" +msgstr "" + #: camel/camel-tcp-stream-openssl.c:568 msgid "Unable to get issuer's certificate" msgstr "" @@ -8650,7 +8967,7 @@ msgid "" "Issuer: %s" msgstr "" -#: camel/camel-url.c:290 mail/mail-tools.c:146 +#: camel/camel-url.c:290 mail/mail-tools.c:138 #, c-format msgid "Could not parse URL `%s'" msgstr "" @@ -8669,22 +8986,22 @@ msgstr "" msgid "Cannot copy or move messages into a Virtual Folder" msgstr "" -#: camel/camel-vee-store.c:261 +#: camel/camel-vee-store.c:278 #, fuzzy, c-format msgid "Cannot delete folder: %s: Invalid operation" msgstr "Synchronising \"%s\"" -#: camel/camel-vee-store.c:280 +#: camel/camel-vee-store.c:299 #, fuzzy, c-format msgid "Cannot delete folder: %s: No such folder" msgstr "Synchronising \"%s\"" -#: camel/camel-vee-store.c:293 +#: camel/camel-vee-store.c:312 #, fuzzy, c-format msgid "Cannot rename folder: %s: Invalid operation" msgstr "Synchronising \"%s\"" -#: camel/camel-vee-store.c:301 +#: camel/camel-vee-store.c:320 #, fuzzy, c-format msgid "Cannot rename folder: %s: No such folder" msgstr "Synchronising \"%s\"" @@ -8762,7 +9079,7 @@ msgstr "Synchronising \"%s\"" #: camel/providers/local/camel-maildir-folder.c:211 #: camel/providers/local/camel-maildir-folder.c:224 #: camel/providers/local/camel-maildir-folder.c:233 -#: camel/providers/local/camel-mbox-folder.c:422 +#: camel/providers/local/camel-mbox-folder.c:417 #: camel/providers/local/camel-mh-folder.c:200 #: camel/providers/local/camel-mh-folder.c:210 #: camel/providers/local/camel-mh-folder.c:219 @@ -8774,7 +9091,7 @@ msgstr "" #: camel/providers/imap/camel-imap-folder.c:1923 #: camel/providers/local/camel-maildir-folder.c:211 -#: camel/providers/local/camel-mbox-folder.c:422 +#: camel/providers/local/camel-mbox-folder.c:417 #: camel/providers/local/camel-mh-folder.c:200 msgid "No such message" msgstr "" @@ -8812,53 +9129,68 @@ msgid "Failed to cache %s: %s" msgstr "Synchronising \"%s\"" #: camel/providers/imap/camel-imap-provider.c:43 +#, fuzzy +msgid "Connection to Server" +msgstr "Synchronise \"%s\"" + +#: camel/providers/imap/camel-imap-provider.c:45 +#, fuzzy +msgid "Use custom command to connect to server" +msgstr "Synchronising \"%s\"" + +#: camel/providers/imap/camel-imap-provider.c:47 +#, fuzzy +msgid "Command:" +msgstr "Colours" + +#: camel/providers/imap/camel-imap-provider.c:50 msgid "Checking for new mail" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:45 +#: camel/providers/imap/camel-imap-provider.c:52 msgid "Check for new messages in all folders" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178 +#: camel/providers/imap/camel-imap-provider.c:55 msgid "Folders" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:50 +#: camel/providers/imap/camel-imap-provider.c:57 msgid "Show only subscribed folders" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:52 +#: camel/providers/imap/camel-imap-provider.c:59 msgid "Override server-supplied folder namespace" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:54 +#: camel/providers/imap/camel-imap-provider.c:61 msgid "Namespace" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:57 +#: camel/providers/imap/camel-imap-provider.c:64 msgid "Apply filters to new messages in INBOX on this server" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:59 +#: camel/providers/imap/camel-imap-provider.c:66 msgid "Automatically synchronize remote mail locally" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:65 +#: camel/providers/imap/camel-imap-provider.c:72 msgid "IMAP" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:67 +#: camel/providers/imap/camel-imap-provider.c:74 msgid "For reading and storing mail on IMAP servers." msgstr "" -#: camel/providers/imap/camel-imap-provider.c:82 +#: camel/providers/imap/camel-imap-provider.c:89 #: camel/providers/imapp/camel-imapp-provider.c:65 #: camel/providers/nntp/camel-nntp-store.c:265 -#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82 +#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85 msgid "Password" msgstr "" -#: camel/providers/imap/camel-imap-provider.c:84 +#: camel/providers/imap/camel-imap-provider.c:91 #: camel/providers/imapp/camel-imapp-provider.c:67 msgid "This option will connect to the IMAP server using a plaintext password." msgstr "" @@ -9099,7 +9431,7 @@ msgid "Could not rename folder %s to %s: %s" msgstr "" #: camel/providers/local/camel-local-store.c:364 -#: camel/providers/local/camel-mbox-store.c:474 +#: camel/providers/local/camel-mbox-store.c:475 #, fuzzy, c-format msgid "Could not rename '%s': %s" msgstr "Synchronising \"%s\"" @@ -9211,40 +9543,40 @@ msgstr "" msgid "Storing folder" msgstr "Synchronising \"%s\"" -#: camel/providers/local/camel-mbox-folder.c:230 +#: camel/providers/local/camel-mbox-folder.c:225 #: camel/providers/local/camel-spool-folder.c:148 #, c-format msgid "Cannot create folder lock on %s: %s" msgstr "" -#: camel/providers/local/camel-mbox-folder.c:289 +#: camel/providers/local/camel-mbox-folder.c:284 #, c-format msgid "Cannot open mailbox: %s: %s\n" msgstr "" -#: camel/providers/local/camel-mbox-folder.c:349 +#: camel/providers/local/camel-mbox-folder.c:344 msgid "Mail append cancelled" msgstr "" -#: camel/providers/local/camel-mbox-folder.c:352 +#: camel/providers/local/camel-mbox-folder.c:347 #, c-format msgid "Cannot append message to mbox file: %s: %s" msgstr "" -#: camel/providers/local/camel-mbox-folder.c:440 -#: camel/providers/local/camel-mbox-folder.c:471 -#: camel/providers/local/camel-mbox-folder.c:479 +#: camel/providers/local/camel-mbox-folder.c:435 +#: camel/providers/local/camel-mbox-folder.c:466 +#: camel/providers/local/camel-mbox-folder.c:474 #, c-format msgid "" "Cannot get message: %s from folder %s\n" " %s" msgstr "" -#: camel/providers/local/camel-mbox-folder.c:472 +#: camel/providers/local/camel-mbox-folder.c:467 msgid "The folder appears to be irrecoverably corrupted." msgstr "" -#: camel/providers/local/camel-mbox-folder.c:480 +#: camel/providers/local/camel-mbox-folder.c:475 msgid "Message construction failed: Corrupt mailbox?" msgstr "" @@ -9304,12 +9636,16 @@ msgstr "Synchronising \"%s\"" msgid "Cannot create folder: %s: %s" msgstr "Synchronising \"%s\"" -#: camel/providers/local/camel-mbox-store.c:408 +#: camel/providers/local/camel-mbox-store.c:340 +msgid "Folder already exists" +msgstr "" + +#: camel/providers/local/camel-mbox-store.c:409 #, fuzzy, c-format msgid "Could not rename %s to %s: %s" msgstr "Synchronising \"%s\"" -#: camel/providers/local/camel-mbox-store.c:427 +#: camel/providers/local/camel-mbox-store.c:428 msgid "The new folder name is illegal." msgstr "" @@ -9352,7 +9688,7 @@ msgstr "" msgid "Could not close temp folder: %s" msgstr "" -#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885 +#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285 #, c-format msgid "Could not rename folder: %s" msgstr "" @@ -9631,7 +9967,7 @@ msgstr "" msgid "Disable support for all POP3 extensions" msgstr "" -#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81 +#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84 msgid "POP" msgstr "" @@ -9711,7 +10047,7 @@ msgid "No such folder `%s'." msgstr "" #: camel/providers/sendmail/camel-sendmail-provider.c:36 -#: mail/mail-config.glade.h:106 +#: mail/mail-config.glade.h:109 msgid "Sendmail" msgstr "" @@ -9763,7 +10099,7 @@ msgstr "" msgid "Mail delivery via the sendmail program" msgstr "" -#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98 +#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101 msgid "SMTP" msgstr "" @@ -9926,7 +10262,7 @@ msgstr "" msgid "Cannot send message: sender address not valid." msgstr "" -#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635 +#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632 msgid "Sending message" msgstr "" @@ -10047,7 +10383,7 @@ msgstr "" msgid "%.0fG" msgstr "" -#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375 +#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380 msgid "attachment" msgstr "" @@ -10091,11 +10427,11 @@ msgstr "" msgid "Suggest automatic display of attachment" msgstr "" -#: composer/e-msg-composer-hdrs.c:289 +#: composer/e-msg-composer-hdrs.c:287 msgid "You need to configure an account before you can compose mail." msgstr "" -#: composer/e-msg-composer-hdrs.c:482 +#: composer/e-msg-composer-hdrs.c:480 msgid "Click here for the address book" msgstr "" @@ -10106,45 +10442,45 @@ msgstr "" #. * because that causes from_changed to be called, which #. * expects the reply_to fields to be initialized. #. -#: composer/e-msg-composer-hdrs.c:513 +#: composer/e-msg-composer-hdrs.c:510 msgid "Reply-To:" msgstr "" #. #. * From #. -#: composer/e-msg-composer-hdrs.c:519 +#: composer/e-msg-composer-hdrs.c:516 msgid "From:" msgstr "" #. #. * Subject #. -#: composer/e-msg-composer-hdrs.c:525 +#: composer/e-msg-composer-hdrs.c:522 msgid "Subject:" msgstr "" -#: composer/e-msg-composer-hdrs.c:534 +#: composer/e-msg-composer-hdrs.c:531 msgid "To:" msgstr "" -#: composer/e-msg-composer-hdrs.c:535 +#: composer/e-msg-composer-hdrs.c:532 msgid "Enter the recipients of the message" msgstr "" -#: composer/e-msg-composer-hdrs.c:538 +#: composer/e-msg-composer-hdrs.c:535 msgid "Cc:" msgstr "" -#: composer/e-msg-composer-hdrs.c:539 +#: composer/e-msg-composer-hdrs.c:536 msgid "Enter the addresses that will receive a carbon copy of the message" msgstr "" -#: composer/e-msg-composer-hdrs.c:542 +#: composer/e-msg-composer-hdrs.c:539 msgid "Bcc:" msgstr "" -#: composer/e-msg-composer-hdrs.c:543 +#: composer/e-msg-composer-hdrs.c:540 msgid "" "Enter the addresses that will receive a carbon copy of the message without " "appearing in the recipient list of the message." @@ -10153,14 +10489,18 @@ msgstr "" #. #. * Post-To #. -#: composer/e-msg-composer-hdrs.c:550 +#: composer/e-msg-composer-hdrs.c:547 msgid "Post To:" msgstr "" -#: composer/e-msg-composer-hdrs.c:552 +#: composer/e-msg-composer-hdrs.c:548 msgid "Posting destination" msgstr "" +#: composer/e-msg-composer-hdrs.c:548 +msgid "Choose a folder to post the message to." +msgstr "" + #: composer/e-msg-composer-select-file.c:119 msgid "Attach file(s)" msgstr "" @@ -10192,55 +10532,55 @@ msgstr "" msgid "Error saving file: %s" msgstr "" -#: composer/e-msg-composer.c:1203 +#: composer/e-msg-composer.c:1204 #, c-format msgid "Error loading file: %s" msgstr "" -#: composer/e-msg-composer.c:1241 +#: composer/e-msg-composer.c:1242 #, c-format msgid "Error accessing file: %s" msgstr "" -#: composer/e-msg-composer.c:1249 +#: composer/e-msg-composer.c:1250 msgid "Unable to retrieve message from editor" msgstr "" -#: composer/e-msg-composer.c:1256 +#: composer/e-msg-composer.c:1257 #, c-format msgid "" "Unable to seek on file: %s\n" "%s" msgstr "" -#: composer/e-msg-composer.c:1263 +#: composer/e-msg-composer.c:1264 #, c-format msgid "" "Unable to truncate file: %s\n" "%s" msgstr "" -#: composer/e-msg-composer.c:1272 +#: composer/e-msg-composer.c:1273 #, c-format msgid "" "Unable to copy file descriptor: %s\n" "%s" msgstr "" -#: composer/e-msg-composer.c:1281 +#: composer/e-msg-composer.c:1282 #, c-format msgid "" "Error autosaving message: %s\n" " %s" msgstr "" -#: composer/e-msg-composer.c:1378 +#: composer/e-msg-composer.c:1386 msgid "" "Ximian Evolution has found unsaved files from a previous session.\n" "Would you like to try to recover them?" msgstr "" -#: composer/e-msg-composer.c:1541 +#: composer/e-msg-composer.c:1550 #, c-format msgid "" "The message \"%s\" has not been sent.\n" @@ -10248,34 +10588,34 @@ msgid "" "Do you wish to save your changes?" msgstr "" -#: composer/e-msg-composer.c:1550 +#: composer/e-msg-composer.c:1559 msgid "Warning: Modified Message" msgstr "" -#: composer/e-msg-composer.c:1582 +#: composer/e-msg-composer.c:1592 msgid "Open file" msgstr "" -#: composer/e-msg-composer.c:2001 +#: composer/e-msg-composer.c:2011 msgid "Signature:" msgstr "" -#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260 +#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260 msgid "Autogenerated" msgstr "" -#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918 -#: composer/e-msg-composer.c:2919 +#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929 +#: composer/e-msg-composer.c:2930 msgid "Compose a message" msgstr "" -#: composer/e-msg-composer.c:2950 +#: composer/e-msg-composer.c:2961 msgid "" "Could not create composer window:\n" "Unable to activate address selector control." msgstr "" -#: composer/e-msg-composer.c:2980 +#: composer/e-msg-composer.c:2991 msgid "" "Could not create composer window:\n" "Unable to activate HTML editor component.\n" @@ -10283,25 +10623,26 @@ msgid "" "of gtkhtml and libgtkhtml installed.\n" msgstr "" -#: composer/e-msg-composer.c:3050 +#: composer/e-msg-composer.c:3061 msgid "" "Could not create composer window:\n" "Unable to activate HTML editor component." msgstr "" -#: composer/e-msg-composer.c:4060 +#: composer/e-msg-composer.c:4071 msgid "" "<b>(The composer contains a non-text message body, which cannot be edited.)" "<b>" msgstr "" #: data/evolution.desktop.in.in.h:1 -msgid "The Evolution groupware suite" -msgstr "" +#, fuzzy +msgid "The Ximian Evolution Groupware Suite" +msgstr "Cannot initialise the Evolution shell." #: data/evolution.desktop.in.in.h:2 #, fuzzy -msgid "Ximian Evolution" +msgid "Ximian Evolution (Unstable)" msgstr "Cannot initialise the Evolution shell." #: data/evolution.keys.in.h:1 @@ -10550,13 +10891,13 @@ msgstr "" #. strptime format for time of day, without seconds, #. in 12-hour format. #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435 -#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642 +#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641 msgid "%I:%M %p" msgstr "" #. strptime format for time of day, without seconds 24-hour format. #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427 -#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639 +#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638 msgid "%H:%M" msgstr "" @@ -10679,7 +11020,7 @@ msgstr "" msgid "You must specify a folder." msgstr "Synchronising \"%s\"" -#: filter/filter-folder.c:242 filter/vfolder-rule.c:437 +#: filter/filter-folder.c:242 filter/vfolder-rule.c:459 #: mail/mail-account-gui.c:1099 msgid "Select Folder" msgstr "" @@ -10691,24 +11032,24 @@ msgid "" "%s" msgstr "" -#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65 -#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454 +#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63 +#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454 msgid "Important" msgstr "" #. forest green -#: filter/filter-label.c:124 mail/mail-config.c:68 -#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457 +#: filter/filter-label.c:124 mail/mail-config.c:66 +#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457 msgid "To Do" msgstr "" #. blue -#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65 +#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68 #: shell/e-config-upgrade.c:1458 msgid "Later" msgstr "" -#: filter/filter-part.c:531 shell/evolution-test-component.c:63 +#: filter/filter-part.c:531 msgid "Test" msgstr "" @@ -10802,7 +11143,7 @@ msgstr "" msgid "months" msgstr "" -#: filter/filter.glade.h:21 mail/mail-config.glade.h:175 +#: filter/filter.glade.h:21 mail/mail-config.glade.h:181 msgid "seconds" msgstr "" @@ -10899,7 +11240,7 @@ msgstr "" msgid "Follow Up" msgstr "" -#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689 +#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713 msgid "Label" msgstr "" @@ -10970,112 +11311,117 @@ msgid "Source Account" msgstr "" #: filter/libfilter-i18n.h:35 +msgid "Spam" +msgstr "" + +#: filter/libfilter-i18n.h:36 msgid "Specific header" msgstr "" -#: filter/libfilter-i18n.h:37 +#: filter/libfilter-i18n.h:38 msgid "Stop Processing" msgstr "" -#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678 +#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305 +#: smime/lib/e-cert.c:1074 msgid "Subject" msgstr "" -#: filter/libfilter-i18n.h:39 +#: filter/libfilter-i18n.h:40 msgid "Unset Status" msgstr "" -#: filter/libfilter-i18n.h:40 +#: filter/libfilter-i18n.h:41 msgid "contains" msgstr "" -#: filter/libfilter-i18n.h:41 +#: filter/libfilter-i18n.h:42 msgid "does not contain" msgstr "" -#: filter/libfilter-i18n.h:42 +#: filter/libfilter-i18n.h:43 msgid "does not end with" msgstr "" -#: filter/libfilter-i18n.h:43 +#: filter/libfilter-i18n.h:44 msgid "does not exist" msgstr "" -#: filter/libfilter-i18n.h:44 +#: filter/libfilter-i18n.h:45 msgid "does not return" msgstr "" -#: filter/libfilter-i18n.h:45 +#: filter/libfilter-i18n.h:46 msgid "does not sound like" msgstr "" -#: filter/libfilter-i18n.h:46 +#: filter/libfilter-i18n.h:47 msgid "does not start with" msgstr "" -#: filter/libfilter-i18n.h:47 +#: filter/libfilter-i18n.h:48 msgid "ends with" msgstr "" -#: filter/libfilter-i18n.h:48 +#: filter/libfilter-i18n.h:49 msgid "exists" msgstr "" -#: filter/libfilter-i18n.h:49 +#: filter/libfilter-i18n.h:50 msgid "is Flagged" msgstr "" -#: filter/libfilter-i18n.h:50 +#: filter/libfilter-i18n.h:51 msgid "is after" msgstr "" -#: filter/libfilter-i18n.h:51 +#: filter/libfilter-i18n.h:52 msgid "is before" msgstr "" -#: filter/libfilter-i18n.h:52 +#: filter/libfilter-i18n.h:53 msgid "is greater than" msgstr "" -#: filter/libfilter-i18n.h:53 +#: filter/libfilter-i18n.h:54 msgid "is less than" msgstr "" -#: filter/libfilter-i18n.h:54 +#: filter/libfilter-i18n.h:55 msgid "is not Flagged" msgstr "" -#: filter/libfilter-i18n.h:55 +#: filter/libfilter-i18n.h:56 msgid "is not" msgstr "" -#: filter/libfilter-i18n.h:56 +#: filter/libfilter-i18n.h:57 msgid "is" msgstr "" -#: filter/libfilter-i18n.h:57 +#: filter/libfilter-i18n.h:58 msgid "returns greater than" msgstr "" -#: filter/libfilter-i18n.h:58 +#: filter/libfilter-i18n.h:59 msgid "returns less than" msgstr "" -#: filter/libfilter-i18n.h:59 +#: filter/libfilter-i18n.h:60 msgid "returns" msgstr "" -#: filter/libfilter-i18n.h:60 +#: filter/libfilter-i18n.h:61 msgid "sounds like" msgstr "" -#: filter/libfilter-i18n.h:61 +#: filter/libfilter-i18n.h:62 msgid "starts with" msgstr "" #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326 -#: mail/mail-vfolder.c:921 +#: mail/mail-vfolder.c:915 #, c-format msgid "Rule name '%s' is not unique, choose another." msgstr "" @@ -11100,20 +11446,86 @@ msgstr "" msgid "Score Rules" msgstr "" -#: filter/vfolder-rule.c:207 +#: filter/vfolder-rule.c:209 #, fuzzy msgid "You must name this vfolder." msgstr "Synchronising \"%s\"" -#: filter/vfolder-rule.c:221 +#: filter/vfolder-rule.c:223 msgid "You need to to specify at least one folder as a source." msgstr "" -#: filter/vfolder-rule.c:534 +#: filter/vfolder-rule.c:539 #, fuzzy msgid "VFolder source" msgstr "Synchronising \"%s\"" +#: mail/GNOME_Evolution_Mail.server.in.in.h:1 +msgid "Composer Preferences" +msgstr "" + +#: mail/GNOME_Evolution_Mail.server.in.in.h:2 +msgid "" +"Configure mail preferences, including security and message display, here" +msgstr "" + +#: mail/GNOME_Evolution_Mail.server.in.in.h:3 +msgid "Configure spell-checking, signatures, and the message composer here" +msgstr "" + +#: mail/GNOME_Evolution_Mail.server.in.in.h:4 +msgid "Configure your email accounts here" +msgstr "" + +#: mail/GNOME_Evolution_Mail.server.in.in.h:5 +#, fuzzy +msgid "Evolution Mail" +msgstr "Cannot initialise the Evolution shell." + +#: mail/GNOME_Evolution_Mail.server.in.in.h:6 +#, fuzzy +msgid "Evolution Mail accounts configuration control" +msgstr "Cannot initialise Evolution's mail component." + +#: mail/GNOME_Evolution_Mail.server.in.in.h:7 +#, fuzzy +msgid "Evolution Mail component" +msgstr "Cannot initialise Evolution's mail component." + +#: mail/GNOME_Evolution_Mail.server.in.in.h:8 +#, fuzzy +msgid "Evolution Mail composer" +msgstr "Cannot initialise Evolution's mail component." + +#: mail/GNOME_Evolution_Mail.server.in.in.h:9 +#, fuzzy +msgid "Evolution Mail composer configuration control" +msgstr "Cannot initialise Evolution's mail component." + +#: mail/GNOME_Evolution_Mail.server.in.in.h:10 +#, fuzzy +msgid "Evolution Mail folder viewer" +msgstr "Cannot initialise Evolution's mail summary component." + +#: mail/GNOME_Evolution_Mail.server.in.in.h:11 +#, fuzzy +msgid "Evolution Mail preferences control" +msgstr "Cannot initialise Evolution's mail summary component." + +#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783 +#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085 +#: mail/importers/pine-importer.c:572 +msgid "Mail" +msgstr "" + +#: mail/GNOME_Evolution_Mail.server.in.in.h:13 +msgid "Mail Accounts" +msgstr "" + +#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71 +msgid "Mail Preferences" +msgstr "" + #: mail/em-account-prefs.c:233 msgid "Are you sure you want to delete this account?" msgstr "" @@ -11156,7 +11568,7 @@ msgid "Protocol" msgstr "" #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349 -#: mail/mail-config.c:1246 +#: mail/mail-config.c:1250 msgid "Unnamed" msgstr "" @@ -11181,45 +11593,42 @@ msgstr "" msgid "Signature(s)" msgstr "" -#. FIXME: this wording sucks -#: mail/em-composer-utils.c:117 +#: mail/em-composer-utils.c:123 +#, c-format msgid "" "You are sending an HTML-formatted message. Please make sure that\n" "the following recipients are willing and able to receive HTML mail:\n" +"%sSend anyway?" msgstr "" -#: mail/em-composer-utils.c:129 -msgid "Send anyway?" -msgstr "" - -#: mail/em-composer-utils.c:150 +#: mail/em-composer-utils.c:137 msgid "" "This message has no subject.\n" "Really send?" msgstr "" -#: mail/em-composer-utils.c:176 +#: mail/em-composer-utils.c:153 msgid "" "Since the contact list you are sending to is configured to hide the list's " "addresses, this message will contain only Bcc recipients." msgstr "" -#: mail/em-composer-utils.c:180 +#: mail/em-composer-utils.c:157 msgid "This message contains only Bcc recipients." msgstr "" -#: mail/em-composer-utils.c:185 +#: mail/em-composer-utils.c:162 msgid "" "It is possible that the mail server may reveal the recipients by adding an " "Apparently-To header.\n" "Send anyway?" msgstr "" -#: mail/em-composer-utils.c:329 +#: mail/em-composer-utils.c:301 msgid "You must specify recipients in order to send this message." msgstr "" -#: mail/em-composer-utils.c:566 +#: mail/em-composer-utils.c:543 msgid "" "Unable to open the drafts folder for this account.\n" "Would you like to use the default drafts folder?" @@ -11229,188 +11638,389 @@ msgstr "" msgid "Create _Virtual Folder From Search..." msgstr "" -#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12 -#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085 -#: mail/importers/pine-importer.c:572 -msgid "Mail" -msgstr "" - -#: mail/em-folder-selection-button.c:66 +#: mail/em-folder-selection-button.c:116 #: shell/evolution-folder-selector-button.c:100 msgid "<click here to select a folder>" msgstr "" -#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122 -#: shell/evolution-folder-selector-button.c:128 +#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318 +#, fuzzy +msgid "Create New Folder" +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091 +#: shell/glade/e-shell-folder-creation-dialog.glade.h:4 +msgid "Specify where to create the folder:" +msgstr "" + +#: mail/em-folder-selector.c:263 +#: shell/glade/e-shell-folder-creation-dialog.glade.h:2 +msgid "Folder _name:" +msgstr "" + +#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943 #, c-format -msgid "\"%s\" in \"%s\"" +msgid "Could not create temporary directory: %s" msgstr "" -#: mail/em-folder-selector.c:267 -#, fuzzy -msgid "Folder _name" +#: mail/em-folder-tree-model.c:568 +#, fuzzy, c-format +msgid "Could not create temporary mbox store: %s" msgstr "Synchronising \"%s\"" -#: mail/em-folder-view.c:577 mail/em-folder-view.c:591 -#: mail/mail-component.c:1632 mail/mail-component.c:1643 -#: shell/e-shell-importer.c:1061 +#: mail/em-folder-tree-model.c:577 +#, fuzzy, c-format +msgid "Could not create temporary mbox folder: %s" +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-tree-model.c:592 +#, fuzzy, c-format +msgid "Could not copy messages to temporary mbox folder: %s" +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001 +msgid "Loading..." +msgstr "" + +#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056 +#, c-format +msgid "%s" +msgstr "" + +#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998 +#: mail/em-folder-view.c:590 mail/em-folder-view.c:604 +#: shell/e-shell-importer.c:1060 #, fuzzy msgid "Select folder" msgstr "Synchronising \"%s\"" +#: mail/em-folder-tree.c:1091 +#, fuzzy +msgid "Create folder" +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-tree.c:1179 +#, fuzzy, c-format +msgid "Could not delete folder: %s" +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-tree.c:1200 +#, fuzzy, c-format +msgid "Really delete folder \"%s\" and all of its subfolders?" +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416 +#, c-format +msgid "Delete \"%s\"" +msgstr "" + +#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534 +#, c-format +msgid "Rename the \"%s\" folder to:" +msgstr "" + +#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541 +#, fuzzy +msgid "Rename Folder" +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554 +#, c-format +msgid "A folder named \"%s\" already exists. Please use a different name." +msgstr "" + +#: mail/em-folder-tree.c:1370 +#, fuzzy +msgid "Folder properties" +msgstr "Synchronising \"%s\"" + +#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc +#: mail/em-folder-tree.c:1376 +msgid "Properties" +msgstr "" + +#: mail/em-folder-tree.c:1384 +#, fuzzy +msgid "Folder Name" +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8 +#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32 +msgid "_View" +msgstr "" + +#: mail/em-folder-tree.c:1492 +msgid "Open in _New Window" +msgstr "" + +#: mail/em-folder-tree.c:1497 +msgid "_Move" +msgstr "" + +#: mail/em-folder-tree.c:1500 +#, fuzzy +msgid "_New Folder..." +msgstr "Synchronising \"%s\"" + +#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427 +msgid "_Rename" +msgstr "" + +#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27 +msgid "_Properties..." +msgstr "" + #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 }, -#: mail/em-folder-view.c:659 mail/em-popup.c:583 +#: mail/em-folder-view.c:681 mail/em-popup.c:589 msgid "_Edit as New Message..." msgstr "" -#: mail/em-folder-view.c:661 +#: mail/em-folder-view.c:683 msgid "_Print" msgstr "" -#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118 +#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124 msgid "_Reply to Sender" msgstr "" -#: mail/em-folder-view.c:665 mail/em-popup.c:644 -#: ui/evolution-mail-message.xml.h:80 +#: mail/em-folder-view.c:687 mail/em-popup.c:650 +#: ui/evolution-mail-message.xml.h:86 msgid "Reply to _List" msgstr "" -#: mail/em-folder-view.c:666 mail/em-popup.c:645 -#: ui/evolution-mail-message.xml.h:79 +#: mail/em-folder-view.c:688 mail/em-popup.c:651 +#: ui/evolution-mail-message.xml.h:85 msgid "Reply to _All" msgstr "" -#: mail/em-folder-view.c:667 mail/em-popup.c:647 +#: mail/em-folder-view.c:689 mail/em-popup.c:653 msgid "_Forward" msgstr "" -#: mail/em-folder-view.c:670 +#: mail/em-folder-view.c:692 msgid "Follo_w Up..." msgstr "" -#: mail/em-folder-view.c:671 +#: mail/em-folder-view.c:693 msgid "Fla_g Completed" msgstr "" -#: mail/em-folder-view.c:672 +#: mail/em-folder-view.c:694 #, fuzzy msgid "Cl_ear Flag" msgstr "Colours" -#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47 +#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48 msgid "Mar_k as Read" msgstr "" -#: mail/em-folder-view.c:676 +#: mail/em-folder-view.c:698 msgid "Mark as _Unread" msgstr "" -#: mail/em-folder-view.c:677 +#: mail/em-folder-view.c:699 msgid "Mark as _Important" msgstr "" -#: mail/em-folder-view.c:678 +#: mail/em-folder-view.c:700 msgid "_Mark as Unimportant" msgstr "" -#: mail/em-folder-view.c:682 +#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52 +msgid "Mark as _Junk" +msgstr "" + +#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53 +msgid "Mark as _Not Junk" +msgstr "" + +#: mail/em-folder-view.c:706 msgid "U_ndelete" msgstr "" -#: mail/em-folder-view.c:685 +#: mail/em-folder-view.c:709 msgid "Mo_ve to Folder..." msgstr "" -#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31 +#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31 msgid "_Copy to Folder..." msgstr "" -#: mail/em-folder-view.c:694 +#: mail/em-folder-view.c:718 msgid "Add Sender to Address_book" msgstr "" -#: mail/em-folder-view.c:697 +#: mail/em-folder-view.c:721 msgid "Appl_y Filters" msgstr "" -#: mail/em-folder-view.c:700 +#: mail/em-folder-view.c:724 msgid "Crea_te Rule From Message" msgstr "" -#: mail/em-folder-view.c:701 +#: mail/em-folder-view.c:725 msgid "VFolder on _Subject" msgstr "" -#: mail/em-folder-view.c:702 +#: mail/em-folder-view.c:726 msgid "VFolder on Se_nder" msgstr "" -#: mail/em-folder-view.c:703 +#: mail/em-folder-view.c:727 msgid "VFolder on _Recipients" msgstr "" -#: mail/em-folder-view.c:704 +#: mail/em-folder-view.c:728 msgid "VFolder on Mailing _List" msgstr "" -#: mail/em-folder-view.c:706 +#: mail/em-folder-view.c:730 #, fuzzy msgid "VFolder on Thread" msgstr "Synchronising \"%s\"" -#: mail/em-folder-view.c:710 +#: mail/em-folder-view.c:734 msgid "Filter on Sub_ject" msgstr "" -#: mail/em-folder-view.c:711 +#: mail/em-folder-view.c:735 msgid "Filter on Sen_der" msgstr "" -#: mail/em-folder-view.c:712 +#: mail/em-folder-view.c:736 msgid "Filter on Re_cipients" msgstr "" -#: mail/em-folder-view.c:713 +#: mail/em-folder-view.c:737 msgid "Filter on _Mailing List" msgstr "" -#: mail/em-folder-view.c:715 +#: mail/em-folder-view.c:739 msgid "Filter on Thread" msgstr "" #. default charset used in mail view -#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525 -#: mail/mail-config.glade.h:38 +#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549 +#: mail/mail-config.glade.h:40 #, fuzzy msgid "Default" msgstr "Synchronising \"%s\"" -#: mail/em-folder-view.c:1559 +#: mail/em-folder-view.c:1583 msgid "Print Message" msgstr "" -#: mail/em-folder-view.c:1800 +#: mail/em-folder-view.c:1825 #, fuzzy msgid "_Copy Link Location" msgstr "Organisation" #. message-search popup match count string -#: mail/em-format-html-display.c:343 +#: mail/em-format-html-display.c:368 #, c-format msgid "Matches: %d" msgstr "" -#: mail/em-format-html-display.c:638 +#: mail/em-format-html-display.c:597 mail/em-format-html.c:564 +msgid "Unsigned" +msgstr "" + +#: mail/em-format-html-display.c:597 +msgid "" +"This message is not signed. There is no guarantee the sender of the message " +"is authentic." +msgstr "" + +#: mail/em-format-html-display.c:598 mail/em-format-html.c:565 +msgid "Valid signature" +msgstr "" + +#: mail/em-format-html-display.c:598 +msgid "" +"This message is signed and is valid, the sender of this message is very " +"likely who they claim to be." +msgstr "" + +#: mail/em-format-html-display.c:599 mail/em-format-html.c:566 +msgid "Invalid signature" +msgstr "" + +#: mail/em-format-html-display.c:599 +msgid "" +"The signature of this message cannot be verified, it may have been altered " +"in transit." +msgstr "" + +#: mail/em-format-html-display.c:600 mail/em-format-html.c:567 +msgid "Valid signature, cannot verify sender" +msgstr "" + +#: mail/em-format-html-display.c:600 +msgid "" +"This message is signed with a valid signature, but the sender of the message " +"cannot be verified." +msgstr "" + +#: mail/em-format-html-display.c:606 mail/em-format-html.c:573 +msgid "Unencrypted" +msgstr "" + +#: mail/em-format-html-display.c:606 +msgid "" +"This message is not encrypted. It's content may be viewed in transit across " +"The Internet." +msgstr "" + +#: mail/em-format-html-display.c:607 mail/em-format-html.c:574 +msgid "Encrypted, weak" +msgstr "" + +#: mail/em-format-html-display.c:607 +msgid "" +"This message is encrypted, but with a weak encryption algorithm. It would " +"be difficult, but not impossible for an outsider to view the content of this " +"message in a practical amount of time." +msgstr "" + +#: mail/em-format-html-display.c:608 mail/em-format-html.c:575 +msgid "Encrypted" +msgstr "" + +#: mail/em-format-html-display.c:608 msgid "" -"This message is digitally signed. Click the lock icon for more information." +"This message is encrypted. It would be difficult for an outsider to view " +"the content of this message." +msgstr "" + +#: mail/em-format-html-display.c:609 mail/em-format-html.c:576 +msgid "Encrypted, strong" +msgstr "" + +#: mail/em-format-html-display.c:609 +msgid "" +"This message is encrypted, with a strong encryption algorithm. It would be " +"very difficult for an outsider to view the content of this message in a " +"practical amount of time." +msgstr "" + +#: mail/em-format-html-display.c:779 mail/em-format-html.c:645 +msgid "Could not parse S/MIME message: Unknown error" +msgstr "" + +#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042 +#: mail/em-format.c:1196 +msgid "Unsupported signature format" +msgstr "" + +#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050 +msgid "Unknown error verifying signature" msgstr "" -#: mail/em-format-html-display.c:728 +#: mail/em-format-html-display.c:917 msgid "_View Inline" msgstr "" -#: mail/em-format-html-display.c:729 +#: mail/em-format-html-display.c:918 msgid "_Hide" msgstr "" @@ -11419,330 +12029,621 @@ msgstr "" msgid "Page %d of %d" msgstr "" -#: mail/em-format-html.c:451 mail/em-format-html.c:453 +#: mail/em-format-html.c:457 mail/em-format-html.c:459 #, c-format msgid "Retrieving `%s'" msgstr "" -#: mail/em-format-html.c:708 +#: mail/em-format-html.c:826 msgid "Malformed external-body part." msgstr "" -#: mail/em-format-html.c:738 +#: mail/em-format-html.c:856 #, c-format msgid "Pointer to FTP site (%s)" msgstr "" -#: mail/em-format-html.c:749 +#: mail/em-format-html.c:867 #, c-format msgid "Pointer to local file (%s) valid at site \"%s\"" msgstr "" -#: mail/em-format-html.c:751 +#: mail/em-format-html.c:869 #, c-format msgid "Pointer to local file (%s)" msgstr "" -#: mail/em-format-html.c:772 +#: mail/em-format-html.c:890 #, c-format msgid "Pointer to remote data (%s)" msgstr "" -#: mail/em-format-html.c:783 +#: mail/em-format-html.c:901 #, c-format msgid "Pointer to unknown external data (\"%s\" type)" msgstr "" -#: mail/em-format-html.c:905 mail/em-format.c:1219 -msgid "This message is digitally signed but can not be proven to be authentic." -msgstr "" - -#: mail/em-format-html.c:906 mail/em-format.c:1217 -msgid "This message is digitally signed and has been found to be authentic." -msgstr "" - -#: mail/em-format-html.c:930 mail/em-format.c:1190 -msgid "No signature present" -msgstr "" - -#: mail/em-format-html.c:932 mail/em-format.c:1192 -#, fuzzy -msgid "Session not initialised" -msgstr "Could not initialise Bonobo" - -#: mail/em-format-html.c:943 mail/em-format.c:1203 -msgid "Unsupported signature format" -msgstr "" - -#: mail/em-format-html.c:992 +#: mail/em-format-html.c:1029 msgid "Could not parse MIME message. Displaying as source." msgstr "" -#: mail/em-format-html.c:1079 +#: mail/em-format-html.c:1141 msgid "Formatting message" msgstr "" -#: mail/em-format-html.c:1354 mail/em-format.c:673 +#: mail/em-format-html.c:1423 mail/em-format.c:673 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301 msgid "From" msgstr "" -#: mail/em-format-html.c:1356 mail/em-format.c:674 +#: mail/em-format-html.c:1425 mail/em-format.c:674 msgid "Reply-To" msgstr "" -#: mail/em-format-html.c:1358 mail/em-format.c:675 +#: mail/em-format-html.c:1427 mail/em-format.c:675 #: mail/message-list.etspec.h:14 msgid "To" msgstr "" -#: mail/em-format-html.c:1360 mail/em-format.c:676 +#: mail/em-format-html.c:1429 mail/em-format.c:676 msgid "Cc" msgstr "" -#: mail/em-format-html.c:1362 mail/em-format.c:677 +#: mail/em-format-html.c:1431 mail/em-format.c:677 msgid "Bcc" msgstr "" -#: mail/em-format-html.c:1381 +#: mail/em-format-html.c:1450 msgid "Mailer" msgstr "" #. translators: strftime format for local time equivalent in Date header display, with day -#: mail/em-format-html.c:1408 +#: mail/em-format-html.c:1477 msgid "<I> (%a, %R %Z)</I>" msgstr "" #. translators: strftime format for local time equivalent in Date header display, without day -#: mail/em-format-html.c:1411 +#: mail/em-format-html.c:1480 msgid "<I> (%R %Z)</I>" msgstr "" -#: mail/em-format-html.c:1422 mail/em-format.c:679 +#: mail/em-format-html.c:1491 mail/em-format.c:679 #: mail/message-list.etspec.h:2 msgid "Date" msgstr "" -#: mail/em-format.c:893 +#: mail/em-format.c:892 #, c-format msgid "%s attachment" msgstr "" -#: mail/em-format.c:1259 -msgid "Could not parse S/MIME message: Unknown error" +#: mail/em-format.c:1185 +#, fuzzy +msgid "Session not initialised" +msgstr "Could not initialise Bonobo" + +#: mail/em-format.c:1210 +msgid "This message is digitally signed and has been found to be authentic." +msgstr "" + +#: mail/em-format.c:1212 +msgid "This message is digitally signed but can not be proven to be authentic." +msgstr "" + +#: mail/em-junk-filter.c:72 +msgid "Spamassassin (built-in)" +msgstr "" + +#: mail/em-migrate.c:120 +msgid "Migrating..." msgstr "" -#: mail/em-popup.c:593 +#: mail/em-migrate.c:128 +msgid "" +"The location and hierarchy of the Evolution mailbox folders has changed " +"since Evolution 1.x.\n" +"\n" +"Please be patient while Evolution migrates your folders..." +msgstr "" + +#: mail/em-migrate.c:161 +#, fuzzy, c-format +msgid "Migrating `%s':" +msgstr "Synchronise \"%s\"" + +#: mail/em-migrate.c:627 +#, fuzzy, c-format +msgid "Failed to migrate `%s': %s" +msgstr "Synchronising \"%s\"" + +#: mail/em-migrate.c:653 mail/em-migrate.c:670 +#, fuzzy, c-format +msgid "Failed to create directory `%s': %s" +msgstr "Synchronising \"%s\"" + +#: mail/em-migrate.c:682 +#, fuzzy, c-format +msgid "Failed to open store for `%s': %s" +msgstr "Synchronising \"%s\"" + +#: mail/em-popup.c:599 msgid "Save As..." msgstr "" -#: mail/em-popup.c:641 +#: mail/em-popup.c:647 msgid "Set as _Background" msgstr "" -#: mail/em-popup.c:643 +#: mail/em-popup.c:649 msgid "_Reply to sender" msgstr "" -#: mail/em-popup.c:680 +#: mail/em-popup.c:697 msgid "_Open Link in Browser" msgstr "" -#: mail/em-popup.c:681 +#: mail/em-popup.c:698 #, fuzzy msgid "Se_nd message to..." msgstr "Synchronising \"%s\"" -#: mail/em-popup.c:682 +#: mail/em-popup.c:699 #, fuzzy msgid "_Add to Addressbook" msgstr "Cannot initialise the Evolution shell." -#: mail/em-popup.c:788 +#: mail/em-popup.c:805 #, c-format msgid "Open in %s..." msgstr "" -#: mail/em-subscribe-editor.c:579 +#: mail/em-subscribe-editor.c:583 msgid "This store does not support subscriptions, or the are not enabled." msgstr "" -#: mail/em-subscribe-editor.c:608 +#: mail/em-subscribe-editor.c:612 msgid "Subscribed" msgstr "" -#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2 +#: mail/em-subscribe-editor.c:616 msgid "Folder" msgstr "" #. FIXME: This is just to get the shadow, is there a better way? -#: mail/em-subscribe-editor.c:799 +#: mail/em-subscribe-editor.c:803 msgid "Please select a server." msgstr "" -#: mail/em-subscribe-editor.c:820 +#: mail/em-subscribe-editor.c:824 msgid "No server has been selected" msgstr "" -#: mail/em-utils.c:88 +#: mail/em-utils.c:93 msgid "Don't show this message again." msgstr "" -#: mail/em-utils.c:270 +#: mail/em-utils.c:275 #, c-format msgid "" "Error loading filter information:\n" "%s" msgstr "" -#: mail/em-utils.c:279 +#: mail/em-utils.c:284 msgid "Filters" msgstr "" -#: mail/em-utils.c:486 +#: mail/em-utils.c:491 msgid "-------- Forwarded Message --------" msgstr "" -#: mail/em-utils.c:1039 +#: mail/em-utils.c:1044 msgid "an unknown sender" msgstr "" #. translators: attribution string used when quoting messages, #. it must contain a single single %%+05d followed by a single '%%s' -#: mail/em-utils.c:1049 +#: mail/em-utils.c:1054 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:" msgstr "" -#: mail/em-utils.c:1325 +#: mail/em-utils.c:1330 #, fuzzy, c-format msgid "" "Cannot save to `%s'\n" " %s" msgstr "Synchronising \"%s\"" -#: mail/em-utils.c:1330 +#: mail/em-utils.c:1335 #, c-format msgid "" "`%s' already exists.\n" "Overwrite it?" msgstr "" -#: mail/em-utils.c:1373 +#: mail/em-utils.c:1378 #, fuzzy msgid "message" msgstr "Colours" -#: mail/em-utils.c:1430 +#: mail/em-utils.c:1435 msgid "Save Message..." msgstr "" -#: mail/em-utils.c:1893 mail/mail-component.c:501 +#: mail/em-utils.c:1473 +#, fuzzy +msgid "Add address" +msgstr "Colours" + +#: mail/em-utils.c:2262 #, c-format -msgid "Could not create temporary directory: %s" +msgid "" +"This operation will permanently remove all deleted messages in the folder `%" +"s'. If you continue, you will not be able to recover these messages.\n" +"\n" +"Really erase these messages?" msgstr "" -#: mail/em-utils.c:2211 +#: mail/em-utils.c:2288 msgid "" -"This operation will permanently erase all messages marked as\n" -"deleted. If you continue, you will not be able to recover these messages.\n" +"This operation will permanently remove all deleted messages in all folders. " +"If you continue, you will not be able to recover these messages.\n" "\n" "Really erase these messages?" msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:1 -msgid "Composer Preferences" +#: mail/evolution-mail.schemas.in.in.h:1 +msgid "Automatic link recognition" msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:2 -msgid "" -"Configure mail preferences, including security and message display, here" +#: mail/evolution-mail.schemas.in.in.h:2 +msgid "Automatic smiley recognition" msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:3 -msgid "Configure spell-checking, signatures, and the message composer here" +#: mail/evolution-mail.schemas.in.in.h:3 +msgid "Check incoming mail being junk" msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:4 -msgid "Configure your email accounts here" +#: mail/evolution-mail.schemas.in.in.h:4 +msgid "Citation highlight colour" msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:5 -#, fuzzy -msgid "Evolution Mail" -msgstr "Cannot initialise the Evolution shell." +#: mail/evolution-mail.schemas.in.in.h:5 +msgid "Citation highlight colour." +msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:6 -#, fuzzy -msgid "Evolution Mail accounts configuration control" -msgstr "Cannot initialise Evolution's mail component." +#: mail/evolution-mail.schemas.in.in.h:6 +msgid "Default charset in which to compose messages" +msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:7 -#, fuzzy -msgid "Evolution Mail component" -msgstr "Cannot initialise Evolution's mail component." +#: mail/evolution-mail.schemas.in.in.h:7 +msgid "Default charset in which to compose messages." +msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:8 -#, fuzzy -msgid "Evolution Mail composer" -msgstr "Cannot initialise Evolution's mail component." +#: mail/evolution-mail.schemas.in.in.h:8 +msgid "Default charset in which to display messages" +msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:9 +#: mail/evolution-mail.schemas.in.in.h:9 +msgid "Default charset in which to display messages." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:10 #, fuzzy -msgid "Evolution Mail composer configuration control" -msgstr "Cannot initialise Evolution's mail component." +msgid "Default forward style" +msgstr "Synchronising \"%s\"" -#: mail/GNOME_Evolution_Mail.server.in.in.h:10 +#: mail/evolution-mail.schemas.in.in.h:11 +msgid "Default reply style" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:12 +msgid "Draw spelling error indicators on words as you type." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:13 +msgid "Empty Trash folders on exit" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:14 +msgid "Empty all Trash folders when exiting Evolution." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:15 +msgid "Enable caret mode, so that you can see a cursor when reading mail." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:16 +msgid "Enable/disable caret mode" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:17 +msgid "Height of the message-list pane" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:18 +msgid "Height of the message-list pane." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:19 +msgid "" +"If there isn't a builtin viewer for a particular mime-type inside Evolution, " +"any mime-types appearing in this list which map to a bonobo-component viewer " +"in GNOME's mime-type database may be used for displaying content." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:20 +msgid "List of Labels and their associated colours" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:21 +msgid "List of accounts" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:22 +msgid "" +"List of accounts known to the mail component of Evolution. The list contains " +"strings naming subdirectories relative to /apps/evolution/mail/accounts." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:23 +msgid "" +"List of labels known to the mail component of Evolution. The list contains " +"strings containing name:colour where colour uses the HTML hex encoding." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:24 +msgid "List of mime types to check for bonobo component viewers" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:25 +msgid "Load images for HTML messages over http" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:26 +msgid "" +"Load images for HTML messages over http(s). Possible values are: 0 - Never " +"load images off the net 1 - Load images if sender is in the addressbook 2 - " +"Always load images off the net" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:27 +msgid "Log filter actions" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:28 +msgid "Log filter actions to the specified log file." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:29 +msgid "Logfile to log filter actions" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:30 +msgid "Logfile to log filter actions." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:31 +msgid "Mark as Seen after specified timeout" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:32 +msgid "Mark as Seen after specified timeout." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:33 +msgid "Mark citations in the message \"Preview\"" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:34 +msgid "Mark citations in the message \"Preview\"." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:35 +msgid "Message-display style (normal, full headers, source)" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:36 +msgid "New Mail Notify sound file" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:37 +msgid "New Mail Notify type" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:38 +msgid "Prompt on empty subject" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:39 +msgid "Prompt the user when he or she tries to expunge a folder." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:40 +msgid "" +"Prompt the user when he or she tries to send a message without a Subject." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:41 +msgid "Prompt when user expunges" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:42 +msgid "Prompt when user only fills Bcc" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:43 +msgid "" +"Prompt when user tries to send HTML mail to recipients that may not want to " +"receive HTML mail." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:44 +msgid "Prompt when user tries to send a message with no To or Cc recipients." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:45 +msgid "Prompt when user tries to send unwanted HTML" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:46 +msgid "Recognize links in text and replace them." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:47 +msgid "Recognize smileys in text and replace them with images." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:48 +msgid "Run junk test on incoming mail" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:49 +msgid "S3kr3t 0pt10n" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:50 +msgid "S3kr3t 0pt10n." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:51 +msgid "Send HTML mail by default" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:52 +msgid "Send HTML mail by default." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:53 +msgid "Show Animations" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:54 +msgid "Show animated images as animations." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:55 +msgid "Show deleted messages (with a strike-through) in the message-list." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:56 +msgid "Show deleted messages in the message-list" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:57 +msgid "Show the \"Preview\" pane" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:58 +msgid "Show the \"Preview\" pane." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:59 +msgid "Sound file to play when new mail arrives." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:60 +msgid "Specifies the type of New Mail Notification the user wishes to use." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:61 +msgid "Spell check inline" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:62 +msgid "Terminal font" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:63 +msgid "The terminal font for mail display" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:64 +msgid "The variable width font for mail display" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:65 #, fuzzy -msgid "Evolution Mail folder viewer" -msgstr "Cannot initialise Evolution's mail summary component." +msgid "Thread the message list." +msgstr "Synchronising \"%s\"" -#: mail/GNOME_Evolution_Mail.server.in.in.h:11 +#: mail/evolution-mail.schemas.in.in.h:66 #, fuzzy -msgid "Evolution Mail preferences control" -msgstr "Cannot initialise Evolution's mail summary component." +msgid "Thread the message-list" +msgstr "Synchronising \"%s\"" -#: mail/GNOME_Evolution_Mail.server.in.in.h:13 -msgid "Mail Accounts" +#: mail/evolution-mail.schemas.in.in.h:67 +msgid "Thread the message-list based on Subject" msgstr "" -#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68 -msgid "Mail Preferences" +#: mail/evolution-mail.schemas.in.in.h:68 +msgid "Timeout for marking message as Seen" msgstr "" -#: mail/importers/elm-importer.c:105 -msgid "Evolution is importing your old Elm mail" +#: mail/evolution-mail.schemas.in.in.h:69 +msgid "Timeout for marking message as Seen." msgstr "" -#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238 -#: mail/importers/pine-importer.c:115 -msgid "Importing..." +#: mail/evolution-mail.schemas.in.in.h:70 +msgid "UID string of the default account." msgstr "" -#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240 -#: mail/importers/pine-importer.c:117 -msgid "Please wait" +#: mail/evolution-mail.schemas.in.in.h:71 +msgid "Use custom fonts" msgstr "" -#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759 -#: mail/importers/pine-importer.c:288 -#, c-format -msgid "Importing %s as %s" +#: mail/evolution-mail.schemas.in.in.h:72 +msgid "Use custom fonts for displaying mail" msgstr "" -#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887 -#: mail/importers/pine-importer.c:425 -#, fuzzy, c-format -msgid "Scanning %s" -msgstr "Synchronise \"%s\"" +#: mail/evolution-mail.schemas.in.in.h:73 +msgid "Variable width font" +msgstr "" -#: mail/importers/elm-importer.c:547 -msgid "" -"Evolution has found Elm mail files\n" -"Would you like to import them into Evolution?" +#: mail/evolution-mail.schemas.in.in.h:74 +msgid "View/Bcc menu item is checked" msgstr "" -#: mail/importers/elm-importer.c:568 -msgid "Elm" +#: mail/evolution-mail.schemas.in.in.h:75 +msgid "View/Bcc menu item is checked." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:76 +msgid "View/Cc menu item is checked" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:77 +msgid "View/Cc menu item is checked." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:78 +msgid "View/From menu item is checked" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:79 +msgid "View/From menu item is checked." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:80 +msgid "View/PostTo menu item is checked" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:81 +msgid "View/PostTo menu item is checked." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:82 +msgid "View/ReplyTo menu item is checked" +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:83 +msgid "View/ReplyTo menu item is checked." +msgstr "" + +#: mail/evolution-mail.schemas.in.in.h:84 +msgid "" +"Whether or not to fall back on threading by subjects when the messages do " +"not contain In-Reply-To or References headers." msgstr "" #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1 @@ -11777,6 +12678,42 @@ msgstr "" msgid "Evolution Pine importer" msgstr "Cannot initialise Evolution's mail component." +#: mail/importers/elm-importer.c:105 +msgid "Evolution is importing your old Elm mail" +msgstr "" + +#: mail/importers/elm-importer.c:106 mail/importers/netscape-importer.c:1238 +#: mail/importers/pine-importer.c:115 +msgid "Importing..." +msgstr "" + +#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240 +#: mail/importers/pine-importer.c:117 +msgid "Please wait" +msgstr "" + +#: mail/importers/elm-importer.c:157 mail/importers/netscape-importer.c:1759 +#: mail/importers/pine-importer.c:288 +#, c-format +msgid "Importing %s as %s" +msgstr "" + +#: mail/importers/elm-importer.c:392 mail/importers/netscape-importer.c:1887 +#: mail/importers/pine-importer.c:425 +#, fuzzy, c-format +msgid "Scanning %s" +msgstr "Synchronise \"%s\"" + +#: mail/importers/elm-importer.c:547 +msgid "" +"Evolution has found Elm mail files\n" +"Would you like to import them into Evolution?" +msgstr "" + +#: mail/importers/elm-importer.c:568 +msgid "Elm" +msgstr "" + #: mail/importers/netscape-importer.c:75 #, c-format msgid "Priority Filter \"%s\"" @@ -11818,12 +12755,6 @@ msgstr "" msgid "Evolution is importing your old Netscape data" msgstr "" -#. Fill in the new fields -#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110 -#: shell/e-local-storage.c:184 -msgid "Trash" -msgstr "" - #: mail/importers/netscape-importer.c:1995 #, fuzzy msgid "Scanning mail filters" @@ -11834,7 +12765,7 @@ msgstr "Synchronise \"%s\"" msgid "Scanning directory" msgstr "Synchronising \"%s\"" -#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556 +#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563 msgid "Starting import" msgstr "" @@ -11902,23 +12833,23 @@ msgid "You have not filled in all of the required information." msgstr "" #. give our dialog an OK button and title -#: mail/mail-account-editor.c:146 +#: mail/mail-account-editor.c:155 msgid "Evolution Account Editor" msgstr "" -#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149 +#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153 msgid "_Host:" msgstr "" -#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123 +#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127 msgid "User_name:" msgstr "" -#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156 +#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162 msgid "_Path:" msgstr "" -#: mail/mail-account-gui.c:1946 +#: mail/mail-account-gui.c:1970 msgid "You may not create two accounts with the same name." msgstr "" @@ -11927,35 +12858,35 @@ msgstr "" msgid "Mail to %s" msgstr "" -#: mail/mail-autofilter.c:257 +#: mail/mail-autofilter.c:260 #, c-format msgid "Subject is %s" msgstr "" -#: mail/mail-autofilter.c:273 +#: mail/mail-autofilter.c:276 #, c-format msgid "Mail from %s" msgstr "" -#: mail/mail-autofilter.c:290 +#: mail/mail-autofilter.c:293 #, c-format msgid "%s mailing list" msgstr "" -#: mail/mail-autofilter.c:314 +#: mail/mail-autofilter.c:317 #, c-format msgid "Replies to %s" msgstr "" -#: mail/mail-autofilter.c:367 +#: mail/mail-autofilter.c:370 msgid "Add Filter Rule" msgstr "" -#: mail/mail-autofilter.c:416 +#: mail/mail-autofilter.c:419 msgid "The following filter rule(s):\n" msgstr "" -#: mail/mail-autofilter.c:422 +#: mail/mail-autofilter.c:425 #, c-format msgid "" "Used the removed folder:\n" @@ -11963,141 +12894,32 @@ msgid "" "And have been updated." msgstr "" -#: mail/mail-component.c:194 -msgid "Connecting..." -msgstr "" - -#: mail/mail-component.c:351 +#: mail/mail-component.c:214 msgid "On this Computer" msgstr "" -#: mail/mail-component.c:373 -msgid "This folder cannot contain messages." -msgstr "" - -#: mail/mail-component.c:487 -#, fuzzy, c-format -msgid "Could not open source folder: %s" -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:516 -#, fuzzy, c-format -msgid "Could not create temporary mbox store: %s" -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:532 -#, fuzzy, c-format -msgid "Could not create temporary mbox folder: %s" -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:553 -#, fuzzy, c-format -msgid "Could not copy messages to temporary mbox folder: %s" -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:1014 -#, c-format -msgid "" -"The following error occured while migrating your mail data:\n" -"%s" -msgstr "" - -#: mail/mail-component.c:1632 -msgid "Select destination to copy folder into" -msgstr "" - -#: mail/mail-component.c:1643 -msgid "Select destination to move folder into" -msgstr "" - -#: mail/mail-component.c:1707 +#: mail/mail-component.c:379 #, fuzzy -msgid "Create folder" -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:1707 -#: shell/glade/e-shell-folder-creation-dialog.glade.h:4 -msgid "Specify where to create the folder:" -msgstr "" - -#: mail/mail-component.c:1788 -#, fuzzy, c-format -msgid "Could not delete folder: %s" -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:1812 -#, fuzzy, c-format -msgid "Really delete folder \"%s\" and all of its subfolders?" -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416 -#, c-format -msgid "Delete \"%s\"" -msgstr "" - -#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534 -#, c-format -msgid "Rename the \"%s\" folder to:" -msgstr "" +msgid "New Mail Message" +msgstr "Colours" -#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541 +#: mail/mail-component.c:380 #, fuzzy -msgid "Rename Folder" -msgstr "Synchronising \"%s\"" +msgid "_Mail Message" +msgstr "Colours" -#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547 -#: shell/e-shell-folder-creation-dialog.c:180 -#, c-format -msgid "The specified folder name is not valid: %s" +#: mail/mail-component.c:381 +msgid "Compose a new mail message" msgstr "" -#: mail/mail-component.c:1860 +#: mail/mail-component.c:472 #, c-format -msgid "A folder named \"%s\" already exists. Please use a different name." -msgstr "" - -#: mail/mail-component.c:1967 -#, fuzzy -msgid "Folder properties" -msgstr "Synchronising \"%s\"" - -#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc -#: mail/mail-component.c:1975 -msgid "Properties" -msgstr "" - -#: mail/mail-component.c:1979 -#, fuzzy -msgid "Folder Name" -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8 -#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30 -msgid "_View" -msgstr "" - -#: mail/mail-component.c:2079 -msgid "Open in _New Window" -msgstr "" - -#: mail/mail-component.c:2084 -msgid "_Move" -msgstr "" - -#: mail/mail-component.c:2087 -#, fuzzy -msgid "_New Folder..." -msgstr "Synchronising \"%s\"" - -#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427 -msgid "_Rename" -msgstr "" - -#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27 -msgid "_Properties..." +msgid "" +"The following error occured while migrating your mail data:\n" +"%s" msgstr "" -#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60 +#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63 msgid "Identity" msgstr "" @@ -12146,11 +12968,11 @@ msgid "" "purposes only." msgstr "" -#: mail/mail-config.c:1086 +#: mail/mail-config.c:1090 msgid "Checking Service" msgstr "" -#: mail/mail-config.c:1164 mail/mail-config.c:1168 +#: mail/mail-config.c:1168 mail/mail-config.c:1172 msgid "Connecting to server..." msgstr "" @@ -12232,27 +13054,35 @@ msgid "C_olors" msgstr "Colours" #: mail/mail-config.glade.h:26 -msgid "Check spelling while I _type" +msgid "Check _Incoming Mail" msgstr "" #: mail/mail-config.glade.h:27 -msgid "Checking for New Mail" +msgid "Check spelling while I _type" msgstr "" #: mail/mail-config.glade.h:28 +msgid "Checking for New Mail" +msgstr "" + +#: mail/mail-config.glade.h:29 +msgid "Checks incoming mail messages to be Junk" +msgstr "" + +#: mail/mail-config.glade.h:30 #, fuzzy msgid "Color for _misspelled words:" msgstr "Colours for display" -#: mail/mail-config.glade.h:29 +#: mail/mail-config.glade.h:31 msgid "Composing Messages" msgstr "" -#: mail/mail-config.glade.h:30 +#: mail/mail-config.glade.h:32 msgid "Configuration" msgstr "" -#: mail/mail-config.glade.h:31 +#: mail/mail-config.glade.h:33 msgid "" "Congratulations, your mail configuration is complete.\n" "\n" @@ -12262,483 +13092,500 @@ msgid "" "Click \"Apply\" to save your settings." msgstr "" -#: mail/mail-config.glade.h:37 +#: mail/mail-config.glade.h:39 msgid "De_fault" msgstr "" -#: mail/mail-config.glade.h:39 +#: mail/mail-config.glade.h:41 msgid "Default Behavior" msgstr "" -#: mail/mail-config.glade.h:40 +#: mail/mail-config.glade.h:42 msgid "Default character _encoding:" msgstr "" -#: mail/mail-config.glade.h:41 +#: mail/mail-config.glade.h:43 msgid "Deleting Mail" msgstr "" -#: mail/mail-config.glade.h:43 +#: mail/mail-config.glade.h:45 msgid "Digitally _sign outgoing messages (by default)" msgstr "" -#: mail/mail-config.glade.h:44 +#: mail/mail-config.glade.h:46 msgid "Do not quote original message" msgstr "" -#: mail/mail-config.glade.h:45 +#: mail/mail-config.glade.h:47 msgid "Don't sign _meeting requests (for Outlook compatibility)" msgstr "" -#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1 +#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1 msgid "Done" msgstr "" -#: mail/mail-config.glade.h:47 +#: mail/mail-config.glade.h:49 #, fuzzy msgid "Drafts _folder:" msgstr "Synchronising \"%s\"" -#: mail/mail-config.glade.h:48 +#: mail/mail-config.glade.h:50 msgid "E_nable" msgstr "" -#: mail/mail-config.glade.h:49 +#: mail/mail-config.glade.h:51 msgid "Email Accounts" msgstr "" -#: mail/mail-config.glade.h:50 +#: mail/mail-config.glade.h:52 msgid "Email _address:" msgstr "" -#: mail/mail-config.glade.h:51 +#: mail/mail-config.glade.h:53 msgid "Empty _trash folders on exit" msgstr "" -#: mail/mail-config.glade.h:52 +#: mail/mail-config.glade.h:54 msgid "Encry_ption certificate:" msgstr "" -#: mail/mail-config.glade.h:53 +#: mail/mail-config.glade.h:55 msgid "Evolution Account Assistant" msgstr "" -#: mail/mail-config.glade.h:54 +#: mail/mail-config.glade.h:56 msgid "Execute Command..." msgstr "" -#: mail/mail-config.glade.h:55 +#: mail/mail-config.glade.h:57 msgid "Fi_xed -width:" msgstr "" -#: mail/mail-config.glade.h:56 +#: mail/mail-config.glade.h:58 +#, fuzzy +msgid "Filter Options" +msgstr "Synchronising \"%s\"" + +#: mail/mail-config.glade.h:59 msgid "Font Properties" msgstr "" -#: mail/mail-config.glade.h:57 +#: mail/mail-config.glade.h:60 msgid "Format messages in _HTML" msgstr "" -#: mail/mail-config.glade.h:58 +#: mail/mail-config.glade.h:61 msgid "Highlight _quotations with" msgstr "" -#: mail/mail-config.glade.h:59 +#: mail/mail-config.glade.h:62 msgid "IMAPv4 " msgstr "" -#: mail/mail-config.glade.h:62 +#: mail/mail-config.glade.h:65 msgid "Inline" msgstr "" -#: mail/mail-config.glade.h:63 +#: mail/mail-config.glade.h:66 msgid "Kerberos " msgstr "" -#: mail/mail-config.glade.h:64 +#: mail/mail-config.glade.h:67 msgid "Labels and Colors" msgstr "" -#: mail/mail-config.glade.h:66 +#: mail/mail-config.glade.h:69 msgid "Loading Images" msgstr "" -#: mail/mail-config.glade.h:67 +#: mail/mail-config.glade.h:70 msgid "Mail Configuration" msgstr "" -#: mail/mail-config.glade.h:69 +#: mail/mail-config.glade.h:72 msgid "Mailbox location" msgstr "" -#: mail/mail-config.glade.h:70 +#: mail/mail-config.glade.h:73 #, fuzzy msgid "Message Composer" msgstr "Colours" -#: mail/mail-config.glade.h:71 +#: mail/mail-config.glade.h:74 msgid "Message Display" msgstr "" -#: mail/mail-config.glade.h:72 +#: mail/mail-config.glade.h:75 #, fuzzy msgid "Message Fonts" msgstr "Colours" -#: mail/mail-config.glade.h:74 +#: mail/mail-config.glade.h:77 msgid "New Mail Notification" msgstr "" -#: mail/mail-config.glade.h:76 +#: mail/mail-config.glade.h:79 msgid "" "Note: you will not be prompted for a password until you connect for the " "first time" msgstr "" -#: mail/mail-config.glade.h:77 +#: mail/mail-config.glade.h:80 msgid "Optional Information" msgstr "" -#: mail/mail-config.glade.h:79 +#: mail/mail-config.glade.h:82 #, fuzzy msgid "Or_ganization:" msgstr "Organisation:" -#: mail/mail-config.glade.h:80 +#: mail/mail-config.glade.h:83 msgid "PGP/GPG _Key ID:" msgstr "" -#: mail/mail-config.glade.h:84 +#: mail/mail-config.glade.h:87 msgid "Pick a color" msgstr "Pick a colour" -#: mail/mail-config.glade.h:85 +#: mail/mail-config.glade.h:88 msgid "Pr_ompt when sending messages with only Bcc recipients defined" msgstr "" -#: mail/mail-config.glade.h:86 +#: mail/mail-config.glade.h:89 msgid "Pretty Good Privacy (PGP/GPG)" msgstr "" -#: mail/mail-config.glade.h:87 +#: mail/mail-config.glade.h:90 msgid "Printed Fonts" msgstr "" -#: mail/mail-config.glade.h:88 +#: mail/mail-config.glade.h:91 msgid "Qmail maildir " msgstr "" -#: mail/mail-config.glade.h:89 +#: mail/mail-config.glade.h:92 msgid "Quote original message" msgstr "" -#: mail/mail-config.glade.h:90 +#: mail/mail-config.glade.h:93 msgid "Quoted" msgstr "" -#: mail/mail-config.glade.h:91 +#: mail/mail-config.glade.h:94 msgid "Re_member this password" msgstr "" -#: mail/mail-config.glade.h:92 +#: mail/mail-config.glade.h:95 msgid "Re_ply-To:" msgstr "" -#: mail/mail-config.glade.h:93 +#: mail/mail-config.glade.h:96 msgid "Receiving Email" msgstr "" -#: mail/mail-config.glade.h:94 +#: mail/mail-config.glade.h:97 #, fuzzy msgid "Receiving _Options" msgstr "Synchronise \"%s\"" -#: mail/mail-config.glade.h:95 +#: mail/mail-config.glade.h:98 msgid "Remember this _password" msgstr "" -#: mail/mail-config.glade.h:96 +#: mail/mail-config.glade.h:99 msgid "Required Information" msgstr "" -#: mail/mail-config.glade.h:97 +#: mail/mail-config.glade.h:100 #, fuzzy msgid "Restore Defaults" msgstr "Synchronising \"%s\"" -#: mail/mail-config.glade.h:99 +#: mail/mail-config.glade.h:102 msgid "S_ecurity" msgstr "" -#: mail/mail-config.glade.h:100 +#: mail/mail-config.glade.h:103 msgid "Secure MIME (S/MIME)" msgstr "" -#: mail/mail-config.glade.h:101 +#: mail/mail-config.glade.h:104 msgid "Select HTML fixed width font" msgstr "" -#: mail/mail-config.glade.h:102 +#: mail/mail-config.glade.h:105 msgid "Select HTML fixed width font for printing" msgstr "" -#: mail/mail-config.glade.h:103 +#: mail/mail-config.glade.h:106 msgid "Select HTML variable width font" msgstr "" -#: mail/mail-config.glade.h:104 +#: mail/mail-config.glade.h:107 msgid "Select HTML variable width font for printing" msgstr "" -#: mail/mail-config.glade.h:105 +#: mail/mail-config.glade.h:108 msgid "Sending Email" msgstr "" -#: mail/mail-config.glade.h:107 +#: mail/mail-config.glade.h:110 #, fuzzy msgid "Sent _messages folder:" msgstr "Synchronising \"%s\"" -#: mail/mail-config.glade.h:108 +#: mail/mail-config.glade.h:111 msgid "Sent and Draft Messages" msgstr "" -#: mail/mail-config.glade.h:109 +#: mail/mail-config.glade.h:112 msgid "Ser_ver requires authentication" msgstr "" -#: mail/mail-config.glade.h:110 +#: mail/mail-config.glade.h:113 msgid "Server Configuration" msgstr "" -#: mail/mail-config.glade.h:111 +#: mail/mail-config.glade.h:114 msgid "Server _Type: " msgstr "" -#: mail/mail-config.glade.h:112 +#: mail/mail-config.glade.h:115 msgid "Si_gning certificate:" msgstr "" -#: mail/mail-config.glade.h:113 +#: mail/mail-config.glade.h:116 msgid "Specify _filename:" msgstr "" -#: mail/mail-config.glade.h:114 +#: mail/mail-config.glade.h:117 msgid "Spell _Checking" msgstr "" -#: mail/mail-config.glade.h:115 +#: mail/mail-config.glade.h:118 msgid "Standard Unix mbox" msgstr "" -#: mail/mail-config.glade.h:116 +#: mail/mail-config.glade.h:119 msgid "" "The output of this script will be used as your\n" "signature. The name you specify will be used\n" "for display purposes only. " msgstr "" -#: mail/mail-config.glade.h:119 +#: mail/mail-config.glade.h:122 msgid "" "This page allows you to configure spell checking behavior and language. The " "list of languages here reflects only the languages for which you have a " "dictionary installed." msgstr "" -#: mail/mail-config.glade.h:121 +#: mail/mail-config.glade.h:124 msgid "" "Type the name by which you would like to refer to this account.\n" "For example: \"Work\" or \"Personal\"" msgstr "" -#: mail/mail-config.glade.h:124 +#: mail/mail-config.glade.h:126 +msgid "Use _Daemon" +msgstr "" + +#: mail/mail-config.glade.h:128 msgid "V_ariable-width:" msgstr "" -#: mail/mail-config.glade.h:125 +#: mail/mail-config.glade.h:129 msgid "" "Welcome to the Evolution Mail Configuration Assistant.\n" "\n" "Click \"Forward\" to begin. " msgstr "" -#: mail/mail-config.glade.h:130 +#: mail/mail-config.glade.h:134 msgid "_Add Signature" msgstr "" -#: mail/mail-config.glade.h:131 +#: mail/mail-config.glade.h:135 msgid "_Always load images off the net" msgstr "" -#: mail/mail-config.glade.h:132 +#: mail/mail-config.glade.h:136 msgid "_Always sign outgoing messages when using this account" msgstr "" -#: mail/mail-config.glade.h:133 +#: mail/mail-config.glade.h:137 msgid "_Authentication Type: " msgstr "" -#: mail/mail-config.glade.h:134 +#: mail/mail-config.glade.h:138 msgid "_Authentication type: " msgstr "" -#: mail/mail-config.glade.h:135 +#: mail/mail-config.glade.h:139 msgid "_Automatically check for new mail every" msgstr "" -#: mail/mail-config.glade.h:136 +#: mail/mail-config.glade.h:140 msgid "_Automatically insert smiley images" msgstr "" -#: mail/mail-config.glade.h:137 +#: mail/mail-config.glade.h:141 msgid "_Beep when new mail arrives" msgstr "" -#: mail/mail-config.glade.h:138 +#: mail/mail-config.glade.h:142 msgid "_Confirm when expunging a folder" msgstr "" -#: mail/mail-config.glade.h:139 +#: mail/mail-config.glade.h:143 msgid "_Default signature:" msgstr "" -#: mail/mail-config.glade.h:140 +#: mail/mail-config.glade.h:144 msgid "_Defaults" msgstr "" -#: mail/mail-config.glade.h:141 +#: mail/mail-config.glade.h:145 msgid "_Do not notify me when new mail arrives" msgstr "" -#: mail/mail-config.glade.h:143 +#: mail/mail-config.glade.h:147 msgid "_Enable" msgstr "" -#: mail/mail-config.glade.h:144 +#: mail/mail-config.glade.h:148 msgid "_Encrypt outgoing messages (by default)" msgstr "" -#: mail/mail-config.glade.h:145 +#: mail/mail-config.glade.h:149 msgid "_Forward style:" msgstr "" -#: mail/mail-config.glade.h:146 +#: mail/mail-config.glade.h:150 msgid "_Full name:" msgstr "" -#: mail/mail-config.glade.h:148 +#: mail/mail-config.glade.h:152 msgid "_HTML Mail" msgstr "" -#: mail/mail-config.glade.h:150 +#: mail/mail-config.glade.h:154 msgid "_Identity" msgstr "" -#: mail/mail-config.glade.h:151 +#: mail/mail-config.glade.h:155 +msgid "_Junk" +msgstr "" + +#: mail/mail-config.glade.h:156 msgid "_Load images if sender is in addressbook" msgstr "" -#: mail/mail-config.glade.h:152 +#: mail/mail-config.glade.h:157 +msgid "_Local Tests Only" +msgstr "" + +#: mail/mail-config.glade.h:158 msgid "_Make this my default account" msgstr "" -#: mail/mail-config.glade.h:153 +#: mail/mail-config.glade.h:159 msgid "_Mark messages as read after" msgstr "" -#: mail/mail-config.glade.h:154 +#: mail/mail-config.glade.h:160 msgid "_Name:" msgstr "" -#: mail/mail-config.glade.h:155 +#: mail/mail-config.glade.h:161 msgid "_Never load images off the net" msgstr "" -#: mail/mail-config.glade.h:157 +#: mail/mail-config.glade.h:163 msgid "_Play sound file when new mail arrives" msgstr "" -#: mail/mail-config.glade.h:158 +#: mail/mail-config.glade.h:164 msgid "_Prompt when sending HTML messages to contacts that don't want them" msgstr "" -#: mail/mail-config.glade.h:159 +#: mail/mail-config.glade.h:165 msgid "_Prompt when sending messages with an empty subject line" msgstr "" -#: mail/mail-config.glade.h:160 +#: mail/mail-config.glade.h:166 msgid "_Receiving Mail" msgstr "" -#: mail/mail-config.glade.h:161 +#: mail/mail-config.glade.h:167 msgid "_Reply style:" msgstr "" -#: mail/mail-config.glade.h:162 +#: mail/mail-config.glade.h:168 msgid "_Restore defaults" msgstr "" -#: mail/mail-config.glade.h:163 +#: mail/mail-config.glade.h:169 msgid "_Script:" msgstr "" -#: mail/mail-config.glade.h:164 +#: mail/mail-config.glade.h:170 #, fuzzy msgid "_Select..." msgstr "Synchronising \"%s\"" -#: mail/mail-config.glade.h:165 +#: mail/mail-config.glade.h:171 msgid "_Sending Mail" msgstr "" -#: mail/mail-config.glade.h:166 +#: mail/mail-config.glade.h:172 msgid "_Show animated images" msgstr "" -#: mail/mail-config.glade.h:167 +#: mail/mail-config.glade.h:173 msgid "_Signatures" msgstr "" -#: mail/mail-config.glade.h:168 +#: mail/mail-config.glade.h:174 msgid "_Standard Font:" msgstr "" -#: mail/mail-config.glade.h:169 +#: mail/mail-config.glade.h:175 msgid "_Terminal Font:" msgstr "" -#: mail/mail-config.glade.h:170 +#: mail/mail-config.glade.h:176 msgid "_Use secure connection (SSL):" msgstr "" -#: mail/mail-config.glade.h:171 +#: mail/mail-config.glade.h:177 msgid "_Use the same fonts as other applications" msgstr "" -#: mail/mail-config.glade.h:173 +#: mail/mail-config.glade.h:179 msgid "description" msgstr "" -#: mail/mail-folder-cache.c:830 +#: mail/mail-folder-cache.c:776 #, fuzzy, c-format msgid "Pinging %s" msgstr "Synchronise \"%s\"" -#: mail/mail-mt.c:257 +#: mail/mail-mt.c:260 #, c-format msgid "" "Error while '%s':\n" "%s" msgstr "" -#: mail/mail-mt.c:260 +#: mail/mail-mt.c:263 #, c-format msgid "" "Error while performing operation:\n" "%s" msgstr "" -#: mail/mail-mt.c:911 +#: mail/mail-mt.c:903 msgid "Working" msgstr "" @@ -12751,158 +13598,162 @@ msgstr "Synchronising \"%s\"" msgid "Fetching Mail" msgstr "" -#: mail/mail-ops.c:561 +#: mail/mail-ops.c:558 #, fuzzy, c-format msgid "Failed to apply outgoing filters: %s" msgstr "Synchronising \"%s\"" -#: mail/mail-ops.c:582 +#: mail/mail-ops.c:579 #, c-format msgid "" "Failed to append to %s: %s\n" "Appending to local `Sent' folder instead." msgstr "" -#: mail/mail-ops.c:591 +#: mail/mail-ops.c:588 #, fuzzy, c-format msgid "Failed to append to local `Sent' folder: %s" msgstr "Synchronising \"%s\"" -#: mail/mail-ops.c:633 +#: mail/mail-ops.c:630 #, c-format msgid "Sending \"%s\"" msgstr "" -#: mail/mail-ops.c:751 +#: mail/mail-ops.c:748 #, c-format msgid "Sending message %d of %d" msgstr "" -#: mail/mail-ops.c:770 +#: mail/mail-ops.c:767 #, c-format msgid "Failed on message %d of %d" msgstr "" -#: mail/mail-ops.c:772 +#: mail/mail-ops.c:769 msgid "Complete." msgstr "" -#: mail/mail-ops.c:866 +#: mail/mail-ops.c:863 msgid "Saving message to folder" msgstr "" -#: mail/mail-ops.c:947 +#: mail/mail-ops.c:944 #, c-format msgid "Moving messages to %s" msgstr "" -#: mail/mail-ops.c:947 +#: mail/mail-ops.c:944 #, c-format msgid "Copying messages to %s" msgstr "" -#: mail/mail-ops.c:1060 +#: mail/mail-ops.c:1057 #, c-format msgid "Scanning folders in \"%s\"" msgstr "" -#: mail/mail-ops.c:1248 +#: mail/mail-ops.c:1260 msgid "Forwarded messages" msgstr "" -#: mail/mail-ops.c:1291 +#: mail/mail-ops.c:1303 #, c-format msgid "Opening folder %s" msgstr "" -#: mail/mail-ops.c:1363 +#: mail/mail-ops.c:1375 #, c-format msgid "Opening store %s" msgstr "" -#: mail/mail-ops.c:1441 +#: mail/mail-ops.c:1453 #, fuzzy, c-format msgid "Removing folder %s" msgstr "Synchronising \"%s\"" -#: mail/mail-ops.c:1535 +#: mail/mail-ops.c:1547 #, fuzzy, c-format msgid "Storing folder '%s'" msgstr "Synchronising \"%s\"" -#: mail/mail-ops.c:1586 +#: mail/mail-ops.c:1598 #, fuzzy msgid "Refreshing folder" msgstr "Synchronising \"%s\"" -#: mail/mail-ops.c:1622 mail/mail-ops.c:1673 +#: mail/mail-ops.c:1634 mail/mail-ops.c:1685 msgid "Expunging folder" msgstr "" -#: mail/mail-ops.c:1670 +#: mail/mail-ops.c:1682 #, c-format msgid "Emptying trash in '%s'" msgstr "" -#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151 +#: mail/mail-ops.c:1683 msgid "Local Folders" msgstr "" -#: mail/mail-ops.c:1746 +#: mail/mail-ops.c:1766 #, c-format msgid "Retrieving message %s" msgstr "" -#: mail/mail-ops.c:1818 +#: mail/mail-ops.c:1838 #, c-format msgid "Retrieving %d message(s)" msgstr "" -#: mail/mail-ops.c:1902 +#: mail/mail-ops.c:1922 #, c-format msgid "Saving %d messsage(s)" msgstr "" -#: mail/mail-ops.c:1950 +#: mail/mail-ops.c:1970 #, c-format msgid "" "Unable to create output file: %s\n" " %s" msgstr "" -#: mail/mail-ops.c:1978 +#: mail/mail-ops.c:1998 #, c-format msgid "" "Error saving messages to: %s:\n" " %s" msgstr "" -#: mail/mail-ops.c:2049 +#: mail/mail-ops.c:2069 msgid "Saving attachment" msgstr "" -#: mail/mail-ops.c:2066 +#: mail/mail-ops.c:2086 #, c-format msgid "" "Cannot create output file: %s:\n" " %s" msgstr "" -#: mail/mail-ops.c:2096 +#: mail/mail-ops.c:2116 #, c-format msgid "Could not write data: %s" msgstr "" -#: mail/mail-ops.c:2244 +#: mail/mail-ops.c:2264 #, c-format msgid "Disconnecting from %s" msgstr "" -#: mail/mail-ops.c:2244 +#: mail/mail-ops.c:2264 #, fuzzy, c-format msgid "Reconnecting to %s" msgstr "Synchronise \"%s\"" +#: mail/mail-ops.c:2366 +msgid "Changing junk status" +msgstr "" + #: mail/mail-search.glade.h:2 msgid "Case Sensitive" msgstr "" @@ -12919,59 +13770,72 @@ msgstr "" msgid "Search" msgstr "" -#: mail/mail-send-recv.c:148 +#: mail/mail-security.glade.h:2 +msgid "Digital Signature" +msgstr "" + +#: mail/mail-security.glade.h:3 +#, fuzzy +msgid "Encryption" +msgstr "Synchronising \"%s\"" + +#: mail/mail-security.glade.h:4 +msgid "Security Information" +msgstr "" + +#: mail/mail-send-recv.c:146 msgid "Cancelling..." msgstr "" -#: mail/mail-send-recv.c:256 +#: mail/mail-send-recv.c:253 #, c-format msgid "Server: %s, Type: %s" msgstr "" -#: mail/mail-send-recv.c:258 +#: mail/mail-send-recv.c:255 #, c-format msgid "Path: %s, Type: %s" msgstr "" -#: mail/mail-send-recv.c:260 +#: mail/mail-send-recv.c:257 #, c-format msgid "Type: %s" msgstr "" -#: mail/mail-send-recv.c:309 +#: mail/mail-send-recv.c:306 msgid "Send & Receive Mail" msgstr "" -#: mail/mail-send-recv.c:310 +#: mail/mail-send-recv.c:307 msgid "Cancel _All" msgstr "" -#: mail/mail-send-recv.c:391 +#: mail/mail-send-recv.c:388 msgid "Updating..." msgstr "" -#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443 +#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440 msgid "Waiting..." msgstr "" -#: mail/mail-session.c:230 +#: mail/mail-session.c:234 msgid "User canceled operation." msgstr "" -#: mail/mail-session.c:263 +#: mail/mail-session.c:267 #, c-format msgid "Enter Password for %s" msgstr "" -#: mail/mail-session.c:265 +#: mail/mail-session.c:269 msgid "Enter Password" msgstr "" -#: mail/mail-session.c:288 +#: mail/mail-session.c:292 msgid "_Remember this password" msgstr "" -#: mail/mail-session.c:289 +#: mail/mail-session.c:293 msgid "_Remember this password for the remainder of this session" msgstr "" @@ -13007,26 +13871,31 @@ msgstr "" msgid "Name:" msgstr "" -#: mail/mail-tools.c:279 +#: mail/mail-tools.c:271 #, c-format msgid "Forwarded message - %s" msgstr "" -#: mail/mail-tools.c:281 +#: mail/mail-tools.c:273 msgid "Forwarded message" msgstr "" -#: mail/mail-vfolder.c:91 +#: mail/mail-tools.c:313 +#, fuzzy, c-format +msgid "Invalid folder: `%s'" +msgstr "Synchronising \"%s\"" + +#: mail/mail-vfolder.c:87 #, fuzzy, c-format msgid "Setting up vfolder: %s" msgstr "Synchronising \"%s\"" -#: mail/mail-vfolder.c:209 +#: mail/mail-vfolder.c:205 #, fuzzy, c-format msgid "Updating vfolders for uri: %s" msgstr "Synchronising \"%s\"" -#: mail/mail-vfolder.c:467 +#: mail/mail-vfolder.c:463 #, c-format msgid "" "The following vFolder(s):\n" @@ -13035,90 +13904,90 @@ msgid "" "And have been updated." msgstr "" -#: mail/mail-vfolder.c:780 +#: mail/mail-vfolder.c:774 msgid "VFolders" msgstr "" -#: mail/mail-vfolder.c:839 +#: mail/mail-vfolder.c:833 #, fuzzy msgid "vFolders" msgstr "Synchronising \"%s\"" -#: mail/mail-vfolder.c:878 +#: mail/mail-vfolder.c:872 #, fuzzy msgid "Edit VFolder" msgstr "Synchronising \"%s\"" -#: mail/mail-vfolder.c:898 +#: mail/mail-vfolder.c:892 #, c-format msgid "Trying to edit a vfolder '%s' which doesn't exist." msgstr "" -#: mail/mail-vfolder.c:970 +#: mail/mail-vfolder.c:964 msgid "New VFolder" msgstr "" -#: mail/message-list.c:900 +#: mail/message-list.c:904 msgid "Unseen" msgstr "" -#: mail/message-list.c:901 +#: mail/message-list.c:905 msgid "Seen" msgstr "" -#: mail/message-list.c:902 +#: mail/message-list.c:906 msgid "Answered" msgstr "" -#: mail/message-list.c:903 +#: mail/message-list.c:907 msgid "Multiple Unseen Messages" msgstr "" -#: mail/message-list.c:904 +#: mail/message-list.c:908 msgid "Multiple Messages" msgstr "" -#: mail/message-list.c:908 +#: mail/message-list.c:912 msgid "Lowest" msgstr "" -#: mail/message-list.c:909 +#: mail/message-list.c:913 msgid "Lower" msgstr "" -#: mail/message-list.c:913 +#: mail/message-list.c:917 msgid "Higher" msgstr "" -#: mail/message-list.c:914 +#: mail/message-list.c:918 msgid "Highest" msgstr "" -#: mail/message-list.c:1231 +#: mail/message-list.c:1241 msgid "?" msgstr "" -#: mail/message-list.c:1238 +#: mail/message-list.c:1248 msgid "Today %l:%M %p" msgstr "" -#: mail/message-list.c:1247 +#: mail/message-list.c:1257 msgid "Yesterday %l:%M %p" msgstr "" -#: mail/message-list.c:1259 +#: mail/message-list.c:1269 msgid "%a %l:%M %p" msgstr "" -#: mail/message-list.c:1267 +#: mail/message-list.c:1277 msgid "%b %d %l:%M %p" msgstr "" -#: mail/message-list.c:1269 +#: mail/message-list.c:1279 msgid "%b %d %Y" msgstr "" -#: mail/message-list.c:3062 +#: mail/message-list.c:3082 msgid "Generating message list" msgstr "" @@ -13175,11 +14044,11 @@ msgstr "" msgid "No Response Necessary" msgstr "" -#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77 +#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83 msgid "Reply" msgstr "" -#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78 +#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84 msgid "Reply to All" msgstr "" @@ -13232,41 +14101,133 @@ msgstr "" msgid "_Unsubscribe" msgstr "" -#: shell/e-folder-dnd-bridge.c:55 -#, fuzzy, c-format +#: shell/GNOME_Evolution_Shell.server.in.in.h:1 +msgid "Configure special folders and offline folder behavior here" +msgstr "" + +#: shell/GNOME_Evolution_Shell.server.in.in.h:2 +#, fuzzy +msgid "Evolution Shell" +msgstr "Cannot initialise the Evolution shell." + +#: shell/GNOME_Evolution_Shell.server.in.in.h:4 +#, fuzzy +msgid "Folder Settings" +msgstr "Synchronising \"%s\"" + +#: shell/apps_evolution_shell.schemas.in.in.h:1 +msgid "480" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:2 +#, fuzzy +msgid "Default shortcut group" +msgstr "Synchronising \"%s\"" + +#: shell/apps_evolution_shell.schemas.in.in.h:3 +msgid "Default width of the folder bar pane" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:4 +msgid "Default width of the shortcut bar pane" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:5 +msgid "Default window height" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:6 +msgid "Default window width" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:7 +#, fuzzy +msgid "Evolution configuration version" +msgstr "Cannot initialise Evolution's mail component." + +#: shell/apps_evolution_shell.schemas.in.in.h:8 +msgid "ID or alias of the component to be shown by default at start-up." +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:9 msgid "" -"Cannot transfer folder:\n" -"%s" +"If set to true, Evolution will start up in offline mode instead of online " +"mode." +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:10 +msgid "" +"If set to true, the warning dialog in development versions of Evolution is " +"not displayed." +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:11 +msgid "" +"List of paths for the folders to be synchronized to disk for offline usage" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:12 +msgid "Path to the default calendar folder" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:13 +#, fuzzy +msgid "Path to the default contacts folder" msgstr "Synchronising \"%s\"" -#: shell/e-folder-list.c:338 +#: shell/apps_evolution_shell.schemas.in.in.h:14 #, fuzzy -msgid "Add a Folder" +msgid "Path to the default mail folder" msgstr "Synchronising \"%s\"" -#: shell/e-local-storage.c:179 -msgid "Drafts" +#: shell/apps_evolution_shell.schemas.in.in.h:15 +#, fuzzy +msgid "Path to the default tasks folder" +msgstr "Synchronising \"%s\"" + +#: shell/apps_evolution_shell.schemas.in.in.h:16 +msgid "Physical URI to the default calendar folder" msgstr "" -#: shell/e-local-storage.c:180 shell/e-shell-view.c:481 -#: shell/e-shortcuts.c:1084 -msgid "Inbox" +#: shell/apps_evolution_shell.schemas.in.in.h:17 +msgid "Physical URI to the default contacts folder" msgstr "" -#: shell/e-local-storage.c:181 -msgid "Outbox" +#: shell/apps_evolution_shell.schemas.in.in.h:18 +msgid "Physical URI to the default mail folder" msgstr "" -#: shell/e-local-storage.c:182 +#: shell/apps_evolution_shell.schemas.in.in.h:19 #, fuzzy -msgid "Sent" +msgid "Physical URI to the default tasks folder" msgstr "Synchronising \"%s\"" -#: shell/e-setup.c:145 +#: shell/apps_evolution_shell.schemas.in.in.h:20 +msgid "Whether Evolution should start up in offline mode" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:21 +msgid "Whether to show the folder bar" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:22 +msgid "Whether to show the shortcut bar" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:23 +msgid "Whether to skip the development warning dialog" +msgstr "" + +#: shell/apps_evolution_shell.schemas.in.in.h:24 +#, fuzzy +msgid "mail" +msgstr "Colours" + +#: shell/e-setup.c:144 msgid "Could not update files correctly" msgstr "" -#: shell/e-setup.c:166 +#: shell/e-setup.c:165 #, c-format msgid "" "Cannot create the directory\n" @@ -13274,14 +14235,14 @@ msgid "" "Error: %s" msgstr "" -#: shell/e-setup.c:177 +#: shell/e-setup.c:176 #, c-format msgid "" "An error occurred in copying files into\n" "`%s'." msgstr "" -#: shell/e-setup.c:243 +#: shell/e-setup.c:242 #, c-format msgid "" "The file `%s' is not a directory.\n" @@ -13289,7 +14250,7 @@ msgid "" "of the Evolution user files." msgstr "" -#: shell/e-setup.c:252 +#: shell/e-setup.c:251 #, c-format msgid "" "The directory `%s' exists but is not the\n" @@ -13387,9 +14348,10 @@ msgid "" "%s" msgstr "Synchronising \"%s\"" -#: shell/e-shell-folder-commands.c:554 +#: shell/e-shell-folder-commands.c:547 +#: shell/e-shell-folder-creation-dialog.c:180 #, c-format -msgid "A folder named \"%s\" already exists. Please use a different name." +msgid "The specified folder name is not valid: %s" msgstr "" #: shell/e-shell-folder-commands.c:584 @@ -13410,20 +14372,15 @@ msgid "" "%s" msgstr "" -#: shell/e-shell-folder-creation-dialog.c:318 -#, fuzzy -msgid "Create New Folder" -msgstr "Synchronising \"%s\"" - #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593 msgid "(Untitled)" msgstr "" -#: shell/e-shell-importer.c:139 +#: shell/e-shell-importer.c:138 msgid "Choose the type of importer to run:" msgstr "" -#: shell/e-shell-importer.c:142 +#: shell/e-shell-importer.c:141 msgid "" "Choose the file that you want to import into Evolution, and select what type " "of file it is from the list.\n" @@ -13432,11 +14389,11 @@ msgid "" "to work it out." msgstr "" -#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724 +#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731 msgid "Please select the information that you would like to import:" msgstr "" -#: shell/e-shell-importer.c:151 +#: shell/e-shell-importer.c:150 msgid "" "Evolution checked for settings to import from the following\n" "applications: Pine, Netscape, Elm, iCalendar. No settings\n" @@ -13444,134 +14401,116 @@ msgid "" "try again, please click the \"Back\" button.\n" msgstr "" -#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250 +#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249 #, c-format msgid "" "Importing %s\n" "Importing item %d." msgstr "" -#: shell/e-shell-importer.c:323 +#: shell/e-shell-importer.c:322 #, fuzzy msgid "Select importer" msgstr "Synchronising \"%s\"" -#: shell/e-shell-importer.c:464 +#: shell/e-shell-importer.c:463 #, c-format msgid "File %s does not exist" msgstr "" -#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482 -#: shell/e-shell-importer.c:524 +#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481 +#: shell/e-shell-importer.c:523 #, fuzzy msgid "Evolution Error" msgstr "Cannot initialise the Evolution shell." -#: shell/e-shell-importer.c:481 +#: shell/e-shell-importer.c:480 #, c-format msgid "" "There is no importer that is able to handle\n" "%s" msgstr "" -#: shell/e-shell-importer.c:490 +#: shell/e-shell-importer.c:489 msgid "Importing" msgstr "" -#: shell/e-shell-importer.c:497 +#: shell/e-shell-importer.c:496 #, c-format msgid "" "Importing %s.\n" "Starting %s" msgstr "" -#: shell/e-shell-importer.c:509 +#: shell/e-shell-importer.c:508 #, c-format msgid "Error starting %s" msgstr "" -#: shell/e-shell-importer.c:523 +#: shell/e-shell-importer.c:522 #, c-format msgid "Error loading %s" msgstr "" -#: shell/e-shell-importer.c:540 +#: shell/e-shell-importer.c:539 #, c-format msgid "" "Importing %s\n" "Importing item 1." msgstr "" -#: shell/e-shell-importer.c:594 +#: shell/e-shell-importer.c:593 msgid "Automatic" msgstr "" -#: shell/e-shell-importer.c:643 +#: shell/e-shell-importer.c:642 #, fuzzy msgid "_Filename:" msgstr "Synchronising \"%s\"" -#: shell/e-shell-importer.c:648 +#: shell/e-shell-importer.c:647 msgid "Select a file" msgstr "" -#: shell/e-shell-importer.c:658 +#: shell/e-shell-importer.c:657 msgid "File _type:" msgstr "" -#: shell/e-shell-importer.c:684 +#: shell/e-shell-importer.c:683 msgid "Import data and settings from _older programs" msgstr "" -#: shell/e-shell-importer.c:687 +#: shell/e-shell-importer.c:686 msgid "Import a _single file" msgstr "" -#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553 +#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560 msgid "" "Please wait...\n" "Scanning for existing setups" msgstr "" -#: shell/e-shell-importer.c:758 +#: shell/e-shell-importer.c:757 msgid "Starting Intelligent Importers" msgstr "" -#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679 +#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686 #, c-format msgid "From %s:" msgstr "" -#: shell/e-shell-importer.c:1062 +#: shell/e-shell-importer.c:1061 msgid "Select a destination folder for importing this data" msgstr "" -#: shell/e-shell-importer.c:1191 +#: shell/e-shell-importer.c:1190 msgid "_Import" msgstr "" -#: shell/e-shell-offline-handler.c:592 +#: shell/e-shell-offline-handler.c:596 msgid "Closing connections..." msgstr "" -#: shell/e-shell-offline-sync.c:163 -#, c-format -msgid "" -"Error synchronizing \"%s\":\n" -"%s" -msgstr "" - -#: shell/e-shell-offline-sync.c:232 -#, fuzzy -msgid "Syncing Folder" -msgstr "Synchronising \"%s\"" - -#. Prepare the dialog. -#: shell/e-shell-offline-sync.c:311 -#, fuzzy, c-format -msgid "Synchronizing \"%s\" (%d of %d) ..." -msgstr "Synchronising \"%s\"" - #: shell/e-shell-settings-dialog.c:346 #, fuzzy msgid "Evolution Settings" @@ -13608,7 +14547,7 @@ msgstr "Synchronising \"%s\"" msgid "Cannot find the specified shared folder." msgstr "" -#: shell/e-shell-startup-wizard.c:771 +#: shell/e-shell-startup-wizard.c:778 msgid "" "If you quit the Evolution Setup Assistant now, all of the information that " "you have entered will be forgotten. You will need to run this assistant " @@ -13617,17 +14556,11 @@ msgid "" "Do you want to quit using the Assistant now?" msgstr "" -#: shell/e-shell-startup-wizard.c:782 +#: shell/e-shell-startup-wizard.c:789 #, fuzzy msgid "Quit Assistant" msgstr "Cannot initialise the Evolution shell." -#: shell/e-shell-user-creatable-items-handler.c:587 -#: shell/e-shell-user-creatable-items-handler.c:643 -#: widgets/misc/e-charset-picker.c:109 -msgid "New" -msgstr "" - #: shell/e-shell-utils.c:116 msgid "No folder name specified." msgstr "" @@ -13686,60 +14619,47 @@ msgstr "" msgid "Select the folder you want the shortcut to point to:" msgstr "" -#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279 +#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314 msgid "_Work Online" msgstr "" -#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292 -#: ui/evolution.xml.h:31 +#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327 +#: ui/evolution.xml.h:34 msgid "_Work Offline" msgstr "" -#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305 -#: ui/evolution.xml.h:19 +#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340 +#: ui/evolution.xml.h:20 msgid "Work Offline" msgstr "" -#: shell/e-shell-view.c:264 -msgid "(No folder displayed)" -msgstr "" - -#: shell/e-shell-view.c:2040 -#, c-format -msgid "%s (%d)" -msgstr "" - -#: shell/e-shell-view.c:2042 -msgid "(None)" -msgstr "" - -#: shell/e-shell-view.c:2083 +#: shell/e-shell-window.c:324 msgid "" "Ximian Evolution is currently online. Click on this button to work offline." msgstr "" -#: shell/e-shell-view.c:2090 +#: shell/e-shell-window.c:331 msgid "Ximian Evolution is in the process of going offline." msgstr "" -#: shell/e-shell-view.c:2096 +#: shell/e-shell-window.c:337 msgid "" "Ximian Evolution is currently offline. Click on this button to work online." msgstr "" -#: shell/e-shell.c:906 +#: shell/e-shell.c:1003 msgid "Invalid arguments" msgstr "" -#: shell/e-shell.c:908 +#: shell/e-shell.c:1005 msgid "Cannot register on OAF" msgstr "" -#: shell/e-shell.c:910 +#: shell/e-shell.c:1007 msgid "Configuration Database not found" msgstr "" -#: shell/e-shell.c:912 shell/e-storage.c:571 +#: shell/e-shell.c:1009 msgid "Generic error" msgstr "" @@ -13854,73 +14774,16 @@ msgstr "" msgid "Remove this shortcut from the shortcut bar" msgstr "" -#: shell/e-shortcuts.c:649 +#: shell/e-shortcuts.c:650 msgid "Error saving shortcuts." msgstr "" -#: shell/e-shortcuts.c:1096 -msgid "Shortcuts" -msgstr "" - -#: shell/e-storage.c:569 -msgid "No error" -msgstr "" - -#: shell/e-storage.c:573 -msgid "A folder with the same name already exists" -msgstr "" - -#: shell/e-storage.c:575 -msgid "The specified folder type is not valid" -msgstr "" - -#: shell/e-storage.c:577 -msgid "I/O error" -msgstr "" - -#: shell/e-storage.c:579 -msgid "Not enough space to create the folder" -msgstr "" - -#: shell/e-storage.c:581 -msgid "The folder is not empty" -msgstr "" - -#: shell/e-storage.c:583 -msgid "The specified folder was not found" -msgstr "" - -#: shell/e-storage.c:585 -msgid "Function not implemented in this storage" -msgstr "" - -#: shell/e-storage.c:589 -msgid "Operation not supported" -msgstr "" - -#: shell/e-storage.c:591 -msgid "The specified type is not supported in this storage" -msgstr "" - -#: shell/e-storage.c:593 -msgid "The specified folder cannot be modified or removed" -msgstr "" - -#: shell/e-storage.c:595 -msgid "Cannot make a folder a child of one of its descendants" -msgstr "" - -#: shell/e-storage.c:597 -#, fuzzy -msgid "Cannot create a folder with that name" -msgstr "Synchronising \"%s\"" - -#: shell/e-storage.c:599 -msgid "This operation cannot be performed in off-line mode" +#: shell/e-shortcuts.c:1085 +msgid "Inbox" msgstr "" -#: shell/e-storage-set-view.etspec.h:1 -msgid "Checkbox" +#: shell/e-shortcuts.c:1097 +msgid "Shortcuts" msgstr "" #: shell/e-task-widget.c:211 @@ -13933,6 +14796,17 @@ msgstr "" msgid "%s (%d%% complete)" msgstr "" +#: shell/e-user-creatable-items-handler.c:600 +#: shell/e-user-creatable-items-handler.c:641 +#: widgets/misc/e-charset-picker.c:109 +msgid "New" +msgstr "" + +#: shell/evolution-folder-selector-button.c:128 +#, c-format +msgid "\"%s\" in \"%s\"" +msgstr "" + #: shell/evolution-shell-component-utils.c:124 #, c-format msgid "" @@ -13959,76 +14833,6 @@ msgid "" "%s" msgstr "" -#: shell/evolution-shell-component.c:1187 -msgid "CORBA error" -msgstr "" - -#: shell/evolution-shell-component.c:1189 -msgid "Interrupted" -msgstr "" - -#: shell/evolution-shell-component.c:1191 -msgid "Invalid argument" -msgstr "" - -#: shell/evolution-shell-component.c:1193 -msgid "Already has an owner" -msgstr "" - -#: shell/evolution-shell-component.c:1195 -msgid "No owner" -msgstr "" - -#: shell/evolution-shell-component.c:1197 -msgid "Not found" -msgstr "" - -#: shell/evolution-shell-component.c:1199 -msgid "Unsupported type" -msgstr "" - -#: shell/evolution-shell-component.c:1201 -msgid "Unsupported schema" -msgstr "" - -#: shell/evolution-shell-component.c:1203 -msgid "Unsupported operation" -msgstr "" - -#: shell/evolution-shell-component.c:1205 -msgid "Internal error" -msgstr "" - -#: shell/evolution-shell-component.c:1209 -msgid "Exists" -msgstr "" - -#: shell/evolution-shell-component.c:1211 -msgid "Invalid URI" -msgstr "" - -#: shell/evolution-shell-component.c:1215 -#, fuzzy -msgid "Has subfolders" -msgstr "Synchronising \"%s\"" - -#: shell/evolution-shell-component.c:1217 -msgid "No space left" -msgstr "" - -#: shell/evolution-shell-component.c:1219 -msgid "Old owner has died" -msgstr "" - -#: shell/evolution-test-component.c:63 -msgid "Test type" -msgstr "" - -#: shell/evolution-test-component.c:703 -#, fuzzy -msgid "Evolution Test Component" -msgstr "Cannot initialise Evolution's mail component." - #: shell/glade/e-active-connection-dialog.glade.h:1 #, fuzzy msgid "Active Connections" @@ -14060,10 +14864,6 @@ msgstr "" msgid "_Tasks:" msgstr "" -#: shell/glade/e-shell-folder-creation-dialog.glade.h:2 -msgid "Folder _name:" -msgstr "" - #: shell/glade/e-shell-folder-creation-dialog.glade.h:3 msgid "Folder _type:" msgstr "" @@ -14118,25 +14918,6 @@ msgid "" "Click the \"Apply\" button to save your settings. " msgstr "" -#: shell/GNOME_Evolution_Shell.server.in.in.h:1 -msgid "Configure special folders and offline folder behavior here" -msgstr "" - -#: shell/GNOME_Evolution_Shell.server.in.in.h:2 -#, fuzzy -msgid "Evolution Shell" -msgstr "Cannot initialise the Evolution shell." - -#: shell/GNOME_Evolution_Shell.server.in.in.h:3 -#, fuzzy -msgid "Evolution folder settings configuration control" -msgstr "Cannot initialise Evolution's mail component." - -#: shell/GNOME_Evolution_Shell.server.in.in.h:4 -#, fuzzy -msgid "Folder Settings" -msgstr "Synchronising \"%s\"" - #: shell/importer/import.glade.h:1 msgid "Click \"Import\" to begin importing the file into Evolution. " msgstr "" @@ -14172,7 +14953,7 @@ msgstr "" msgid "Importers" msgstr "" -#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21 +#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28 msgid "Import" msgstr "" @@ -14188,16 +14969,16 @@ msgstr "" msgid "Evolution can import data from the following files:" msgstr "" -#: shell/main.c:109 shell/main.c:561 +#: shell/main.c:114 shell/main.c:559 msgid "Evolution" msgstr "" -#: shell/main.c:115 +#: shell/main.c:120 msgid "Evolution is now exiting ..." msgstr "" #. Preview/Alpha/Beta version warning message -#: shell/main.c:265 +#: shell/main.c:270 #, no-c-format msgid "" "Hi. Thanks for taking the time to download this preview release\n" @@ -14217,73 +14998,112 @@ msgid "" "eagerly await your contributions!\n" msgstr "" -#: shell/main.c:289 +#: shell/main.c:294 #, fuzzy msgid "" "Thanks\n" "The Ximian Evolution Team\n" msgstr "Cannot initialise the Evolution shell." -#: shell/main.c:297 +#: shell/main.c:302 msgid "Don't tell me again" msgstr "" -#: shell/main.c:389 +#: shell/main.c:352 +#, c-format +msgid "" +"Warning: Evolution could not upgrade all your data from version %s.\n" +"The data hasn't been deleted, but it will not be seen by this version of " +"Evolution.\n" +msgstr "" + +#: shell/main.c:411 #, fuzzy msgid "Cannot access the Ximian Evolution shell." msgstr "Cannot initialise the Evolution shell." -#: shell/main.c:398 +#: shell/main.c:420 #, fuzzy, c-format msgid "Cannot initialize the Ximian Evolution shell: %s" msgstr "Cannot initialise the Evolution shell." -#: shell/main.c:530 +#: shell/main.c:526 +msgid "Start Evolution activating the specified component" +msgstr "" + +#: shell/main.c:528 msgid "Start in offline mode" msgstr "" -#: shell/main.c:532 +#: shell/main.c:530 msgid "Start in online mode" msgstr "" -#: shell/main.c:535 +#: shell/main.c:533 msgid "Forcibly shut down all evolution components" msgstr "" -#: shell/main.c:538 +#: shell/main.c:536 msgid "Send the debugging output of all components to a file." msgstr "" -#: shell/main.c:565 +#: shell/main.c:563 #, c-format msgid "" "%s: --online and --offline cannot be used together.\n" " Use %s --help for more information.\n" msgstr "" -#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115 -#: smime/gui/certificate-manager.c:168 +#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238 +#: smime/gui/certificate-manager.c:395 +#, fuzzy +msgid "Select a cert to import..." +msgstr "Synchronising \"%s\"" + +#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317 +#: smime/gui/certificate-manager.c:473 msgid "Certificate Name" msgstr "" -#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127 +#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329 #, fuzzy msgid "Purposes" msgstr "Colours" -#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29 +#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36 +#: smime/lib/e-cert.c:512 msgid "Serial Number" msgstr "" -#: smime/gui/certificate-manager.c:92 +#: smime/gui/certificate-manager.c:174 msgid "Expires" msgstr "" -#: smime/gui/certificate-manager.c:121 +#: smime/gui/certificate-manager.c:323 #, fuzzy msgid "E-Mail Address" msgstr "Synchronising \"%s\"" +#: smime/gui/certificate-viewer.c:281 +#, c-format +msgid "Certificate Viewer: %s" +msgstr "" + +#. FIXME: add serial no, validity date, uses +#: smime/gui/e-cert-selector.c:116 +#, c-format +msgid "" +"Issued to:\n" +" Subject: %s\n" +msgstr "" + +#: smime/gui/e-cert-selector.c:117 +#, c-format +msgid "" +"Issued by:\n" +" Subject: %s\n" +msgstr "" + #: smime/gui/smime-ui.glade.h:1 msgid "<Not Part of Certificate>" msgstr "" @@ -14333,83 +15153,334 @@ msgid "Backup All" msgstr "" #: smime/gui/smime-ui.glade.h:13 +msgid "" +"Before trusting this CA for any purpose, you should examine its certificate " +"and its policy and procedures (if available)." +msgstr "" + +#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019 +msgid "Certificate" +msgstr "" + +#: smime/gui/smime-ui.glade.h:15 +msgid "Certificate Authority Trust" +msgstr "" + +#: smime/gui/smime-ui.glade.h:16 +msgid "Certificate details" +msgstr "" + +#: smime/gui/smime-ui.glade.h:17 msgid "Common Name (CN)" msgstr "" -#: smime/gui/smime-ui.glade.h:14 +#: smime/gui/smime-ui.glade.h:18 msgid "Contact Certificates" msgstr "" -#: smime/gui/smime-ui.glade.h:16 +#: smime/gui/smime-ui.glade.h:21 +#, no-c-format +msgid "Do you want to trust \"%s\" for the following purposes?" +msgstr "" + +#: smime/gui/smime-ui.glade.h:22 +msgid "Dummy window only" +msgstr "" + +#: smime/gui/smime-ui.glade.h:23 #, fuzzy msgid "Edit" msgstr "Synchronising \"%s\"" -#: smime/gui/smime-ui.glade.h:17 +#: smime/gui/smime-ui.glade.h:24 msgid "Email Recipient Certificate" msgstr "" -#: smime/gui/smime-ui.glade.h:18 +#: smime/gui/smime-ui.glade.h:25 msgid "Email Signer Certificate" msgstr "" -#: smime/gui/smime-ui.glade.h:19 +#: smime/gui/smime-ui.glade.h:26 msgid "Expires On" msgstr "" -#: smime/gui/smime-ui.glade.h:22 +#: smime/gui/smime-ui.glade.h:29 msgid "Issued On" msgstr "" -#: smime/gui/smime-ui.glade.h:23 +#: smime/gui/smime-ui.glade.h:30 msgid "MD5 Fingerprint" msgstr "" -#: smime/gui/smime-ui.glade.h:24 +#: smime/gui/smime-ui.glade.h:31 #, fuzzy msgid "Organization (O)" msgstr "Organisation" -#: smime/gui/smime-ui.glade.h:25 +#: smime/gui/smime-ui.glade.h:32 #, fuzzy msgid "Organizational Unit (OU)" msgstr "Organisation" -#: smime/gui/smime-ui.glade.h:26 +#: smime/gui/smime-ui.glade.h:33 msgid "SHA1 Fingerprint" msgstr "" -#: smime/gui/smime-ui.glade.h:27 +#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761 msgid "SSL Client Certificate" msgstr "" -#: smime/gui/smime-ui.glade.h:28 +#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765 msgid "SSL Server Certificate" msgstr "" -#: smime/gui/smime-ui.glade.h:30 +#: smime/gui/smime-ui.glade.h:37 +msgid "Trust this CA to identify email users." +msgstr "" + +#: smime/gui/smime-ui.glade.h:38 +msgid "Trust this CA to identify software developers." +msgstr "" + +#: smime/gui/smime-ui.glade.h:39 +msgid "Trust this CA to identify web sites." +msgstr "" + +#: smime/gui/smime-ui.glade.h:40 msgid "View" msgstr "" -#: smime/gui/smime-ui.glade.h:31 +#: smime/gui/smime-ui.glade.h:41 +msgid "View Certificate" +msgstr "" + +#: smime/gui/smime-ui.glade.h:42 +msgid "You have been asked to trust a new Certificate Authority (CA)." +msgstr "" + +#: smime/gui/smime-ui.glade.h:43 msgid "You have certificates from these organizations that identify you:" msgstr "" -#: smime/gui/smime-ui.glade.h:32 +#: smime/gui/smime-ui.glade.h:44 msgid "" "You have certificates on file that identify these certificate authorities:" msgstr "" -#: smime/gui/smime-ui.glade.h:33 +#: smime/gui/smime-ui.glade.h:45 msgid "You have certificates on file that identify these people:" msgstr "" -#: smime/gui/smime-ui.glade.h:34 +#: smime/gui/smime-ui.glade.h:46 msgid "Your Certificates" msgstr "" -#: smime/gui/smime-ui.glade.h:36 -msgid "import" +#: smime/lib/e-cert-db.c:494 +msgid "Certificate already exists" +msgstr "" + +#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239 +msgid "%d/%m/%Y" +msgstr "%m/%d/%Y" + +#: smime/lib/e-cert.c:473 +msgid "Version" +msgstr "" + +#: smime/lib/e-cert.c:488 +msgid "Version 1" +msgstr "" + +#: smime/lib/e-cert.c:491 +msgid "Version 2" +msgstr "" + +#: smime/lib/e-cert.c:494 +msgid "Version 3" +msgstr "" + +#: smime/lib/e-cert.c:576 +msgid "PKCS #1 MD2 With RSA Encryption" +msgstr "" + +#: smime/lib/e-cert.c:579 +msgid "PKCS #1 MD5 With RSA Encryption" +msgstr "" + +#: smime/lib/e-cert.c:582 +msgid "PKCS #1 SHA-1 With RSA Encryption" +msgstr "" + +#: smime/lib/e-cert.c:585 +msgid "C" +msgstr "" + +#: smime/lib/e-cert.c:588 +msgid "CN" +msgstr "" + +#: smime/lib/e-cert.c:591 +msgid "OU" +msgstr "" + +#: smime/lib/e-cert.c:594 +msgid "O" +msgstr "" + +#: smime/lib/e-cert.c:597 +msgid "L" +msgstr "" + +#: smime/lib/e-cert.c:600 +msgid "DN" +msgstr "" + +#: smime/lib/e-cert.c:603 +msgid "DC" +msgstr "" + +#: smime/lib/e-cert.c:606 +msgid "ST" +msgstr "" + +#: smime/lib/e-cert.c:609 +msgid "PKCS #1 RSA Encryption" +msgstr "" + +#: smime/lib/e-cert.c:612 +msgid "Certificate Key Usage" +msgstr "" + +#: smime/lib/e-cert.c:615 +msgid "Netscape Certificate Type" +msgstr "" + +#: smime/lib/e-cert.c:618 +msgid "Certificate Authority Key Identifier" +msgstr "" + +#: smime/lib/e-cert.c:621 +msgid "UID" +msgstr "" + +#: smime/lib/e-cert.c:630 +#, c-format +msgid "Object Identifier (%s)" +msgstr "" + +#: smime/lib/e-cert.c:681 +msgid "Algorithm Identifier" +msgstr "" + +#: smime/lib/e-cert.c:689 +msgid "Algorithm Parameters" +msgstr "" + +#: smime/lib/e-cert.c:711 +msgid "Subject Public Key Info" +msgstr "" + +#: smime/lib/e-cert.c:716 +msgid "Subject Public Key Algorithm" +msgstr "" + +#: smime/lib/e-cert.c:731 +msgid "Subject's Public Key" +msgstr "" + +#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801 +msgid "Error: Unable to process extension" +msgstr "" + +#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785 +msgid "Object Signer" +msgstr "" + +#: smime/lib/e-cert.c:777 +msgid "SSL Certificate Authority" +msgstr "" + +#: smime/lib/e-cert.c:781 +msgid "Email Certificate Authority" +msgstr "" + +#: smime/lib/e-cert.c:809 +#, fuzzy +msgid "Signing" +msgstr "Synchronise \"%s\"" + +#: smime/lib/e-cert.c:813 +msgid "Non-repudiation" +msgstr "" + +#: smime/lib/e-cert.c:817 +msgid "Key Encipherment" +msgstr "" + +#: smime/lib/e-cert.c:821 +msgid "Data Encipherment" +msgstr "" + +#: smime/lib/e-cert.c:825 +msgid "Key Agreement" +msgstr "" + +#: smime/lib/e-cert.c:829 +msgid "Certificate Signer" +msgstr "" + +#: smime/lib/e-cert.c:833 +msgid "CRL Signer" +msgstr "" + +#: smime/lib/e-cert.c:881 +#, fuzzy +msgid "Critical" +msgstr "Organisation" + +#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886 +msgid "Not Critical" +msgstr "" + +#: smime/lib/e-cert.c:907 +msgid "Extensions" +msgstr "" + +#: smime/lib/e-cert.c:978 +#, c-format +msgid "%s = %s" +msgstr "" + +#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154 +msgid "Certificate Signature Algorithm" +msgstr "" + +#: smime/lib/e-cert.c:1043 +msgid "Issuer" +msgstr "" + +#: smime/lib/e-cert.c:1097 +msgid "Issuer Unique ID" +msgstr "" + +#: smime/lib/e-cert.c:1116 +msgid "Subject Unique ID" +msgstr "" + +#: smime/lib/e-cert.c:1159 +msgid "Certificate Signature Value" +msgstr "" + +#: smime/lib/e-pkcs12.c:246 +msgid "PKCS12 File Password" +msgstr "" + +#: smime/lib/e-pkcs12.c:246 +msgid "Enter password for PKCS12 file:" +msgstr "" + +#: smime/lib/e-pkcs12.c:379 +msgid "Imported Certificate" msgstr "" #: tools/evolution-launch-composer.c:324 @@ -14462,7 +15533,7 @@ msgstr "" msgid "Copy to Folder..." msgstr "Synchronising \"%s\"" -#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8 +#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4 msgid "Cut the selection" msgstr "" @@ -14478,7 +15549,7 @@ msgstr "" msgid "Move to Folder..." msgstr "" -#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28 +#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20 msgid "Paste the clipboard" msgstr "" @@ -14486,8 +15557,8 @@ msgstr "" msgid "Previews the contacts to be printed" msgstr "" -#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30 -#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73 +#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22 +#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79 #: ui/evolution-tasks.xml.h:13 msgid "Print Pre_view" msgstr "" @@ -14532,13 +15603,13 @@ msgstr "" msgid "View the current contact" msgstr "" -#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42 +#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13 #: ui/evolution-contact-list-editor.xml.h:11 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17 -#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4 -#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9 -#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22 +#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105 +#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9 +#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23 msgid "_Actions" msgstr "" @@ -14568,137 +15639,107 @@ msgstr "" #: ui/evolution-calendar.xml.h:3 #, fuzzy -msgid "Create a new all-day event" -msgstr "Synchronising \"%s\"" - -#: ui/evolution-calendar.xml.h:4 -msgid "Create a new appointment" -msgstr "" - -#: ui/evolution-calendar.xml.h:5 -#, fuzzy msgid "Create a new calendar" msgstr "Synchronising \"%s\"" -#: ui/evolution-calendar.xml.h:6 -msgid "Create a new meeting" -msgstr "" - -#: ui/evolution-calendar.xml.h:7 -msgid "Create a new task" -msgstr "" - -#: ui/evolution-calendar.xml.h:9 +#: ui/evolution-calendar.xml.h:5 msgid "Day" msgstr "" -#: ui/evolution-calendar.xml.h:10 +#: ui/evolution-calendar.xml.h:6 msgid "Delete All Occurrences" msgstr "" -#: ui/evolution-calendar.xml.h:11 +#: ui/evolution-calendar.xml.h:7 msgid "Delete the appointment" msgstr "" -#: ui/evolution-calendar.xml.h:12 +#: ui/evolution-calendar.xml.h:8 msgid "Delete this Occurrence" msgstr "" -#: ui/evolution-calendar.xml.h:13 +#: ui/evolution-calendar.xml.h:9 msgid "Delete this occurrence" msgstr "" -#: ui/evolution-calendar.xml.h:14 +#: ui/evolution-calendar.xml.h:10 msgid "Go To" msgstr "" -#: ui/evolution-calendar.xml.h:15 +#: ui/evolution-calendar.xml.h:11 msgid "Go back" msgstr "" -#: ui/evolution-calendar.xml.h:16 +#: ui/evolution-calendar.xml.h:12 msgid "Go forward" msgstr "" -#: ui/evolution-calendar.xml.h:17 +#: ui/evolution-calendar.xml.h:13 msgid "Go to _Date" msgstr "" -#: ui/evolution-calendar.xml.h:19 +#: ui/evolution-calendar.xml.h:15 msgid "Go to a specific date" msgstr "" -#: ui/evolution-calendar.xml.h:20 +#: ui/evolution-calendar.xml.h:16 msgid "Go to today" msgstr "" -#: ui/evolution-calendar.xml.h:21 +#: ui/evolution-calendar.xml.h:17 msgid "List" msgstr "" -#: ui/evolution-calendar.xml.h:22 +#: ui/evolution-calendar.xml.h:18 msgid "Month" msgstr "" -#: ui/evolution-calendar.xml.h:24 -msgid "New _Appointment" -msgstr "" - -#: ui/evolution-calendar.xml.h:25 +#: ui/evolution-calendar.xml.h:19 #, fuzzy msgid "New _Calendar" msgstr "Colours" -#: ui/evolution-calendar.xml.h:26 -#, fuzzy -msgid "New _Meeting" -msgstr "Cannot initialise the Evolution shell." - -#: ui/evolution-calendar.xml.h:27 -msgid "New _Task" -msgstr "" - -#: ui/evolution-calendar.xml.h:29 +#: ui/evolution-calendar.xml.h:21 msgid "Previews the calendar to be printed" msgstr "" -#: ui/evolution-calendar.xml.h:31 +#: ui/evolution-calendar.xml.h:23 msgid "Print this calendar" msgstr "" -#: ui/evolution-calendar.xml.h:32 +#: ui/evolution-calendar.xml.h:24 msgid "Publish Free/Busy information for this calendar" msgstr "" -#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15 +#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15 msgid "Purg_e" msgstr "" -#: ui/evolution-calendar.xml.h:34 +#: ui/evolution-calendar.xml.h:26 msgid "Purge old appointments and meetings" msgstr "" -#: ui/evolution-calendar.xml.h:35 +#: ui/evolution-calendar.xml.h:27 msgid "Show as list" msgstr "" -#: ui/evolution-calendar.xml.h:36 +#: ui/evolution-calendar.xml.h:28 msgid "Show one day" msgstr "" -#: ui/evolution-calendar.xml.h:37 +#: ui/evolution-calendar.xml.h:29 msgid "Show one month" msgstr "" -#: ui/evolution-calendar.xml.h:38 +#: ui/evolution-calendar.xml.h:30 msgid "Show one week" msgstr "" -#: ui/evolution-calendar.xml.h:39 +#: ui/evolution-calendar.xml.h:31 msgid "Show the working week" msgstr "" -#: ui/evolution-calendar.xml.h:40 +#: ui/evolution-calendar.xml.h:32 msgid "Week" msgstr "" @@ -14764,7 +15805,7 @@ msgstr "" #: ui/evolution-mail-messagedisplay.xml.h:7 #: ui/evolution-message-composer.xml.h:42 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11 -#: ui/evolution.xml.h:24 +#: ui/evolution.xml.h:25 msgid "_File" msgstr "" @@ -14982,7 +16023,7 @@ msgstr "" msgid "Mark all visible messages as read" msgstr "" -#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66 +#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72 msgid "Paste message(s) from the clipboard" msgstr "" @@ -15038,17 +16079,6 @@ msgstr "" msgid "_Threaded Message List" msgstr "" -#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4 -msgid "Close this window" -msgstr "" - -#: ui/evolution-mail-messagedisplay.xml.h:5 -#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9 -#: ui/evolution.xml.h:23 -#, fuzzy -msgid "_Close" -msgstr "Colours" - #: ui/evolution-mail-message.xml.h:1 msgid "A_dd Sender to Addressbook" msgstr "" @@ -15205,254 +16235,277 @@ msgstr "" msgid "Increase the text size" msgstr "" -#: ui/evolution-mail-message.xml.h:46 +#: ui/evolution-mail-message.xml.h:47 msgid "Load _Images" msgstr "" -#: ui/evolution-mail-message.xml.h:48 +#: ui/evolution-mail-message.xml.h:49 msgid "Mark as I_mportant" msgstr "" -#: ui/evolution-mail-message.xml.h:49 +#: ui/evolution-mail-message.xml.h:50 msgid "Mark as U_nread" msgstr "" -#: ui/evolution-mail-message.xml.h:50 +#: ui/evolution-mail-message.xml.h:51 msgid "Mark as Unimp_ortant" msgstr "" -#: ui/evolution-mail-message.xml.h:51 +#: ui/evolution-mail-message.xml.h:54 msgid "Mark the selected message(s) as having been read" msgstr "" -#: ui/evolution-mail-message.xml.h:52 +#: ui/evolution-mail-message.xml.h:55 msgid "Mark the selected message(s) as important" msgstr "" -#: ui/evolution-mail-message.xml.h:53 +#: ui/evolution-mail-message.xml.h:56 +msgid "Mark the selected message(s) as junk" +msgstr "" + +#: ui/evolution-mail-message.xml.h:57 +msgid "Mark the selected message(s) as not being junk" +msgstr "" + +#: ui/evolution-mail-message.xml.h:58 msgid "Mark the selected message(s) as not having been read" msgstr "" -#: ui/evolution-mail-message.xml.h:54 +#: ui/evolution-mail-message.xml.h:59 msgid "Mark the selected message(s) as unimportant" msgstr "" -#: ui/evolution-mail-message.xml.h:55 +#: ui/evolution-mail-message.xml.h:60 msgid "Mark the selected messages for deletion" msgstr "" -#: ui/evolution-mail-message.xml.h:56 +#: ui/evolution-mail-message.xml.h:61 msgid "Move" msgstr "" -#: ui/evolution-mail-message.xml.h:57 +#: ui/evolution-mail-message.xml.h:62 msgid "Move selected message(s) to another folder" msgstr "" -#: ui/evolution-mail-message.xml.h:58 +#: ui/evolution-mail-message.xml.h:63 msgid "Next" msgstr "" -#: ui/evolution-mail-message.xml.h:59 +#: ui/evolution-mail-message.xml.h:64 msgid "Next _Important Message" msgstr "" -#: ui/evolution-mail-message.xml.h:60 +#: ui/evolution-mail-message.xml.h:65 msgid "Next _Thread" msgstr "" -#: ui/evolution-mail-message.xml.h:61 +#: ui/evolution-mail-message.xml.h:66 msgid "Next _Unread Message" msgstr "" -#: ui/evolution-mail-message.xml.h:62 +#: ui/evolution-mail-message.xml.h:67 +msgid "Not Junk" +msgstr "" + +#: ui/evolution-mail-message.xml.h:68 msgid "Open the selected message in a new window" msgstr "" -#: ui/evolution-mail-message.xml.h:63 +#: ui/evolution-mail-message.xml.h:69 msgid "Open the selected message in the composer to re-send it" msgstr "" -#: ui/evolution-mail-message.xml.h:64 +#: ui/evolution-mail-message.xml.h:70 msgid "Original Si_ze" msgstr "" -#: ui/evolution-mail-message.xml.h:65 +#: ui/evolution-mail-message.xml.h:71 msgid "P_revious Unread Message" msgstr "" -#: ui/evolution-mail-message.xml.h:67 +#: ui/evolution-mail-message.xml.h:73 msgid "Post a Repl_y" msgstr "" -#: ui/evolution-mail-message.xml.h:68 +#: ui/evolution-mail-message.xml.h:74 msgid "Post a reply to a message in a Public folder" msgstr "" -#: ui/evolution-mail-message.xml.h:69 +#: ui/evolution-mail-message.xml.h:75 msgid "Pr_evious Important Message" msgstr "" -#: ui/evolution-mail-message.xml.h:70 +#: ui/evolution-mail-message.xml.h:76 msgid "Preview the message to be printed" msgstr "" -#: ui/evolution-mail-message.xml.h:71 +#: ui/evolution-mail-message.xml.h:77 msgid "Previous" msgstr "" -#: ui/evolution-mail-message.xml.h:74 +#: ui/evolution-mail-message.xml.h:80 msgid "Print this message" msgstr "" -#: ui/evolution-mail-message.xml.h:75 +#: ui/evolution-mail-message.xml.h:81 msgid "Re_direct" msgstr "" -#: ui/evolution-mail-message.xml.h:76 +#: ui/evolution-mail-message.xml.h:82 msgid "Redirect (bounce) the selected message to someone" msgstr "" -#: ui/evolution-mail-message.xml.h:81 +#: ui/evolution-mail-message.xml.h:87 msgid "Reset the text to its original size" msgstr "" -#: ui/evolution-mail-message.xml.h:82 +#: ui/evolution-mail-message.xml.h:88 msgid "S_earch in Message..." msgstr "" -#: ui/evolution-mail-message.xml.h:83 +#: ui/evolution-mail-message.xml.h:89 msgid "S_maller" msgstr "" -#: ui/evolution-mail-message.xml.h:84 +#: ui/evolution-mail-message.xml.h:90 msgid "Save the message as a text file" msgstr "" -#: ui/evolution-mail-message.xml.h:85 +#: ui/evolution-mail-message.xml.h:91 msgid "Search for text in the body of the displayed message" msgstr "" -#: ui/evolution-mail-message.xml.h:86 +#: ui/evolution-mail-message.xml.h:92 msgid "Set up the page settings for your current printer" msgstr "" -#: ui/evolution-mail-message.xml.h:87 +#: ui/evolution-mail-message.xml.h:93 msgid "Show Email _Source" msgstr "" -#: ui/evolution-mail-message.xml.h:88 +#: ui/evolution-mail-message.xml.h:94 msgid "Show Full _Headers" msgstr "" -#: ui/evolution-mail-message.xml.h:89 +#: ui/evolution-mail-message.xml.h:95 msgid "Show a blinking cursor in the body of displayed messages" msgstr "" -#: ui/evolution-mail-message.xml.h:90 +#: ui/evolution-mail-message.xml.h:96 msgid "Show message in the normal style" msgstr "" -#: ui/evolution-mail-message.xml.h:91 +#: ui/evolution-mail-message.xml.h:97 msgid "Show message with all email headers" msgstr "" -#: ui/evolution-mail-message.xml.h:92 +#: ui/evolution-mail-message.xml.h:98 msgid "Show the raw email source of the message" msgstr "" -#: ui/evolution-mail-message.xml.h:93 +#: ui/evolution-mail-message.xml.h:99 msgid "Text Si_ze" msgstr "" -#: ui/evolution-mail-message.xml.h:94 +#: ui/evolution-mail-message.xml.h:100 msgid "Un-delete the selected messages" msgstr "" -#: ui/evolution-mail-message.xml.h:95 +#: ui/evolution-mail-message.xml.h:101 msgid "VFolder on Mailing _List..." msgstr "" -#: ui/evolution-mail-message.xml.h:96 +#: ui/evolution-mail-message.xml.h:102 msgid "VFolder on Se_nder..." msgstr "" -#: ui/evolution-mail-message.xml.h:97 +#: ui/evolution-mail-message.xml.h:103 msgid "VFolder on _Recipients..." msgstr "" -#: ui/evolution-mail-message.xml.h:98 +#: ui/evolution-mail-message.xml.h:104 msgid "VFolder on _Subject..." msgstr "" -#: ui/evolution-mail-message.xml.h:100 +#: ui/evolution-mail-message.xml.h:106 msgid "_Attached" msgstr "" -#: ui/evolution-mail-message.xml.h:102 +#: ui/evolution-mail-message.xml.h:108 msgid "_Copy to Folder" msgstr "" -#: ui/evolution-mail-message.xml.h:103 +#: ui/evolution-mail-message.xml.h:109 msgid "_Create Filter From Message" msgstr "" -#: ui/evolution-mail-message.xml.h:105 +#: ui/evolution-mail-message.xml.h:111 msgid "_Forward Message" msgstr "" -#: ui/evolution-mail-message.xml.h:106 +#: ui/evolution-mail-message.xml.h:112 msgid "_Go To" msgstr "" -#: ui/evolution-mail-message.xml.h:107 +#: ui/evolution-mail-message.xml.h:113 msgid "_Inline" msgstr "" -#: ui/evolution-mail-message.xml.h:108 +#: ui/evolution-mail-message.xml.h:114 msgid "_Larger" msgstr "" -#: ui/evolution-mail-message.xml.h:109 +#: ui/evolution-mail-message.xml.h:115 msgid "_Message Display" msgstr "" -#: ui/evolution-mail-message.xml.h:110 +#: ui/evolution-mail-message.xml.h:116 msgid "_Move to Folder" msgstr "" -#: ui/evolution-mail-message.xml.h:111 +#: ui/evolution-mail-message.xml.h:117 msgid "_Next Message" msgstr "" -#: ui/evolution-mail-message.xml.h:112 +#: ui/evolution-mail-message.xml.h:118 msgid "_Normal Display" msgstr "" -#: ui/evolution-mail-message.xml.h:113 +#: ui/evolution-mail-message.xml.h:119 msgid "_Open Message" msgstr "" -#: ui/evolution-mail-message.xml.h:115 +#: ui/evolution-mail-message.xml.h:121 msgid "_Previous Message" msgstr "" -#: ui/evolution-mail-message.xml.h:117 +#: ui/evolution-mail-message.xml.h:123 msgid "_Quoted" msgstr "" -#: ui/evolution-mail-message.xml.h:119 +#: ui/evolution-mail-message.xml.h:125 msgid "_Resend..." msgstr "" -#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29 +#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31 msgid "_Tools" msgstr "" -#: ui/evolution-mail-message.xml.h:122 +#: ui/evolution-mail-message.xml.h:128 msgid "_Undelete" msgstr "" +#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4 +msgid "Close this window" +msgstr "" + +#: ui/evolution-mail-messagedisplay.xml.h:5 +#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9 +#: ui/evolution.xml.h:24 +#, fuzzy +msgid "_Close" +msgstr "Colours" + #: ui/evolution-message-composer.xml.h:1 msgid "Attach" msgstr "" @@ -15732,11 +16785,12 @@ msgid "Change Evolution's settings" msgstr "Cannot initialise the Evolution shell." #: ui/evolution.xml.h:5 -msgid "E_xit" -msgstr "" +#, fuzzy +msgid "Create a new window" +msgstr "Synchronising \"%s\"" #: ui/evolution.xml.h:6 -msgid "Evolution _Window" +msgid "E_xit" msgstr "" #: ui/evolution.xml.h:7 @@ -15748,7 +16802,7 @@ msgid "Import data from other programs" msgstr "" #: ui/evolution.xml.h:10 -msgid "Open a new Evolution window" +msgid "Open a new window" msgstr "" #: ui/evolution.xml.h:11 @@ -15757,54 +16811,66 @@ msgid "Pi_lot Settings..." msgstr "Cannot initialise the Evolution shell." #: ui/evolution.xml.h:12 -msgid "Set up Pilot configuration" +msgid "Send / Receive" msgstr "" #: ui/evolution.xml.h:13 -msgid "Show information about Ximian Evolution" +msgid "Send queued items and retrieve new items" msgstr "" #: ui/evolution.xml.h:14 -msgid "Submit Bug Report" +msgid "Set up Pilot configuration" msgstr "" #: ui/evolution.xml.h:15 -msgid "Submit _Bug Report" +msgid "Show information about Ximian Evolution" msgstr "" #: ui/evolution.xml.h:16 -msgid "Submit a bug report using Bug Buddy" +msgid "Submit Bug Report" msgstr "" #: ui/evolution.xml.h:17 -msgid "Toggle" +msgid "Submit _Bug Report" msgstr "" #: ui/evolution.xml.h:18 +msgid "Submit a bug report using Bug Buddy" +msgstr "" + +#: ui/evolution.xml.h:19 msgid "Toggle whether we are working offline." msgstr "" -#: ui/evolution.xml.h:20 +#: ui/evolution.xml.h:21 #, fuzzy msgid "Ximian Evolution _FAQ" msgstr "Cannot initialise the Evolution shell." -#: ui/evolution.xml.h:21 +#: ui/evolution.xml.h:22 msgid "_About Ximian Evolution..." msgstr "" -#: ui/evolution.xml.h:25 +#: ui/evolution.xml.h:26 msgid "_Help" msgstr "" -#: ui/evolution.xml.h:26 +#: ui/evolution.xml.h:27 msgid "_Import..." msgstr "" -#: ui/evolution.xml.h:27 +#: ui/evolution.xml.h:28 msgid "_New" msgstr "" +#: ui/evolution.xml.h:29 +msgid "_Send / Receive" +msgstr "" + +#: ui/evolution.xml.h:33 +msgid "_Window" +msgstr "" + #: ui/my-evolution.xml.h:2 msgid "Print Summary" msgstr "" @@ -15927,12 +16993,12 @@ msgstr "" #. Translators: These are the first characters of each day of the #. week, 'M' for 'Monday', 'T' for Tuesday etc. -#: widgets/misc/e-calendar-item.c:456 +#: widgets/misc/e-calendar-item.c:423 msgid "MTWTFSS" msgstr "" #. This is a strftime() format. %B = Month name, %Y = Year. -#: widgets/misc/e-calendar-item.c:1174 +#: widgets/misc/e-calendar-item.c:1128 msgid "%B %Y" msgstr "" @@ -16066,7 +17132,7 @@ msgstr "" msgid "_Find Now" msgstr "" -#: widgets/misc/e-search-bar.c:538 +#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928 #, fuzzy msgid "_Clear" msgstr "Colours" @@ -16083,17 +17149,62 @@ msgstr "" msgid "Text" msgstr "" -#: widgets/misc/e-search-bar.c:928 -#, fuzzy -msgid "Clear" -msgstr "Colours" - #: widgets/misc/e-search-bar.c:930 -msgid "Find Now" +msgid "Find _Now" msgstr "" #, fuzzy -#~ msgid "Address List" +#~ msgid "Other Contacts" +#~ msgstr "Organisation:" + +#, fuzzy +#~ msgid "Evolution Addressbook LDAP Configuration Control" +#~ msgstr "Cannot initialise Evolution's mail component." + +#, fuzzy +#~ msgid "Folder _name" +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "Could not open source folder: %s" +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "" +#~ "Cannot transfer folder:\n" +#~ "%s" +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "Add a Folder" +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "Sent" +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "Syncing Folder" +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "Synchronizing \"%s\" (%d of %d) ..." +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "Cannot create a folder with that name" +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "Has subfolders" +#~ msgstr "Synchronising \"%s\"" + +#, fuzzy +#~ msgid "Evolution Test Component" +#~ msgstr "Cannot initialise Evolution's mail component." + +#, fuzzy +#~ msgid "Clear" #~ msgstr "Colours" #, fuzzy @@ -16197,18 +17308,10 @@ msgstr "" #~ msgstr "Synchronising \"%s\"" #, fuzzy -#~ msgid "Opening default tasks folder" -#~ msgstr "Synchronising \"%s\"" - -#, fuzzy #~ msgid "Could not create a PGP signature context" #~ msgstr "Synchronising \"%s\"" #, fuzzy -#~ msgid "Evolution Mail configuration interface" -#~ msgstr "Cannot initialise Evolution's mail component." - -#, fuzzy #~ msgid "by %B %d, %Y, %l:%M %P" #~ msgstr "%a %d/%m/%Y %I:%M %p" @@ -16365,10 +17468,6 @@ msgstr "" #~ msgstr "Colours" #, fuzzy -#~ msgid "Corona" -#~ msgstr "Colours" - -#, fuzzy #~ msgid "Homer" #~ msgstr "Colours" @@ -16417,10 +17516,6 @@ msgstr "" #~ msgstr "Synchronising \"%s\"" #, fuzzy -#~ msgid "Stauning" -#~ msgstr "Synchronise \"%s\"" - -#, fuzzy #~ msgid "Tabatinga" #~ msgstr "Organisation" @@ -16453,10 +17548,6 @@ msgstr "" #~ msgstr "Colours" #, fuzzy -#~ msgid "miles" -#~ msgstr "Colours" - -#, fuzzy #~ msgid "Weather Settings" #~ msgstr "Synchronising \"%s\"" @@ -16702,9 +17793,6 @@ msgstr "" #~ msgid "Cannot initialize Evolution's Executive Summary component." #~ msgstr "Cannot initialise Evolution's mail component." -#~ msgid "%d/%m/%Y" -#~ msgstr "%m/%d/%Y" - #, fuzzy #~ msgid "Colors for Tasks" #~ msgstr "Colours for display" |