diff options
| author | Gareth Owen <gowen@src.gnome.org> | 2004-06-15 06:46:55 +0800 |
|---|---|---|
| committer | Gareth Owen <gowen@src.gnome.org> | 2004-06-15 06:46:55 +0800 |
| commit | e9a106a93f4d1366c39f47a8f0ccef936a828a17 (patch) | |
| tree | 906de11fe2911dede4f2059df170eaa6ef4abbdd /po/en_GB.po | |
| parent | a253044c8a4b6f56f2bae2500ab610469736e829 (diff) | |
| download | gsoc2013-evolution-e9a106a93f4d1366c39f47a8f0ccef936a828a17.tar.gz gsoc2013-evolution-e9a106a93f4d1366c39f47a8f0ccef936a828a17.tar.zst gsoc2013-evolution-e9a106a93f4d1366c39f47a8f0ccef936a828a17.zip | |
Updated British English translation
svn path=/trunk/; revision=26341
Diffstat (limited to 'po/en_GB.po')
| -rw-r--r-- | po/en_GB.po | 1622 |
1 files changed, 833 insertions, 789 deletions
diff --git a/po/en_GB.po b/po/en_GB.po index 7223c0026c..7baef3a42f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5,14 +5,14 @@ msgid "" msgstr "" "Project-Id-Version: evolution 0.6\n" -"POT-Creation-Date: 2004-06-03 11:14-0400\n" -"PO-Revision-Date: 2004-06-06 12:27-0400\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-06-14 18:45-0400\n" +"PO-Revision-Date: 2004-06-14 18:47-0400\n" "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: a11y/addressbook/ea-addressbook-view.c:94 @@ -53,13 +53,13 @@ msgstr " card" msgid "Default Sync Address:" msgstr "Default Sync Address:" -#: addressbook/conduit/address-conduit.c:1151 -#: addressbook/conduit/address-conduit.c:1152 +#: addressbook/conduit/address-conduit.c:1155 +#: addressbook/conduit/address-conduit.c:1156 msgid "Could not load addressbook" msgstr "Could not load addressbook" -#: addressbook/conduit/address-conduit.c:1220 -#: addressbook/conduit/address-conduit.c:1223 +#: addressbook/conduit/address-conduit.c:1224 +#: addressbook/conduit/address-conduit.c:1227 msgid "Could not read pilot's Address application block" msgstr "Could not read pilot's Address application block" @@ -130,15 +130,15 @@ msgid "Migrating `%s':" msgstr "Migrating `%s':" #. create the local source group -#: addressbook/gui/component/addressbook-migrate.c:464 +#: addressbook/gui/component/addressbook-migrate.c:489 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197 -#: mail/mail-component.c:245 mail/mail-vfolder.c:218 +#: mail/mail-component.c:246 mail/mail-vfolder.c:218 msgid "On This Computer" msgstr "On This Computer" #. Create the default Person addressbook -#: addressbook/gui/component/addressbook-migrate.c:472 +#: addressbook/gui/component/addressbook-migrate.c:497 #: addressbook/gui/contact-editor/contact-editor.glade.h:34 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78 @@ -147,19 +147,19 @@ msgid "Personal" msgstr "Personal" #. Create the LDAP source group -#: addressbook/gui/component/addressbook-migrate.c:480 +#: addressbook/gui/component/addressbook-migrate.c:505 msgid "On LDAP Servers" msgstr "On LDAP Servers" -#: addressbook/gui/component/addressbook-migrate.c:608 +#: addressbook/gui/component/addressbook-migrate.c:633 msgid "LDAP Servers" msgstr "LDAP Servers" -#: addressbook/gui/component/addressbook-migrate.c:728 +#: addressbook/gui/component/addressbook-migrate.c:753 msgid "Autocompletion Settings" msgstr "Autocompletion Settings" -#: addressbook/gui/component/addressbook-migrate.c:1104 +#: addressbook/gui/component/addressbook-migrate.c:1129 msgid "" "The location and hierarchy of the Evolution contact folders has changed " "since Evolution 1.x.\n" @@ -171,7 +171,7 @@ msgstr "" "\n" "Please be patient while Evolution migrates your folders..." -#: addressbook/gui/component/addressbook-migrate.c:1118 +#: addressbook/gui/component/addressbook-migrate.c:1143 msgid "" "The format of mailing list contacts has changed.\n" "\n" @@ -181,7 +181,7 @@ msgstr "" "\n" "Please be patient while Evolution migrates your folders..." -#: addressbook/gui/component/addressbook-migrate.c:1127 +#: addressbook/gui/component/addressbook-migrate.c:1152 msgid "" "The way Evolution stores some phone numbers has changed.\n" "\n" @@ -191,7 +191,7 @@ msgstr "" "\n" "Please be patient while Evolution migrates your folders..." -#: addressbook/gui/component/addressbook-migrate.c:1137 +#: addressbook/gui/component/addressbook-migrate.c:1162 msgid "" "Evolution's Palm Sync changelog and map files have changed.\n" "\n" @@ -211,7 +211,7 @@ msgid "New Address Book" msgstr "New Address Book" #: addressbook/gui/component/addressbook-view.c:755 -#: addressbook/gui/widgets/e-addressbook-view.c:1088 +#: addressbook/gui/widgets/e-addressbook-view.c:1115 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375 #: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3 @@ -321,7 +321,6 @@ msgstr "Manage your S/MIME certificates here" #: calendar/gui/dialogs/url-editor-dialog.glade.h:1 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1 -#: shell/glade/e-shell-folder-creation-dialog.glade.h:1 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1 msgid "*" msgstr "*" @@ -388,12 +387,12 @@ msgid "Anonymously" msgstr "Anonymously" #: addressbook/gui/component/ldap-config.glade.h:17 -#: calendar/gui/dialogs/task-editor.c:193 +#: calendar/gui/dialogs/task-editor.c:199 msgid "Basic" msgstr "Basic" #: addressbook/gui/component/ldap-config.glade.h:18 -#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3 +#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3 #: smime/gui/smime-ui.glade.h:19 msgid "Details" msgstr "Details" @@ -743,8 +742,7 @@ msgstr "<b>Work</b>" #: addressbook/gui/contact-editor/contact-editor.glade.h:11 #: addressbook/gui/contact-editor/e-contact-editor.c:178 -#: addressbook/gui/widgets/eab-contact-display.c:334 -#: addressbook/gui/widgets/eab-contact-display.c:353 +#: addressbook/gui/widgets/eab-contact-display.c:331 msgid "AIM" msgstr "AIM" @@ -779,7 +777,7 @@ msgstr "Company:" #: addressbook/gui/contact-editor/contact-editor.glade.h:19 #: addressbook/gui/contact-editor/e-contact-editor.c:266 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1 #: addressbook/gui/widgets/e-minicard.c:181 msgid "Contact" @@ -898,7 +896,7 @@ msgid "_File under:" msgstr "_File under:" #: addressbook/gui/contact-editor/contact-editor.glade.h:47 -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12 msgid "_Where:" msgstr "_Where:" @@ -919,8 +917,8 @@ msgstr "" "to delete this contact?" #: addressbook/gui/contact-editor/e-contact-editor-address.c:96 -#: addressbook/gui/widgets/eab-contact-display.c:343 -#: addressbook/gui/widgets/eab-contact-display.c:364 +#: addressbook/gui/widgets/eab-contact-display.c:350 +#: addressbook/gui/widgets/eab-contact-display.c:365 msgid "Address" msgstr "Address" @@ -928,7 +926,7 @@ msgstr "Address" #: addressbook/gui/contact-editor/e-contact-editor.c:287 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183 #: addressbook/gui/widgets/e-addressbook-model.c:309 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392 #: addressbook/gui/widgets/e-minicard.c:174 @@ -1908,31 +1906,28 @@ msgstr "Zimbabwe" #: addressbook/gui/contact-editor/e-contact-editor.c:179 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64 -#: addressbook/gui/widgets/eab-contact-display.c:337 -#: addressbook/gui/widgets/eab-contact-display.c:356 +#: addressbook/gui/widgets/eab-contact-display.c:334 msgid "Jabber" msgstr "Jabber" #: addressbook/gui/contact-editor/e-contact-editor.c:180 -#: addressbook/gui/widgets/eab-contact-display.c:339 -#: addressbook/gui/widgets/eab-contact-display.c:358 +#: addressbook/gui/widgets/eab-contact-display.c:336 msgid "Yahoo" msgstr "Yahoo" #: addressbook/gui/contact-editor/e-contact-editor.c:181 -#: addressbook/gui/widgets/eab-contact-display.c:338 -#: addressbook/gui/widgets/eab-contact-display.c:357 +#: addressbook/gui/widgets/eab-contact-display.c:335 msgid "MSN" msgstr "MSN" #: addressbook/gui/contact-editor/e-contact-editor.c:182 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67 -#: addressbook/gui/widgets/eab-contact-display.c:336 -#: addressbook/gui/widgets/eab-contact-display.c:355 +#: addressbook/gui/widgets/eab-contact-display.c:333 msgid "ICQ" msgstr "ICQ" #: addressbook/gui/contact-editor/e-contact-editor.c:183 +#: addressbook/gui/widgets/eab-contact-display.c:332 msgid "GroupWise" msgstr "GroupWise" @@ -1966,20 +1961,20 @@ msgstr "Writable Fields" msgid "Changed" msgstr "Changed" -#: addressbook/gui/contact-editor/e-contact-editor.c:2352 +#: addressbook/gui/contact-editor/e-contact-editor.c:2353 msgid "This contact belongs to these categories:" msgstr "This contact belongs to these categories:" #. Create the selector -#: addressbook/gui/contact-editor/e-contact-editor.c:2429 +#: addressbook/gui/contact-editor/e-contact-editor.c:2430 msgid "Please select an image for this contact" msgstr "Please select an image for this contact" -#: addressbook/gui/contact-editor/e-contact-editor.c:2433 +#: addressbook/gui/contact-editor/e-contact-editor.c:2434 msgid "No image" msgstr "No image" -#: addressbook/gui/contact-editor/e-contact-editor.c:2636 +#: addressbook/gui/contact-editor/e-contact-editor.c:2637 msgid "" "The contact data is invalid:\n" "\n" @@ -1987,11 +1982,11 @@ msgstr "" "The contact data is invalid:\n" "\n" -#: addressbook/gui/contact-editor/e-contact-editor.c:2664 +#: addressbook/gui/contact-editor/e-contact-editor.c:2665 msgid "Invalid contact." msgstr "Invalid contact." -#: addressbook/gui/contact-editor/e-contact-editor.c:2723 +#: addressbook/gui/contact-editor/e-contact-editor.c:2724 msgid "" "The contact cannot be saved to the selected address book. Do you want to " "discard changes?" @@ -1999,12 +1994,12 @@ msgstr "" "The contact cannot be saved to the selected address book. Do you want to " "discard changes?" -#: addressbook/gui/contact-editor/e-contact-editor.c:2727 -#: addressbook/gui/contact-editor/e-contact-editor.c:2751 +#: addressbook/gui/contact-editor/e-contact-editor.c:2728 +#: addressbook/gui/contact-editor/e-contact-editor.c:2752 msgid "_Discard" msgstr "_Discard" -#: addressbook/gui/contact-editor/e-contact-editor.c:2746 +#: addressbook/gui/contact-editor/e-contact-editor.c:2747 msgid "" "You are moving the contact from one address book to another, but it cannot " "be removed from the source. Do you want to save a copy instead?" @@ -2173,26 +2168,44 @@ msgid "\n" msgstr "\n" #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4 +msgid "Add an email to the List" +msgstr "Add an email to the List" + +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5 +msgid "Insert email adresses from Adress Book" +msgstr "Insert email adresses from Adress Book" + +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706 msgid "Members" msgstr "Members" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7 +msgid "Remove an email address from the List" +msgstr "Remove an email address from the List" + +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8 +msgid "Select" +msgstr "Select" + +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9 msgid "_Hide addresses when sending mail to this list" msgstr "_Hide addresses when sending mail to this list" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10 msgid "_List name:" msgstr "_List name:" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7 +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11 msgid "_Type an email address or drag a contact into the list below:" msgstr "_Type an email address or drag a contact into the list below:" -#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9 -msgid "contact-list-editor" -msgstr "contact-list-editor" +#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13 +#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48 +msgid "dialog1" +msgstr "dialogue1" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162 #: addressbook/gui/widgets/e-addressbook-model.c:295 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378 #: addressbook/gui/widgets/e-addressbook-view.c:217 @@ -2201,20 +2214,20 @@ msgstr "contact-list-editor" msgid "Book" msgstr "Book" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176 msgid "Is New List" msgstr "Is New List" -#. Construct the app -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223 -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845 +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728 +#: calendar/gui/e-meeting-list-view.c:60 +#: calendar/gui/e-meeting-list-view.c:457 +msgid "Required Participants" +msgstr "Required Participants" + +#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805 msgid "Contact List Editor" msgstr "Contact List Editor" -#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498 -msgid "Save List as VCard" -msgstr "Save List as VCard" - #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1 msgid "Changed Contact:" msgstr "Changed Contact:" @@ -2253,7 +2266,7 @@ msgstr "" "in this folder. Would you like to add it anyway?" #. FIXME: get the toplevel window... -#: addressbook/gui/search/e-addressbook-search-dialog.c:121 +#: addressbook/gui/search/e-addressbook-search-dialog.c:170 #: widgets/misc/e-filter-bar.c:156 msgid "Advanced Search" msgstr "Advanced Search" @@ -2269,80 +2282,75 @@ msgid "map" msgstr "map" #: addressbook/gui/widgets/eab-contact-display.c:259 -#: addressbook/gui/widgets/eab-contact-display.c:525 +#: addressbook/gui/widgets/eab-contact-display.c:526 msgid "List Members" msgstr "List Members" -#: addressbook/gui/widgets/eab-contact-display.c:321 -#: addressbook/gui/widgets/eab-contact-display.c:323 +#: addressbook/gui/widgets/eab-contact-display.c:322 +#: addressbook/gui/widgets/eab-contact-display.c:324 msgid "E-mail" msgstr "E-mail" -#: addressbook/gui/widgets/eab-contact-display.c:332 +#: addressbook/gui/widgets/eab-contact-display.c:345 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27 msgid "Organization" msgstr "Organisation" -#: addressbook/gui/widgets/eab-contact-display.c:333 +#: addressbook/gui/widgets/eab-contact-display.c:346 msgid "Position" msgstr "Position" -#: addressbook/gui/widgets/eab-contact-display.c:335 -#: addressbook/gui/widgets/eab-contact-display.c:354 -msgid "Groupwise" -msgstr "Groupwise" - -#: addressbook/gui/widgets/eab-contact-display.c:340 +#: addressbook/gui/widgets/eab-contact-display.c:347 msgid "Video Conferencing" msgstr "Video Conferencing" -#: addressbook/gui/widgets/eab-contact-display.c:341 -#: addressbook/gui/widgets/eab-contact-display.c:362 +#: addressbook/gui/widgets/eab-contact-display.c:348 +#: addressbook/gui/widgets/eab-contact-display.c:363 msgid "Phone" msgstr "Phone" -#: addressbook/gui/widgets/eab-contact-display.c:342 +#: addressbook/gui/widgets/eab-contact-display.c:349 msgid "Fax" msgstr "Fax" -#: addressbook/gui/widgets/eab-contact-display.c:346 +#: addressbook/gui/widgets/eab-contact-display.c:353 msgid "work" msgstr "work" -#: addressbook/gui/widgets/eab-contact-display.c:359 +#: addressbook/gui/widgets/eab-contact-display.c:360 msgid "WWW" msgstr "WWW" -#: addressbook/gui/widgets/eab-contact-display.c:360 -#: addressbook/gui/widgets/eab-contact-display.c:579 +#: addressbook/gui/widgets/eab-contact-display.c:361 +#: addressbook/gui/widgets/eab-contact-display.c:580 msgid "Blog" msgstr "Blog" -#: addressbook/gui/widgets/eab-contact-display.c:363 +#: addressbook/gui/widgets/eab-contact-display.c:364 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23 msgid "Mobile Phone" msgstr "Mobile Phone" -#: addressbook/gui/widgets/eab-contact-display.c:367 +#: addressbook/gui/widgets/eab-contact-display.c:368 msgid "personal" msgstr "personal" -#: addressbook/gui/widgets/eab-contact-display.c:374 +#: addressbook/gui/widgets/eab-contact-display.c:375 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25 msgid "Note" msgstr "Note" -#: addressbook/gui/widgets/eab-contact-display.c:540 +#: addressbook/gui/widgets/eab-contact-display.c:541 msgid "Job Title" msgstr "Job Title" -#: addressbook/gui/widgets/eab-contact-display.c:544 +#: addressbook/gui/widgets/eab-contact-display.c:545 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10 #: smime/lib/e-cert.c:826 msgid "Email" msgstr "Email" -#: addressbook/gui/widgets/eab-contact-display.c:571 +#: addressbook/gui/widgets/eab-contact-display.c:572 msgid "Home page" msgstr "Home page" @@ -2726,97 +2734,97 @@ msgstr "Advanced..." msgid "Type" msgstr "Type" -#: addressbook/gui/widgets/e-addressbook-view.c:508 +#: addressbook/gui/widgets/e-addressbook-view.c:535 msgid "Address Book" msgstr "Address Book" -#: addressbook/gui/widgets/e-addressbook-view.c:852 -#: addressbook/gui/widgets/e-addressbook-view.c:1072 -#: addressbook/gui/widgets/e-addressbook-view.c:2080 +#: addressbook/gui/widgets/e-addressbook-view.c:879 +#: addressbook/gui/widgets/e-addressbook-view.c:1099 +#: addressbook/gui/widgets/e-addressbook-view.c:2107 #: ui/evolution-addressbook.xml.h:19 msgid "Save as VCard..." msgstr "Save as VCard..." -#: addressbook/gui/widgets/e-addressbook-view.c:1059 +#: addressbook/gui/widgets/e-addressbook-view.c:1086 msgid "New Contact..." msgstr "New Contact..." -#: addressbook/gui/widgets/e-addressbook-view.c:1060 +#: addressbook/gui/widgets/e-addressbook-view.c:1087 msgid "New Contact List..." msgstr "New Contact List..." -#: addressbook/gui/widgets/e-addressbook-view.c:1063 +#: addressbook/gui/widgets/e-addressbook-view.c:1090 msgid "Go to Folder..." msgstr "Go to Folder..." -#: addressbook/gui/widgets/e-addressbook-view.c:1064 +#: addressbook/gui/widgets/e-addressbook-view.c:1091 msgid "Import..." msgstr "Import..." -#: addressbook/gui/widgets/e-addressbook-view.c:1066 +#: addressbook/gui/widgets/e-addressbook-view.c:1093 msgid "Search for Contacts..." msgstr "Search for Contacts..." -#: addressbook/gui/widgets/e-addressbook-view.c:1067 +#: addressbook/gui/widgets/e-addressbook-view.c:1094 msgid "Address Book Sources..." msgstr "Address Book Sources..." -#: addressbook/gui/widgets/e-addressbook-view.c:1069 +#: addressbook/gui/widgets/e-addressbook-view.c:1096 msgid "Pilot Settings..." msgstr "Pilot Settings..." -#: addressbook/gui/widgets/e-addressbook-view.c:1073 +#: addressbook/gui/widgets/e-addressbook-view.c:1100 #: ui/evolution-addressbook.xml.h:10 msgid "Forward Contact" msgstr "Forward Contact" -#: addressbook/gui/widgets/e-addressbook-view.c:1074 +#: addressbook/gui/widgets/e-addressbook-view.c:1101 msgid "Send Message to Contact" msgstr "Send Message to Contact" -#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480 +#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14 msgid "Print" msgstr "Print" -#: addressbook/gui/widgets/e-addressbook-view.c:1077 +#: addressbook/gui/widgets/e-addressbook-view.c:1104 msgid "Print Envelope" msgstr "Print Envelope" -#: addressbook/gui/widgets/e-addressbook-view.c:1081 +#: addressbook/gui/widgets/e-addressbook-view.c:1108 msgid "Copy to Address Book..." msgstr "Copy to Address Book..." -#: addressbook/gui/widgets/e-addressbook-view.c:1082 +#: addressbook/gui/widgets/e-addressbook-view.c:1109 msgid "Move to Address Book..." msgstr "Move to Address Book..." -#: addressbook/gui/widgets/e-addressbook-view.c:1085 +#: addressbook/gui/widgets/e-addressbook-view.c:1112 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4 msgid "Cut" msgstr "Cut" -#: addressbook/gui/widgets/e-addressbook-view.c:1086 +#: addressbook/gui/widgets/e-addressbook-view.c:1113 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9 #: ui/evolution-tasks.xml.h:2 msgid "Copy" msgstr "Copy" -#: addressbook/gui/widgets/e-addressbook-view.c:1087 +#: addressbook/gui/widgets/e-addressbook-view.c:1114 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11 msgid "Paste" msgstr "Paste" -#: addressbook/gui/widgets/e-addressbook-view.c:1092 -#: calendar/gui/e-calendar-view.c:1280 +#: addressbook/gui/widgets/e-addressbook-view.c:1119 +#: calendar/gui/e-calendar-view.c:1327 msgid "Current View" msgstr "Current View" #. All, unmatched, separator -#: addressbook/gui/widgets/e-addressbook-view.c:1665 +#: addressbook/gui/widgets/e-addressbook-view.c:1692 #: calendar/gui/cal-search-bar.c:358 msgid "Any Category" msgstr "Any Category" @@ -3354,22 +3362,22 @@ msgstr "Unnamed List" msgid "Enter password" msgstr "Enter password" -#: calendar/conduits/calendar/calendar-conduit.c:206 +#: calendar/conduits/calendar/calendar-conduit.c:223 msgid "Split Multi-Day Events:" msgstr "Split Multi-Day Events:" -#: calendar/conduits/calendar/calendar-conduit.c:1313 +#: calendar/conduits/calendar/calendar-conduit.c:1330 #: calendar/conduits/todo/todo-conduit.c:849 msgid "Could not start wombat server" msgstr "Could not start wombat server" -#: calendar/conduits/calendar/calendar-conduit.c:1314 +#: calendar/conduits/calendar/calendar-conduit.c:1331 #: calendar/conduits/todo/todo-conduit.c:850 msgid "Could not start wombat" msgstr "Could not start wombat" -#: calendar/conduits/calendar/calendar-conduit.c:1422 -#: calendar/conduits/calendar/calendar-conduit.c:1425 +#: calendar/conduits/calendar/calendar-conduit.c:1439 +#: calendar/conduits/calendar/calendar-conduit.c:1442 msgid "Could not read pilot's Calendar application block" msgstr "Could not read pilot's Calendar application block" @@ -3624,8 +3632,8 @@ msgid "Whether to show week numbers in date navigator" msgstr "Whether to show week numbers in date navigator" #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552 -#: calendar/gui/dialogs/select-source-dialog.c:92 -#: calendar/gui/gnome-cal.c:1705 +#: calendar/gui/dialogs/select-source-dialog.c:100 +#: calendar/gui/gnome-cal.c:1827 #: camel/providers/groupwise/camel-gw-listener.c:311 #: camel/providers/groupwise/camel-gw-listener.c:334 msgid "Calendar" @@ -3882,10 +3890,6 @@ msgstr "Send To:" msgid "With these arguments:" msgstr "With these arguments:" -#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48 -msgid "dialog1" -msgstr "dialogue1" - #: calendar/gui/dialogs/alarm-options.glade.h:12 msgid "extra times every" msgstr "extra times every" @@ -3895,7 +3899,7 @@ msgstr "extra times every" msgid "hours" msgstr "hours" -#: calendar/gui/dialogs/alarm-page.c:802 +#: calendar/gui/dialogs/alarm-page.c:815 msgid "Action/Trigger" msgstr "Action/Trigger" @@ -3937,7 +3941,7 @@ msgstr "Send an email" #: calendar/gui/dialogs/alarm-page.glade.h:9 #: calendar/gui/dialogs/recurrence-page.glade.h:8 #: calendar/gui/e-cal-component-preview.c:187 -#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11 +#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11 msgid "Summary:" msgstr "Summary:" @@ -4149,7 +4153,7 @@ msgid "Free/Busy Publishing" msgstr "Free/Busy Publishing" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 -#: calendar/gui/dialogs/recurrence-page.c:1048 +#: calendar/gui/dialogs/recurrence-page.c:1076 #: calendar/gui/e-itip-control.c:556 msgid "Friday" msgstr "Friday" @@ -4163,7 +4167,7 @@ msgid "Minutes" msgstr "Minutes" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 -#: calendar/gui/dialogs/recurrence-page.c:1044 +#: calendar/gui/dialogs/recurrence-page.c:1072 #: calendar/gui/e-itip-control.c:552 msgid "Monday" msgstr "Monday" @@ -4173,7 +4177,7 @@ msgid "S_un" msgstr "S_un" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 -#: calendar/gui/dialogs/recurrence-page.c:1049 +#: calendar/gui/dialogs/recurrence-page.c:1077 #: calendar/gui/e-itip-control.c:557 msgid "Saturday" msgstr "Saturday" @@ -4187,7 +4191,7 @@ msgid "Show week _numbers in date navigator" msgstr "Show week _numbers in date navigator" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28 -#: calendar/gui/dialogs/recurrence-page.c:1050 +#: calendar/gui/dialogs/recurrence-page.c:1078 #: calendar/gui/e-itip-control.c:551 msgid "Sunday" msgstr "Sunday" @@ -4201,7 +4205,7 @@ msgid "T_hu" msgstr "T_hu" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31 -#: calendar/gui/dialogs/recurrence-page.c:1047 +#: calendar/gui/dialogs/recurrence-page.c:1075 #: calendar/gui/e-itip-control.c:555 msgid "Thursday" msgstr "Thursday" @@ -4215,7 +4219,7 @@ msgid "Time format:" msgstr "Time format:" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 -#: calendar/gui/dialogs/recurrence-page.c:1045 +#: calendar/gui/dialogs/recurrence-page.c:1073 #: calendar/gui/e-itip-control.c:553 msgid "Tuesday" msgstr "Tuesday" @@ -4225,7 +4229,7 @@ msgid "W_eek starts:" msgstr "W_eek starts:" #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 -#: calendar/gui/dialogs/recurrence-page.c:1046 +#: calendar/gui/dialogs/recurrence-page.c:1074 #: calendar/gui/e-itip-control.c:554 msgid "Wednesday" msgstr "Wednesday" @@ -4352,55 +4356,55 @@ msgstr "%s You have made changes. Forget those changes and update the editor?" msgid "%s You have made no changes, update the editor?" msgstr "%s You have made no changes, update the editor?" -#: calendar/gui/dialogs/comp-editor.c:430 +#: calendar/gui/dialogs/comp-editor.c:429 msgid "Could not update object" msgstr "Could not update object" -#: calendar/gui/dialogs/comp-editor.c:903 -#: calendar/gui/dialogs/comp-editor.c:940 +#: calendar/gui/dialogs/comp-editor.c:900 +#: calendar/gui/dialogs/comp-editor.c:937 msgid "Edit Appointment" msgstr "Edit Appointment" -#: calendar/gui/dialogs/comp-editor.c:908 -#: calendar/gui/dialogs/comp-editor.c:945 +#: calendar/gui/dialogs/comp-editor.c:905 +#: calendar/gui/dialogs/comp-editor.c:942 #, c-format msgid "Appointment - %s" msgstr "Appointment - %s" -#: calendar/gui/dialogs/comp-editor.c:911 -#: calendar/gui/dialogs/comp-editor.c:948 +#: calendar/gui/dialogs/comp-editor.c:908 +#: calendar/gui/dialogs/comp-editor.c:945 #, c-format msgid "Task - %s" msgstr "Task - %s" -#: calendar/gui/dialogs/comp-editor.c:914 -#: calendar/gui/dialogs/comp-editor.c:951 +#: calendar/gui/dialogs/comp-editor.c:911 +#: calendar/gui/dialogs/comp-editor.c:948 #, c-format msgid "Journal entry - %s" msgstr "Journal entry - %s" -#: calendar/gui/dialogs/comp-editor.c:925 -#: calendar/gui/dialogs/comp-editor.c:961 +#: calendar/gui/dialogs/comp-editor.c:922 +#: calendar/gui/dialogs/comp-editor.c:958 msgid "No summary" msgstr "No summary" -#: calendar/gui/dialogs/comp-editor.c:1376 -#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038 +#: calendar/gui/dialogs/comp-editor.c:1398 +#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053 #: composer/e-msg-composer.c:1193 msgid "Save as..." msgstr "Save as..." -#: calendar/gui/dialogs/comp-editor.c:1479 -#: calendar/gui/dialogs/comp-editor.c:1514 -#: calendar/gui/dialogs/comp-editor.c:1540 +#: calendar/gui/dialogs/comp-editor.c:1501 +#: calendar/gui/dialogs/comp-editor.c:1536 +#: calendar/gui/dialogs/comp-editor.c:1562 msgid "Changes made to this item may be discarded if an update arrives" msgstr "Changes made to this item may be discarded if an update arrives" -#: calendar/gui/dialogs/comp-editor.c:1576 +#: calendar/gui/dialogs/comp-editor.c:1586 msgid "Unable to use current version!" msgstr "Unable to use current version!" -#: calendar/gui/dialogs/comp-editor-page.c:463 +#: calendar/gui/dialogs/comp-editor-page.c:464 #, c-format msgid "Validation error: %s" msgstr "Validation error: %s" @@ -4497,55 +4501,55 @@ msgstr "Delegate To:" msgid "Enter Delegate" msgstr "Enter Delegate" -#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295 +#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295 msgid "Appointment" msgstr "Appointment" -#: calendar/gui/dialogs/event-editor.c:208 +#: calendar/gui/dialogs/event-editor.c:216 msgid "Reminder" msgstr "Reminder" -#: calendar/gui/dialogs/event-editor.c:215 +#: calendar/gui/dialogs/event-editor.c:223 msgid "Recurrence" msgstr "Recurrence" -#: 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:230 +#: calendar/gui/dialogs/event-editor.c:303 +#: calendar/gui/dialogs/event-editor.c:447 msgid "Scheduling" msgstr "Scheduling" -#: 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:237 +#: calendar/gui/dialogs/event-editor.c:306 +#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6 msgid "Meeting" msgstr "Meeting" -#: calendar/gui/dialogs/event-page.c:460 +#: calendar/gui/dialogs/event-page.c:490 msgid "Event with no start date" msgstr "Event with no start date" -#: calendar/gui/dialogs/event-page.c:463 +#: calendar/gui/dialogs/event-page.c:493 msgid "Event with no end date" msgstr "Event with no end date" -#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513 +#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516 msgid "Start date is wrong" msgstr "Start date is wrong" -#: calendar/gui/dialogs/event-page.c:627 +#: calendar/gui/dialogs/event-page.c:659 msgid "End date is wrong" msgstr "End date is wrong" -#: calendar/gui/dialogs/event-page.c:650 +#: calendar/gui/dialogs/event-page.c:682 msgid "Start time is wrong" msgstr "Start time is wrong" -#: calendar/gui/dialogs/event-page.c:657 +#: calendar/gui/dialogs/event-page.c:689 msgid "End time is wrong" msgstr "End time is wrong" -#: calendar/gui/dialogs/event-page.c:1264 +#: calendar/gui/dialogs/event-page.c:1296 #, c-format msgid "Unable to open the calendar '%s'." msgstr "Unable to open the calendar '%s'." @@ -4615,10 +4619,11 @@ msgstr "_Start time:" #. an empty string is the same as 'None' #: calendar/gui/dialogs/meeting-page.c:311 #: calendar/gui/dialogs/meeting-page.glade.h:4 -#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112 -#: filter/filter-rule.c:877 mail/em-account-prefs.c:427 -#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571 -#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103 +#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928 +#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877 +#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928 +#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967 +#: mail/mail-config.glade.h:103 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595 @@ -4643,9 +4648,9 @@ msgstr "_Delegate To..." #. FIXME: need to disable for undeletable folders #: calendar/gui/dialogs/meeting-page.c:655 -#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060 -#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345 -#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919 +#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057 +#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392 +#: mail/em-folder-tree.c:2584 mail/em-folder-view.c:919 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21 @@ -4689,7 +4694,7 @@ msgid "Member" msgstr "Member" #: calendar/gui/dialogs/meeting-page.etspec.h:8 -#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241 +#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241 #: calendar/gui/e-meeting-time-sel.etspec.h:8 msgid "RSVP" msgstr "RSVP" @@ -4788,51 +4793,51 @@ msgstr "All Instances" msgid "This appointment contains recurrences that Evolution cannot edit." msgstr "This appointment contains recurrences that Evolution cannot edit." -#: calendar/gui/dialogs/recurrence-page.c:816 +#: calendar/gui/dialogs/recurrence-page.c:844 msgid "Recurrence date is invalid" msgstr "Recurrence date is invalid" -#: calendar/gui/dialogs/recurrence-page.c:927 +#: calendar/gui/dialogs/recurrence-page.c:955 msgid "on" msgstr "on" -#: calendar/gui/dialogs/recurrence-page.c:988 +#: calendar/gui/dialogs/recurrence-page.c:1016 msgid "first" msgstr "first" -#: calendar/gui/dialogs/recurrence-page.c:989 +#: calendar/gui/dialogs/recurrence-page.c:1017 msgid "second" msgstr "second" -#: calendar/gui/dialogs/recurrence-page.c:990 +#: calendar/gui/dialogs/recurrence-page.c:1018 msgid "third" msgstr "third" -#: calendar/gui/dialogs/recurrence-page.c:991 +#: calendar/gui/dialogs/recurrence-page.c:1019 msgid "fourth" msgstr "fourth" -#: calendar/gui/dialogs/recurrence-page.c:992 +#: calendar/gui/dialogs/recurrence-page.c:1020 msgid "last" msgstr "last" -#: calendar/gui/dialogs/recurrence-page.c:1015 +#: calendar/gui/dialogs/recurrence-page.c:1043 msgid "Other Date" msgstr "Other Date" -#: calendar/gui/dialogs/recurrence-page.c:1043 +#: calendar/gui/dialogs/recurrence-page.c:1071 msgid "day" msgstr "day" -#: calendar/gui/dialogs/recurrence-page.c:1180 +#: calendar/gui/dialogs/recurrence-page.c:1208 msgid "on the" msgstr "on the" -#: calendar/gui/dialogs/recurrence-page.c:1366 +#: calendar/gui/dialogs/recurrence-page.c:1394 msgid "occurrences" msgstr "occurrences" -#: calendar/gui/dialogs/recurrence-page.c:2336 +#: calendar/gui/dialogs/recurrence-page.c:2364 msgid "Date/Time" msgstr "Date/Time" @@ -4897,15 +4902,15 @@ msgstr "week(s)" msgid "year(s)" msgstr "year(s)" -#: calendar/gui/dialogs/select-source-dialog.c:69 +#: calendar/gui/dialogs/select-source-dialog.c:77 msgid "Select destination" msgstr "Select destination" -#: calendar/gui/dialogs/select-source-dialog.c:90 +#: calendar/gui/dialogs/select-source-dialog.c:98 msgid "_Destination" msgstr "_Destination" -#: calendar/gui/dialogs/select-source-dialog.c:92 +#: calendar/gui/dialogs/select-source-dialog.c:100 msgid "Task List" msgstr "Task List" @@ -4918,11 +4923,14 @@ msgstr "Completed date is wrong" msgid "% _Complete" msgstr "% _Complete" +#. Pass TRUE as is_utc, so it gets converted to the current +#. timezone. #: calendar/gui/dialogs/task-details-page.glade.h:4 #: calendar/gui/e-cal-component-preview.c:230 #: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350 -#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187 -#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346 +#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720 +#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210 +#: calendar/gui/print.c:2346 msgid "Completed" msgstr "Completed" @@ -4985,17 +4993,17 @@ msgstr "_Status:" msgid "_Web Page:" msgstr "_Web Page:" -#: calendar/gui/dialogs/task-editor.c:207 -#: calendar/gui/dialogs/task-editor.c:270 -#: calendar/gui/dialogs/task-editor.c:407 +#: calendar/gui/dialogs/task-editor.c:215 +#: calendar/gui/dialogs/task-editor.c:278 +#: calendar/gui/dialogs/task-editor.c:415 msgid "Assignment" msgstr "Assignment" -#: calendar/gui/dialogs/task-page.c:486 +#: calendar/gui/dialogs/task-page.c:489 msgid "Due date is wrong" msgstr "Due date is wrong" -#: calendar/gui/dialogs/task-page.c:823 +#: calendar/gui/dialogs/task-page.c:826 #, c-format msgid "Unable to open tasks in '%s'." msgstr "Unable to open tasks in '%s'." @@ -5006,7 +5014,7 @@ msgstr "Con_fidential" #: calendar/gui/dialogs/task-page.glade.h:6 #: calendar/gui/e-cal-component-preview.c:268 -#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6 +#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71 msgid "Description:" msgstr "Description:" @@ -5150,7 +5158,7 @@ msgstr "%s at %s" msgid "%s for an unknown trigger type" msgstr "%s for an unknown trigger type" -#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346 +#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350 #, c-format msgid "Click to open %s" msgstr "Click to open %s" @@ -5170,7 +5178,7 @@ msgstr "Due Date:" #. write status #: calendar/gui/e-cal-component-preview.c:223 -#: calendar/gui/e-itip-control.c:943 +#: calendar/gui/e-itip-control.c:956 msgid "Status:" msgstr "Status:" @@ -5250,85 +5258,85 @@ msgstr "Free" msgid "Busy" msgstr "Busy" -#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646 +#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647 msgid "Deleting selected objects" msgstr "Deleting selected objects" -#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750 +#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751 msgid "Updating objects" msgstr "Updating objects" -#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063 -#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373 +#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060 +#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37 msgid "_Open" msgstr "_Open" -#: calendar/gui/e-calendar-table.c:1023 +#: calendar/gui/e-calendar-table.c:1020 msgid "Open _Web Page" msgstr "Open _Web Page" -#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069 -#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379 +#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066 +#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426 #: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807 #: ui/evolution-mail-message.xml.h:128 msgid "_Save As..." msgstr "_Save As..." -#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067 -#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295 -#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40 +#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064 +#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342 +#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125 #: ui/evolution-tasks.xml.h:25 msgid "_Print..." msgstr "_Print..." -#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058 -#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343 +#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055 +#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1 #: ui/evolution-tasks.xml.h:1 msgid "C_ut" msgstr "C_ut" -#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056 -#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341 -#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541 -#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31 -#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7 -#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20 +#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053 +#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388 +#: mail/em-folder-tree.c:960 mail/message-list.c:1650 +#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39 +#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109 +#: ui/evolution-tasks.xml.h:20 msgid "_Copy" msgstr "_Copy" -#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065 -#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302 -#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38 +#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062 +#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349 +#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24 msgid "_Paste" msgstr "_Paste" -#: calendar/gui/e-calendar-table.c:1035 +#: calendar/gui/e-calendar-table.c:1032 msgid "_Assign Task" msgstr "_Assign Task" -#: calendar/gui/e-calendar-table.c:1036 +#: calendar/gui/e-calendar-table.c:1033 msgid "_Forward as iCalendar" msgstr "_Forward as iCalendar" -#: calendar/gui/e-calendar-table.c:1037 +#: calendar/gui/e-calendar-table.c:1034 msgid "_Mark as Complete" msgstr "_Mark as Complete" -#: calendar/gui/e-calendar-table.c:1038 +#: calendar/gui/e-calendar-table.c:1035 msgid "_Mark Selected Tasks as Complete" msgstr "_Mark Selected Tasks as Complete" -#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061 +#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058 msgid "_Delete Selected Tasks" msgstr "_Delete Selected Tasks" -#: calendar/gui/e-calendar-table.c:1353 +#: calendar/gui/e-calendar-table.c:1350 #: calendar/gui/e-calendar-table.etspec.h:3 msgid "Click to add a task" msgstr "Click to add a task" @@ -5338,8 +5346,8 @@ msgstr "Click to add a task" msgid "% Complete" msgstr "% Complete" -#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167 -#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615 +#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1178 +#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615 msgid "Complete" msgstr "Complete" @@ -5368,67 +5376,75 @@ msgstr "Summary" msgid "Task sort" msgstr "Task sort" -#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353 +#: calendar/gui/e-calendar-view.c:1156 +msgid "Moving items" +msgstr "Moving items" + +#: calendar/gui/e-calendar-view.c:1158 +msgid "Copying items" +msgstr "Copying items" + +#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400 msgid "New _Appointment..." msgstr "New _Appointment..." -#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358 +#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405 msgid "New All Day _Event" msgstr "New All Day _Event" -#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363 +#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410 msgid "New Meeting" msgstr "New Meeting" -#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368 +#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415 msgid "New Task" msgstr "New Task" -#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26 +#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26 msgid "Select _Today" msgstr "Select _Today" -#: calendar/gui/e-calendar-view.c:1283 +#: calendar/gui/e-calendar-view.c:1330 msgid "_Select Date..." msgstr "_Select Date..." -#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45 +#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45 msgid "_Publish Free/Busy Information" msgstr "_Publish Free/Busy Information" -#: calendar/gui/e-calendar-view.c:1306 +#: calendar/gui/e-calendar-view.c:1353 msgid "Cop_y to Calendar..." msgstr "Cop_y to Calendar..." -#: calendar/gui/e-calendar-view.c:1307 +#: calendar/gui/e-calendar-view.c:1354 msgid "Mo_ve to Calendar..." msgstr "Mo_ve to Calendar..." -#: calendar/gui/e-calendar-view.c:1308 +#: calendar/gui/e-calendar-view.c:1355 msgid "_Schedule Meeting..." msgstr "_Schedule Meeting..." -#: calendar/gui/e-calendar-view.c:1309 +#: calendar/gui/e-calendar-view.c:1356 msgid "_Forward as iCalendar..." msgstr "_Forward as iCalendar..." -#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346 +#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393 msgid "Delete this _Occurrence" msgstr "Delete this _Occurrence" -#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347 +#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394 msgid "Delete _All Occurrences" msgstr "Delete _All Occurrences" -#: calendar/gui/e-calendar-view.c:1349 +#: calendar/gui/e-calendar-view.c:1396 msgid "Go to _Today" msgstr "Go to _Today" -#: calendar/gui/e-calendar-view.c:1351 +#: calendar/gui/e-calendar-view.c:1398 msgid "_Go to Date..." msgstr "_Go to Date..." -#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35 +#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35 msgid "_Settings..." msgstr "_Settings..." @@ -5442,18 +5458,18 @@ msgstr "Start Date" #. This is the default filename used for temporary file creation #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337 -#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162 +#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175 #: calendar/gui/e-meeting-list-view.c:122 #: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215 -#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754 +#: camel/camel-gpg-context.c:1704 camel/camel-gpg-context.c:1755 #: camel/camel-tcp-stream-openssl.c:631 -#: camel/providers/imap4/camel-imap4-engine.c:1534 -#: camel/providers/imap4/camel-imap4-engine.c:1561 -#: camel/providers/imap4/camel-imap4-engine.c:1591 -#: camel/providers/imap4/camel-imap4-engine.c:1631 -#: camel/providers/imap4/camel-imap4-store.c:1039 -#: camel/providers/imap4/camel-imap4-utils.c:292 +#: camel/providers/imap4/camel-imap4-engine.c:1379 +#: camel/providers/imap4/camel-imap4-engine.c:1406 +#: camel/providers/imap4/camel-imap4-engine.c:1436 +#: camel/providers/imap4/camel-imap4-engine.c:1476 +#: camel/providers/imap4/camel-imap4-store.c:1173 +#: camel/providers/imap4/camel-imap4-utils.c:293 #: camel/providers/smtp/camel-smtp-transport.c:172 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115 #: shell/e-component-registry.c:186 shell/e-component-registry.c:190 @@ -5530,13 +5546,13 @@ msgstr "" "%s" #. String to use in 12-hour time format for times in the morning. -#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592 +#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573 #: calendar/gui/print.c:838 msgid "am" msgstr "am" #. String to use in 12-hour time format for times in the afternoon. -#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595 +#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576 #: calendar/gui/print.c:840 msgid "pm" msgstr "pm" @@ -5625,37 +5641,33 @@ msgid ", ending on " msgstr ", ending on " #: calendar/gui/e-itip-control.c:686 -msgid "<b>Starts:</b> " -msgstr "<b>Starts:</b> " +msgid "Starts" +msgstr "Starts" -#: calendar/gui/e-itip-control.c:696 -msgid "<b>Ends:</b> " -msgstr "<b>Ends:</b> " +#: calendar/gui/e-itip-control.c:699 +msgid "Ends" +msgstr "Ends" -#: calendar/gui/e-itip-control.c:716 -msgid "<b>Completed:</b> " -msgstr "<b>Completed:</b> " +#: calendar/gui/e-itip-control.c:733 +msgid "Due" +msgstr "Due" -#: calendar/gui/e-itip-control.c:726 -msgid "<b>Due:</b> " -msgstr "<b>Due:</b> " - -#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820 +#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830 msgid "iCalendar Information" msgstr "iCalendar Information" #. Title -#: calendar/gui/e-itip-control.c:781 +#: calendar/gui/e-itip-control.c:790 msgid "iCalendar Error" msgstr "iCalendar Error" -#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868 -#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896 +#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878 +#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906 msgid "An unknown person" msgstr "An unknown person" #. Describe what the user can do -#: calendar/gui/e-itip-control.c:903 +#: calendar/gui/e-itip-control.c:913 msgid "" "<br> Please review the following information, and then select an action from " "the menu below." @@ -5663,305 +5675,301 @@ msgstr "" "<br> Please review the following information, and then select an action from " "the menu below." -#: calendar/gui/e-itip-control.c:918 -msgid "<i>None</i>" -msgstr "<i>None</i>" - -#: calendar/gui/e-itip-control.c:929 +#: calendar/gui/e-itip-control.c:942 msgid "Location:" msgstr "Location:" -#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158 +#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202 #: calendar/gui/itip-utils.c:422 msgid "Accepted" msgstr "Accepted" -#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425 +#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425 msgid "Tentatively Accepted" msgstr "Tentatively Accepted" -#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159 +#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454 msgid "Declined" msgstr "Declined" -#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043 -#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082 -#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108 +#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056 +#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095 +#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121 msgid "Choose an action:" msgstr "Choose an action:" -#: calendar/gui/e-itip-control.c:1016 +#: calendar/gui/e-itip-control.c:1029 msgid "Update" msgstr "Update" -#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048 -#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084 -#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110 +#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061 +#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097 +#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123 #: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265 msgid "OK" msgstr "OK" -#: calendar/gui/e-itip-control.c:1044 +#: calendar/gui/e-itip-control.c:1057 msgid "Accept" msgstr "Accept" -#: calendar/gui/e-itip-control.c:1045 +#: calendar/gui/e-itip-control.c:1058 msgid "Tentatively accept" msgstr "Tentatively accept" -#: calendar/gui/e-itip-control.c:1046 +#: calendar/gui/e-itip-control.c:1059 msgid "Decline" msgstr "Decline" -#: calendar/gui/e-itip-control.c:1070 +#: calendar/gui/e-itip-control.c:1083 msgid "Send Free/Busy Information" msgstr "Send Free/Busy Information" -#: calendar/gui/e-itip-control.c:1083 +#: calendar/gui/e-itip-control.c:1096 msgid "Update respondent status" msgstr "Update respondent status" -#: calendar/gui/e-itip-control.c:1096 +#: calendar/gui/e-itip-control.c:1109 msgid "Send Latest Information" msgstr "Send Latest Information" -#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442 +#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464 #: ui/evolution-mail-global.xml.h:1 msgid "Cancel" msgstr "Cancel" -#: calendar/gui/e-itip-control.c:1185 +#: calendar/gui/e-itip-control.c:1198 #, c-format msgid "<b>%s</b> has published meeting information." msgstr "<b>%s</b> has published meeting information." -#: calendar/gui/e-itip-control.c:1186 +#: calendar/gui/e-itip-control.c:1199 msgid "Meeting Information" msgstr "Meeting Information" -#: calendar/gui/e-itip-control.c:1191 +#: calendar/gui/e-itip-control.c:1204 #, c-format msgid "<b>%s</b> requests the presence of %s at a meeting." msgstr "<b>%s</b> requests the presence of %s at a meeting." -#: calendar/gui/e-itip-control.c:1193 +#: calendar/gui/e-itip-control.c:1206 #, c-format msgid "<b>%s</b> requests your presence at a meeting." msgstr "<b>%s</b> requests your presence at a meeting." -#: calendar/gui/e-itip-control.c:1194 +#: calendar/gui/e-itip-control.c:1207 msgid "Meeting Proposal" msgstr "Meeting Proposal" -#: calendar/gui/e-itip-control.c:1198 +#: calendar/gui/e-itip-control.c:1211 #, c-format msgid "<b>%s</b> wishes to add to an existing meeting." msgstr "<b>%s</b> wishes to add to an existing meeting." -#: calendar/gui/e-itip-control.c:1199 +#: calendar/gui/e-itip-control.c:1212 msgid "Meeting Update" msgstr "Meeting Update" -#: calendar/gui/e-itip-control.c:1203 +#: calendar/gui/e-itip-control.c:1216 #, c-format msgid "<b>%s</b> wishes to receive the latest meeting information." msgstr "<b>%s</b> wishes to receive the latest meeting information." -#: calendar/gui/e-itip-control.c:1204 +#: calendar/gui/e-itip-control.c:1217 msgid "Meeting Update Request" msgstr "Meeting Update Request" -#: calendar/gui/e-itip-control.c:1211 +#: calendar/gui/e-itip-control.c:1224 #, c-format msgid "<b>%s</b> has replied to a meeting request." msgstr "<b>%s</b> has replied to a meeting request." -#: calendar/gui/e-itip-control.c:1212 +#: calendar/gui/e-itip-control.c:1225 msgid "Meeting Reply" msgstr "Meeting Reply" -#: calendar/gui/e-itip-control.c:1219 +#: calendar/gui/e-itip-control.c:1232 #, c-format msgid "<b>%s</b> has cancelled a meeting." msgstr "<b>%s</b> has cancelled a meeting." -#: calendar/gui/e-itip-control.c:1220 +#: calendar/gui/e-itip-control.c:1233 msgid "Meeting Cancellation" msgstr "Meeting Cancellation" -#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295 -#: calendar/gui/e-itip-control.c:1330 +#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308 +#: calendar/gui/e-itip-control.c:1343 #, c-format msgid "<b>%s</b> has sent an unintelligible message." msgstr "<b>%s</b> has sent an unintelligible message." -#: calendar/gui/e-itip-control.c:1228 +#: calendar/gui/e-itip-control.c:1241 msgid "Bad Meeting Message" msgstr "Bad Meeting Message" -#: calendar/gui/e-itip-control.c:1253 +#: calendar/gui/e-itip-control.c:1266 #, c-format msgid "<b>%s</b> has published task information." msgstr "<b>%s</b> has published task information." -#: calendar/gui/e-itip-control.c:1254 +#: calendar/gui/e-itip-control.c:1267 msgid "Task Information" msgstr "Task Information" -#: calendar/gui/e-itip-control.c:1259 +#: calendar/gui/e-itip-control.c:1272 #, c-format msgid "<b>%s</b> requests %s to perform a task." msgstr "<b>%s</b> requests %s to perform a task." -#: calendar/gui/e-itip-control.c:1261 +#: calendar/gui/e-itip-control.c:1274 #, c-format msgid "<b>%s</b> requests you perform a task." msgstr "<b>%s</b> requests you perform a task." -#: calendar/gui/e-itip-control.c:1262 +#: calendar/gui/e-itip-control.c:1275 msgid "Task Proposal" msgstr "Task Proposal" -#: calendar/gui/e-itip-control.c:1266 +#: calendar/gui/e-itip-control.c:1279 #, c-format msgid "<b>%s</b> wishes to add to an existing task." msgstr "<b>%s</b> wishes to add to an existing task." -#: calendar/gui/e-itip-control.c:1267 +#: calendar/gui/e-itip-control.c:1280 msgid "Task Update" msgstr "Task Update" -#: calendar/gui/e-itip-control.c:1271 +#: calendar/gui/e-itip-control.c:1284 #, c-format msgid "<b>%s</b> wishes to receive the latest task information." msgstr "<b>%s</b> wishes to receive the latest task information." -#: calendar/gui/e-itip-control.c:1272 +#: calendar/gui/e-itip-control.c:1285 msgid "Task Update Request" msgstr "Task Update Request" -#: calendar/gui/e-itip-control.c:1279 +#: calendar/gui/e-itip-control.c:1292 #, c-format msgid "<b>%s</b> has replied to a task assignment." msgstr "<b>%s</b> has replied to a task assignment." -#: calendar/gui/e-itip-control.c:1280 +#: calendar/gui/e-itip-control.c:1293 msgid "Task Reply" msgstr "Task Reply" -#: calendar/gui/e-itip-control.c:1287 +#: calendar/gui/e-itip-control.c:1300 #, c-format msgid "<b>%s</b> has cancelled a task." msgstr "<b>%s</b> has cancelled a task." -#: calendar/gui/e-itip-control.c:1288 +#: calendar/gui/e-itip-control.c:1301 msgid "Task Cancellation" msgstr "Task Cancellation" -#: calendar/gui/e-itip-control.c:1296 +#: calendar/gui/e-itip-control.c:1309 msgid "Bad Task Message" msgstr "Bad Task Message" -#: calendar/gui/e-itip-control.c:1315 +#: calendar/gui/e-itip-control.c:1328 #, c-format msgid "<b>%s</b> has published free/busy information." msgstr "<b>%s</b> has published free/busy information." -#: calendar/gui/e-itip-control.c:1316 +#: calendar/gui/e-itip-control.c:1329 msgid "Free/Busy Information" msgstr "Free/Busy Information" -#: calendar/gui/e-itip-control.c:1320 +#: calendar/gui/e-itip-control.c:1333 #, c-format msgid "<b>%s</b> requests your free/busy information." msgstr "<b>%s</b> requests your free/busy information." -#: calendar/gui/e-itip-control.c:1321 +#: calendar/gui/e-itip-control.c:1334 msgid "Free/Busy Request" msgstr "Free/Busy Request" -#: calendar/gui/e-itip-control.c:1325 +#: calendar/gui/e-itip-control.c:1338 #, c-format msgid "<b>%s</b> has replied to a free/busy request." msgstr "<b>%s</b> has replied to a free/busy request." -#: calendar/gui/e-itip-control.c:1326 +#: calendar/gui/e-itip-control.c:1339 msgid "Free/Busy Reply" msgstr "Free/Busy Reply" -#: calendar/gui/e-itip-control.c:1331 +#: calendar/gui/e-itip-control.c:1344 msgid "Bad Free/Busy Message" msgstr "Bad Free/Busy Message" -#: calendar/gui/e-itip-control.c:1406 +#: calendar/gui/e-itip-control.c:1419 msgid "The message does not appear to be properly formed" msgstr "The message does not appear to be properly formed" -#: calendar/gui/e-itip-control.c:1465 +#: calendar/gui/e-itip-control.c:1478 msgid "The message contains only unsupported requests." msgstr "The message contains only unsupported requests." -#: calendar/gui/e-itip-control.c:1496 +#: calendar/gui/e-itip-control.c:1509 msgid "The attachment does not contain a valid calendar message" msgstr "The attachment does not contain a valid calendar message" -#: calendar/gui/e-itip-control.c:1528 +#: calendar/gui/e-itip-control.c:1541 msgid "The attachment has no viewable calendar items" msgstr "The attachment has no viewable calendar items" -#: calendar/gui/e-itip-control.c:1762 +#: calendar/gui/e-itip-control.c:1775 msgid "Update complete\n" msgstr "Update complete\n" -#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864 +#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877 msgid "Attendee status can not be updated because the item no longer exists" msgstr "Attendee status can not be updated because the item no longer exists" -#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846 +#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859 msgid "Object is invalid and cannot be updated\n" msgstr "Object is invalid and cannot be updated\n" -#: calendar/gui/e-itip-control.c:1818 +#: calendar/gui/e-itip-control.c:1831 msgid "This response is not from a current attendee. Add as an attendee?" msgstr "This response is not from a current attendee. Add as an attendee?" -#: calendar/gui/e-itip-control.c:1830 +#: calendar/gui/e-itip-control.c:1843 msgid "Attendee status could not be updated because of an invalid status!\n" msgstr "Attendee status could not be updated because of an invalid status!\n" -#: calendar/gui/e-itip-control.c:1849 +#: calendar/gui/e-itip-control.c:1862 msgid "There was an error on the CORBA system\n" msgstr "There was an error on the CORBA system\n" -#: calendar/gui/e-itip-control.c:1852 +#: calendar/gui/e-itip-control.c:1865 msgid "Object could not be found\n" msgstr "Object could not be found\n" -#: calendar/gui/e-itip-control.c:1855 +#: calendar/gui/e-itip-control.c:1868 msgid "You don't have the right permissions to update the calendar\n" msgstr "You don't have the right permissions to update the calendar\n" -#: calendar/gui/e-itip-control.c:1858 +#: calendar/gui/e-itip-control.c:1871 msgid "Attendee status updated\n" msgstr "Attendee status updated\n" -#: calendar/gui/e-itip-control.c:1861 +#: calendar/gui/e-itip-control.c:1874 msgid "Attendee status could not be updated!\n" msgstr "Attendee status could not be updated!\n" -#: calendar/gui/e-itip-control.c:1892 +#: calendar/gui/e-itip-control.c:1905 msgid "Removal Complete" msgstr "Removal Complete" -#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963 +#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976 msgid "Item sent!\n" msgstr "Item sent!\n" -#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967 +#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980 msgid "The item could not be sent!\n" msgstr "The item could not be sent!\n" @@ -6006,11 +6014,6 @@ msgstr "date-start" msgid "Chair Persons" msgstr "Chair Persons" -#: calendar/gui/e-meeting-list-view.c:60 -#: calendar/gui/e-meeting-list-view.c:457 -msgid "Required Participants" -msgstr "Required Participants" - #: calendar/gui/e-meeting-list-view.c:61 msgid "Optional Participants" msgstr "Optional Participants" @@ -6169,7 +6172,7 @@ msgstr "%d/%m/%Y" msgid "Enter the password for %s" msgstr "Enter the password for %s" -#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020 +#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159 #, c-format msgid "" "Error on %s:\n" @@ -6178,39 +6181,30 @@ msgstr "" "Error on %s:\n" " %s" +#: calendar/gui/e-tasks.c:755 +msgid "Loading tasks" +msgstr "Loading tasks" + #. FIXME Loading should be async #. FIXME With no event handling here the status message never actually changes -#: calendar/gui/e-tasks.c:801 +#: calendar/gui/e-tasks.c:845 #, c-format msgid "Opening tasks at %s" msgstr "Opening tasks at %s" -#: calendar/gui/e-tasks.c:824 -#, c-format -msgid "" -"Error opening %s:\n" -"%s" -msgstr "" -"Error opening %s:\n" -"%s" - -#: calendar/gui/e-tasks.c:845 -msgid "Loading tasks" -msgstr "Loading tasks" - -#: calendar/gui/e-tasks.c:949 +#: calendar/gui/e-tasks.c:962 msgid "Completing tasks..." msgstr "Completing tasks..." -#: calendar/gui/e-tasks.c:972 +#: calendar/gui/e-tasks.c:985 msgid "Deleting selected objects..." msgstr "Deleting selected objects..." -#: calendar/gui/e-tasks.c:999 +#: calendar/gui/e-tasks.c:1012 msgid "Expunging" msgstr "Expunging" -#: calendar/gui/e-tasks.c:1075 +#: calendar/gui/e-tasks.c:1088 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12 #: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412 #: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405 @@ -6219,22 +6213,26 @@ msgstr "Expunging" msgid "Tasks" msgstr "Tasks" -#: calendar/gui/gnome-cal.c:1878 +#: calendar/gui/gnome-cal.c:704 +msgid "Updating query" +msgstr "Updating query" + +#: calendar/gui/gnome-cal.c:2006 #, c-format msgid "Loading appointments at %s" msgstr "Loading appointments at %s" -#: calendar/gui/gnome-cal.c:1897 +#: calendar/gui/gnome-cal.c:2025 #, c-format msgid "Loading tasks at %s" msgstr "Loading tasks at %s" -#: calendar/gui/gnome-cal.c:1920 +#: calendar/gui/gnome-cal.c:2048 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: calendar/gui/gnome-cal.c:2906 +#: calendar/gui/gnome-cal.c:3003 msgid "Purging" msgstr "Purging" @@ -6694,7 +6692,7 @@ msgid_plural "%d tasks" msgstr[0] "%d task" msgstr[1] "%d tasks" -#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500 +#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508 #, c-format msgid ", %d selected" msgid_plural ", %d selected" @@ -8419,69 +8417,69 @@ msgstr "Preparing folder '%s' for offline" msgid "You must be working online to complete this operation" msgstr "You must be working online to complete this operation" -#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513 +#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513 #: camel/camel-process.c:48 #, c-format msgid "Failed to create pipe to '%s': %s" msgstr "Failed to create pipe to '%s': %s" -#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549 +#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549 #: camel/camel-process.c:90 #, c-format msgid "Failed to create create child process '%s': %s" msgstr "Failed to create create child process '%s': %s" -#: camel/camel-filter-driver.c:754 +#: camel/camel-filter-driver.c:756 #, c-format msgid "Invalid message stream received from %s: %s" msgstr "Invalid message stream received from %s: %s" -#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943 +#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954 msgid "Syncing folders" msgstr "Syncing folders" -#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405 +#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420 #, c-format msgid "Error parsing filter: %s: %s" msgstr "Error parsing filter: %s: %s" -#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411 +#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426 #, c-format msgid "Error executing filter: %s: %s" msgstr "Error executing filter: %s: %s" -#: camel/camel-filter-driver.c:1108 +#: camel/camel-filter-driver.c:1119 msgid "Unable to open spool folder" msgstr "Unable to open spool folder" -#: camel/camel-filter-driver.c:1117 +#: camel/camel-filter-driver.c:1128 msgid "Unable to process spool folder" msgstr "Unable to process spool folder" -#: camel/camel-filter-driver.c:1132 +#: camel/camel-filter-driver.c:1143 #, c-format msgid "Getting message %d (%d%%)" msgstr "Getting message %d (%d%%)" -#: camel/camel-filter-driver.c:1136 +#: camel/camel-filter-driver.c:1147 msgid "Cannot open message" msgstr "Cannot open message" -#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149 +#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160 #, c-format msgid "Failed on message %d" msgstr "Failed on message %d" -#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254 +#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265 msgid "Syncing folder" msgstr "Syncing folder" -#: camel/camel-filter-driver.c:1224 +#: camel/camel-filter-driver.c:1235 #, c-format msgid "Getting message %d of %d" msgstr "Getting message %d of %d" -#: camel/camel-filter-driver.c:1239 +#: camel/camel-filter-driver.c:1250 #, c-format msgid "Failed at message %d of %d" msgstr "Failed at message %d of %d" @@ -8581,7 +8579,7 @@ msgstr "(match-threads) requires the folder set" msgid "Performing query on unknown header: %s" msgstr "Performing query on unknown header: %s" -#: camel/camel-gpg-context.c:720 +#: camel/camel-gpg-context.c:722 #, c-format msgid "" "Unexpected GnuPG status message encountered:\n" @@ -8592,15 +8590,15 @@ msgstr "" "\n" "%s" -#: camel/camel-gpg-context.c:734 +#: camel/camel-gpg-context.c:736 msgid "Failed to parse gpg userid hint." msgstr "Failed to parse gpg userid hint." -#: camel/camel-gpg-context.c:758 +#: camel/camel-gpg-context.c:760 msgid "Failed to parse gpg passphrase request." msgstr "Failed to parse gpg passphrase request." -#: camel/camel-gpg-context.c:772 +#: camel/camel-gpg-context.c:774 #, c-format msgid "" "You need a passphrase to unlock the key for\n" @@ -8609,28 +8607,28 @@ msgstr "" "You need a passphrase to unlock the key for\n" "user: \"%s\"" -#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280 -#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530 -#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231 +#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283 +#: camel/camel-gpg-context.c:1440 camel/camel-gpg-context.c:1531 +#: camel/camel-gpg-context.c:1638 camel/providers/nntp/camel-nntp-store.c:1231 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705 #: mail/mail-send-recv.c:611 msgid "Cancelled." msgstr "Cancelled." -#: camel/camel-gpg-context.c:807 +#: camel/camel-gpg-context.c:809 msgid "Failed to unlock secret key: 3 bad passphrases given." msgstr "Failed to unlock secret key: 3 bad passphrases given." -#: camel/camel-gpg-context.c:813 +#: camel/camel-gpg-context.c:815 #, c-format msgid "Unexpected response from GnuPG: %s" msgstr "Unexpected response from GnuPG: %s" -#: camel/camel-gpg-context.c:864 +#: camel/camel-gpg-context.c:867 msgid "Failed to encrypt: No valid recipients specified." msgstr "Failed to encrypt: No valid recipients specified." -#: camel/camel-gpg-context.c:1141 +#: camel/camel-gpg-context.c:1144 #, c-format msgid "" "Failed to GPG %s: %s\n" @@ -8641,58 +8639,58 @@ msgstr "" "\n" "%s" -#: camel/camel-gpg-context.c:1146 +#: camel/camel-gpg-context.c:1149 #, c-format msgid "Failed to GPG %s: %s\n" msgstr "Failed to GPG %s: %s\n" -#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419 +#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419 #, c-format msgid "Could not generate signing data: %s" msgstr "Could not generate signing data: %s" -#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702 -#: camel/camel-gpg-context.c:1753 +#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1703 +#: camel/camel-gpg-context.c:1754 #, c-format msgid "Failed to execute gpg: %s" msgstr "Failed to execute gpg: %s" -#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430 -#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546 -#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654 -#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775 +#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1433 +#: camel/camel-gpg-context.c:1524 camel/camel-gpg-context.c:1547 +#: camel/camel-gpg-context.c:1631 camel/camel-gpg-context.c:1655 +#: camel/camel-gpg-context.c:1725 camel/camel-gpg-context.c:1776 msgid "Failed to execute gpg." msgstr "Failed to execute gpg." -#: camel/camel-gpg-context.c:1316 +#: camel/camel-gpg-context.c:1319 msgid "This is a digitally signed message part" msgstr "This is a digitally signed message part" -#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406 +#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1409 #: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732 #: camel/camel-smime-context.c:739 msgid "Cannot verify message signature: Incorrect message format" msgstr "Cannot verify message signature: Incorrect message format" -#: camel/camel-gpg-context.c:1413 +#: camel/camel-gpg-context.c:1416 #, c-format msgid "Cannot verify message signature: could not create temp file: %s" msgstr "Cannot verify message signature: could not create temp file: %s" -#: camel/camel-gpg-context.c:1506 +#: camel/camel-gpg-context.c:1507 #, c-format msgid "Could not generate encrypting data: %s" msgstr "Could not generate encrypting data: %s" -#: camel/camel-gpg-context.c:1564 +#: camel/camel-gpg-context.c:1565 msgid "This is a digitally encrypted message part" msgstr "This is a digitally encrypted message part" -#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994 +#: camel/camel-gpg-context.c:1662 camel/camel-smime-context.c:994 msgid "Encrypted content" msgstr "Encrypted content" -#: camel/camel-gpg-context.c:1680 +#: camel/camel-gpg-context.c:1681 msgid "Unable to parse message content" msgstr "Unable to parse message content" @@ -9502,7 +9500,7 @@ msgstr "Key usage does not support certificate signing" msgid "Error in application verification" msgstr "Error in application verification" -#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825 +#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826 #, c-format msgid "" "Issuer: %s\n" @@ -9515,11 +9513,11 @@ msgstr "" "Fingerprint: %s\n" "Signature: %s" -#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831 +#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832 msgid "GOOD" msgstr "GOOD" -#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831 +#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832 msgid "BAD" msgstr "BAD" @@ -9543,7 +9541,7 @@ msgstr "" "Do you wish to accept anyway?" #. construct our user prompt -#: camel/camel-tcp-stream-ssl.c:835 +#: camel/camel-tcp-stream-ssl.c:836 #, c-format msgid "" "SSL Certificate check for %s:\n" @@ -9558,7 +9556,7 @@ msgstr "" "\n" "Do you wish to accept?" -#: camel/camel-tcp-stream-ssl.c:879 +#: camel/camel-tcp-stream-ssl.c:880 #, c-format msgid "" "Certificate problem: %s\n" @@ -9567,7 +9565,7 @@ msgstr "" "Certificate problem: %s\n" "Issuer: %s" -#: camel/camel-tcp-stream-ssl.c:931 +#: camel/camel-tcp-stream-ssl.c:932 #, c-format msgid "" "Bad certificate domain: %s\n" @@ -9576,7 +9574,7 @@ msgstr "" "Bad certificate domain: %s\n" "Issuer: %s" -#: camel/camel-tcp-stream-ssl.c:949 +#: camel/camel-tcp-stream-ssl.c:950 #, c-format msgid "" "Certificate expired: %s\n" @@ -9585,7 +9583,7 @@ msgstr "" "Certificate expired: %s\n" "Issuer: %s" -#: camel/camel-tcp-stream-ssl.c:966 +#: camel/camel-tcp-stream-ssl.c:967 #, c-format msgid "" "Certificate revocation list expired: %s\n" @@ -9594,7 +9592,7 @@ msgstr "" "Certificate revocation list expired: %s\n" "Issuer: %s" -#: camel/camel-url.c:290 +#: camel/camel-url.c:292 #, c-format msgid "Could not parse URL `%s'" msgstr "Could not parse URL `%s'" @@ -9688,90 +9686,101 @@ msgstr "" msgid "Checklist" msgstr "Checklist" -#: camel/providers/imap4/camel-imap4-command.c:629 +#: camel/providers/imap4/camel-imap4-command.c:531 +#: camel/providers/imap4/camel-imap4-command.c:538 +#, c-format +msgid "Failed sending command to IMAP server %s: %s" +msgstr "Failed sending command to IMAP server %s: %s" + +#: camel/providers/imap4/camel-imap4-command.c:637 #, c-format msgid "Unexpected response from IMAP4 server %s: %s" msgstr "Unexpected response from IMAP4 server %s: %s" -#: camel/providers/imap4/camel-imap4-engine.c:415 +#: camel/providers/imap4/camel-imap4-engine.c:232 +#, c-format +msgid "Unexpected greeting from IMAP server %s." +msgstr "Unexpected greeting from IMAP server %s." + +#: camel/providers/imap4/camel-imap4-engine.c:416 #, c-format msgid "Cannot select folder `%s': Invalid mailbox name" msgstr "Cannot select folder `%s': Invalid mailbox name" -#: camel/providers/imap4/camel-imap4-engine.c:421 +#: camel/providers/imap4/camel-imap4-engine.c:422 #, c-format msgid "Cannot select folder `%s': Bad command" msgstr "Cannot select folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-engine.c:1144 -#: camel/providers/imap4/camel-imap4-engine.c:1533 -#: camel/providers/imap4/camel-imap4-engine.c:1560 -#: camel/providers/imap4/camel-imap4-engine.c:1590 -#: camel/providers/imap4/camel-imap4-engine.c:1630 +#: camel/providers/imap4/camel-imap4-engine.c:997 +#: camel/providers/imap4/camel-imap4-engine.c:1378 +#: camel/providers/imap4/camel-imap4-engine.c:1405 +#: camel/providers/imap4/camel-imap4-engine.c:1435 +#: camel/providers/imap4/camel-imap4-engine.c:1475 #, c-format msgid "IMAP4 server %s unexpectedly disconnected: %s" msgstr "IMAP4 server %s unexpectedly disconnected: %s" -#: camel/providers/imap4/camel-imap4-engine.c:1145 +#: camel/providers/imap4/camel-imap4-engine.c:998 msgid "Got BYE response" msgstr "Got BYE response" -#: camel/providers/imap4/camel-imap4-folder.c:335 +#: camel/providers/imap4/camel-imap4-folder.c:424 #, c-format msgid "Cannot sync flags to folder `%s': Unknown" msgstr "Cannot sync flags to folder `%s': Unknown" -#: camel/providers/imap4/camel-imap4-folder.c:341 +#: camel/providers/imap4/camel-imap4-folder.c:430 #, c-format msgid "Cannot sync flags to folder `%s': Bad command" msgstr "Cannot sync flags to folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-folder.c:476 +#: camel/providers/imap4/camel-imap4-folder.c:567 #, c-format msgid "Cannot expunge folder `%s': Unknown" msgstr "Cannot expunge folder `%s': Unknown" -#: camel/providers/imap4/camel-imap4-folder.c:481 +#: camel/providers/imap4/camel-imap4-folder.c:572 #, c-format msgid "Cannot expunge folder `%s': Bad command" msgstr "Cannot expunge folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-folder.c:616 +#: camel/providers/imap4/camel-imap4-folder.c:748 #, c-format msgid "Cannot get message %s from folder `%s': No such message" msgstr "Cannot get message %s from folder `%s': No such message" -#: camel/providers/imap4/camel-imap4-folder.c:621 +#: camel/providers/imap4/camel-imap4-folder.c:753 #, c-format msgid "Cannot get message %s from folder `%s': Bad command" msgstr "Cannot get message %s from folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-folder.c:746 +#: camel/providers/imap4/camel-imap4-folder.c:878 #, c-format msgid "Cannot append message to folder `%s': Unknown error" msgstr "Cannot append message to folder `%s': Unknown error" -#: camel/providers/imap4/camel-imap4-folder.c:775 +#: camel/providers/imap4/camel-imap4-folder.c:907 #, c-format msgid "Cannot append message to folder `%s': Bad command" msgstr "Cannot append message to folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-folder.c:854 +#: camel/providers/imap4/camel-imap4-folder.c:986 #, c-format msgid "Cannot move messages from folder `%s' to folder `%s': Unknown" msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown" -#: camel/providers/imap4/camel-imap4-folder.c:858 +#: camel/providers/imap4/camel-imap4-folder.c:990 #, c-format msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown" msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown" -#: camel/providers/imap4/camel-imap4-folder.c:866 +#: camel/providers/imap4/camel-imap4-folder.c:998 #, c-format msgid "Cannot move messages from folder `%s' to folder `%s': Bad command" msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-folder.c:870 +#: camel/providers/imap4/camel-imap4-folder.c:1002 #, c-format msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command" msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command" @@ -9811,20 +9820,20 @@ msgid "" msgstr "" "This option will connect to the IMAPv4rev1 server using a plaintext password." -#: camel/providers/imap4/camel-imap4-store.c:165 +#: camel/providers/imap4/camel-imap4-store.c:173 #: camel/providers/imap/camel-imap-store.c:428 #, c-format msgid "IMAP server %s" msgstr "IMAP server %s" -#: camel/providers/imap4/camel-imap4-store.c:167 +#: camel/providers/imap4/camel-imap4-store.c:175 #: camel/providers/imap/camel-imap-store.c:430 #, c-format msgid "IMAP service for %s on %s" msgstr "IMAP service for %s on %s" -#: camel/providers/imap4/camel-imap4-store.c:208 -#: camel/providers/imap4/camel-imap4-store.c:225 +#: camel/providers/imap4/camel-imap4-store.c:216 +#: camel/providers/imap4/camel-imap4-store.c:233 #: camel/providers/imap/camel-imap-store.c:551 #: camel/providers/imap/camel-imap-store.c:571 #: camel/providers/imapp/camel-imapp-store.c:231 @@ -9836,14 +9845,14 @@ msgstr "IMAP service for %s on %s" msgid "Could not connect to %s (port %d): %s" msgstr "Could not connect to %s (port %d): %s" -#: camel/providers/imap4/camel-imap4-store.c:210 +#: camel/providers/imap4/camel-imap4-store.c:218 #: camel/providers/imap/camel-imap-store.c:553 #: camel/providers/pop3/camel-pop3-store.c:177 #: camel/providers/smtp/camel-smtp-transport.c:271 msgid "SSL unavailable" msgstr "SSL unavailable" -#: camel/providers/imap4/camel-imap4-store.c:222 +#: camel/providers/imap4/camel-imap4-store.c:230 #: camel/providers/imap/camel-imap-store.c:568 #: camel/providers/imap/camel-imap-store.c:845 #: camel/providers/imapp/camel-imapp-store.c:228 @@ -9853,7 +9862,7 @@ msgstr "SSL unavailable" msgid "Connection cancelled" msgstr "Connection cancelled" -#: camel/providers/imap4/camel-imap4-store.c:261 +#: camel/providers/imap4/camel-imap4-store.c:269 #, c-format msgid "" "Failed to connect to IMAP server %s in secure mode: Server does not support " @@ -9862,14 +9871,14 @@ msgstr "" "Failed to connect to IMAP server %s in secure mode: Server does not support " "STARTTLS" -#: camel/providers/imap4/camel-imap4-store.c:286 +#: camel/providers/imap4/camel-imap4-store.c:294 #: camel/providers/imap/camel-imap-store.c:679 #: camel/providers/imap/camel-imap-store.c:710 #, c-format msgid "Failed to connect to IMAP server %s in secure mode: %s" msgstr "Failed to connect to IMAP server %s in secure mode: %s" -#: camel/providers/imap4/camel-imap4-store.c:287 +#: camel/providers/imap4/camel-imap4-store.c:295 #: camel/providers/imap/camel-imap-command.c:303 #: camel/providers/imap/camel-imap-command.c:400 #: camel/providers/pop3/camel-pop3-store.c:538 @@ -9877,29 +9886,29 @@ msgstr "Failed to connect to IMAP server %s in secure mode: %s" msgid "Unknown error" msgstr "Unknown error" -#: camel/providers/imap4/camel-imap4-store.c:373 +#: camel/providers/imap4/camel-imap4-store.c:381 #, c-format msgid "" "Cannot authenticate to IMAP server %s using the %s authentication mechanism" msgstr "" "Cannot authenticate to IMAP server %s using the %s authentication mechanism" -#: camel/providers/imap4/camel-imap4-store.c:418 +#: camel/providers/imap4/camel-imap4-store.c:426 #, c-format msgid "%sPlease enter the IMAP password for %s on host %s" msgstr "%sPlease enter the IMAP password for %s on host %s" -#: camel/providers/imap4/camel-imap4-store.c:492 +#: camel/providers/imap4/camel-imap4-store.c:500 #, c-format msgid "Cannot authenticate to IMAP server %s using %s" msgstr "Cannot authenticate to IMAP server %s using %s" -#: camel/providers/imap4/camel-imap4-store.c:723 +#: camel/providers/imap4/camel-imap4-store.c:731 #, c-format msgid "Cannot get folder `%s' on IMAP server %s: Unknown" msgstr "Cannot get folder `%s' on IMAP server %s: Unknown" -#: camel/providers/imap4/camel-imap4-store.c:782 +#: camel/providers/imap4/camel-imap4-store.c:793 #: camel/providers/imap/camel-imap-store.c:1885 #: camel/providers/imap/camel-imap-store.c:2263 #, c-format @@ -9908,70 +9917,85 @@ msgid "" msgstr "" "The folder name \"%s\" is invalid because it contains the character \"%c\"" -#: camel/providers/imap4/camel-imap4-store.c:826 +#: camel/providers/imap4/camel-imap4-store.c:837 #, c-format msgid "Cannot create folder `%s': Invalid mailbox name" msgstr "Cannot create folder `%s': Invalid mailbox name" -#: camel/providers/imap4/camel-imap4-store.c:831 +#: camel/providers/imap4/camel-imap4-store.c:842 #, c-format msgid "Cannot create folder `%s': Bad command" msgstr "Cannot create folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-store.c:859 +#: camel/providers/imap4/camel-imap4-store.c:870 #, c-format msgid "Cannot delete folder `%s': Special folder" msgstr "Cannot delete folder `%s': Special folder" -#: camel/providers/imap4/camel-imap4-store.c:891 +#: camel/providers/imap4/camel-imap4-store.c:903 #, c-format msgid "Cannot delete folder `%s': Invalid mailbox name" msgstr "Cannot delete folder `%s': Invalid mailbox name" -#: camel/providers/imap4/camel-imap4-store.c:896 +#: camel/providers/imap4/camel-imap4-store.c:908 #, c-format msgid "Cannot delete folder `%s': Bad command" msgstr "Cannot delete folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-store.c:1037 +#: camel/providers/imap4/camel-imap4-store.c:928 +#, c-format +msgid "Cannot rename folder `%s' to `%s': Special folder" +msgstr "Cannot rename folder `%s' to `%s': Special folder" + +#: camel/providers/imap4/camel-imap4-store.c:960 +#, c-format +msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name" +msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name" + +#: camel/providers/imap4/camel-imap4-store.c:965 +#, c-format +msgid "Cannot rename folder `%s' to `%s': Bad command" +msgstr "Cannot rename folder `%s' to `%s': Bad command" + +#: camel/providers/imap4/camel-imap4-store.c:1171 #, c-format msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s" msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s" -#: camel/providers/imap4/camel-imap4-store.c:1039 +#: camel/providers/imap4/camel-imap4-store.c:1173 msgid "Bad command" msgstr "Bad command" -#: camel/providers/imap4/camel-imap4-store.c:1100 +#: camel/providers/imap4/camel-imap4-store.c:1235 #, c-format msgid "Cannot subscribe to folder `%s': Invalid mailbox name" msgstr "Cannot subscribe to folder `%s': Invalid mailbox name" -#: camel/providers/imap4/camel-imap4-store.c:1105 +#: camel/providers/imap4/camel-imap4-store.c:1240 #, c-format msgid "Cannot subscribe to folder `%s': Bad command" msgstr "Cannot subscribe to folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-store.c:1149 +#: camel/providers/imap4/camel-imap4-store.c:1285 #, c-format msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name" msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name" -#: camel/providers/imap4/camel-imap4-store.c:1154 +#: camel/providers/imap4/camel-imap4-store.c:1290 #, c-format msgid "Cannot unsubscribe from folder `%s': Bad command" msgstr "Cannot unsubscribe from folder `%s': Bad command" -#: camel/providers/imap4/camel-imap4-utils.c:85 +#: camel/providers/imap4/camel-imap4-utils.c:86 #, c-format msgid "Unexpected token in response from IMAP server %s: " msgstr "Unexpected token in response from IMAP server %s: " -#: camel/providers/imap4/camel-imap4-utils.c:108 +#: camel/providers/imap4/camel-imap4-utils.c:109 msgid "No data" msgstr "No data" -#: camel/providers/imap4/camel-imap4-utils.c:291 +#: camel/providers/imap4/camel-imap4-utils.c:292 #, c-format msgid "IMAP server %s unexpectedly disconnected: %s" msgstr "IMAP server %s unexpectedly disconnected: %s" @@ -11307,93 +11331,93 @@ msgstr "" "%s\n" "\n" -#: camel/providers/smtp/camel-smtp-transport.c:666 +#: camel/providers/smtp/camel-smtp-transport.c:657 #, c-format msgid "SMTP server %s" msgstr "SMTP server %s" -#: camel/providers/smtp/camel-smtp-transport.c:668 +#: camel/providers/smtp/camel-smtp-transport.c:659 #, c-format msgid "SMTP mail delivery via %s" msgstr "SMTP mail delivery via %s" -#: camel/providers/smtp/camel-smtp-transport.c:686 +#: camel/providers/smtp/camel-smtp-transport.c:677 msgid "Cannot send message: service not connected." msgstr "Cannot send message: service not connected." -#: camel/providers/smtp/camel-smtp-transport.c:692 +#: camel/providers/smtp/camel-smtp-transport.c:683 msgid "Cannot send message: sender address not valid." msgstr "Cannot send message: sender address not valid." -#: camel/providers/smtp/camel-smtp-transport.c:696 +#: camel/providers/smtp/camel-smtp-transport.c:687 msgid "Sending message" msgstr "Sending message" -#: camel/providers/smtp/camel-smtp-transport.c:711 +#: camel/providers/smtp/camel-smtp-transport.c:702 msgid "Cannot send message: no recipients defined." msgstr "Cannot send message: no recipients defined." -#: camel/providers/smtp/camel-smtp-transport.c:722 +#: camel/providers/smtp/camel-smtp-transport.c:713 msgid "Cannot send message: one or more invalid recipients" msgstr "Cannot send message: one or more invalid recipients" -#: camel/providers/smtp/camel-smtp-transport.c:894 +#: camel/providers/smtp/camel-smtp-transport.c:885 msgid "SMTP Greeting" msgstr "SMTP Greeting" -#: camel/providers/smtp/camel-smtp-transport.c:943 +#: camel/providers/smtp/camel-smtp-transport.c:934 #, c-format msgid "HELO command failed: %s" msgstr "HELO command failed: %s" -#: camel/providers/smtp/camel-smtp-transport.c:960 +#: camel/providers/smtp/camel-smtp-transport.c:951 msgid "HELO command failed" msgstr "HELO command failed" -#: camel/providers/smtp/camel-smtp-transport.c:1026 +#: camel/providers/smtp/camel-smtp-transport.c:1017 msgid "SMTP Authentication" msgstr "SMTP Authentication" -#: camel/providers/smtp/camel-smtp-transport.c:1032 +#: camel/providers/smtp/camel-smtp-transport.c:1023 msgid "Error creating SASL authentication object." msgstr "Error creating SASL authentication object." -#: camel/providers/smtp/camel-smtp-transport.c:1049 -#: camel/providers/smtp/camel-smtp-transport.c:1060 +#: camel/providers/smtp/camel-smtp-transport.c:1040 +#: camel/providers/smtp/camel-smtp-transport.c:1051 #, c-format msgid "AUTH command failed: %s" msgstr "AUTH command failed: %s" -#: camel/providers/smtp/camel-smtp-transport.c:1066 +#: camel/providers/smtp/camel-smtp-transport.c:1057 msgid "AUTH command failed" msgstr "AUTH command failed" -#: camel/providers/smtp/camel-smtp-transport.c:1128 +#: camel/providers/smtp/camel-smtp-transport.c:1119 msgid "Bad authentication response from server.\n" msgstr "Bad authentication response from server.\n" -#: camel/providers/smtp/camel-smtp-transport.c:1153 +#: camel/providers/smtp/camel-smtp-transport.c:1144 #, c-format msgid "MAIL FROM command failed: %s: mail not sent" msgstr "MAIL FROM command failed: %s: mail not sent" -#: camel/providers/smtp/camel-smtp-transport.c:1170 +#: camel/providers/smtp/camel-smtp-transport.c:1161 msgid "MAIL FROM command failed" msgstr "MAIL FROM command failed" -#: camel/providers/smtp/camel-smtp-transport.c:1194 +#: camel/providers/smtp/camel-smtp-transport.c:1185 #, c-format msgid "RCPT TO command failed: %s: mail not sent" msgstr "RCPT TO command failed: %s: mail not sent" -#: camel/providers/smtp/camel-smtp-transport.c:1213 +#: camel/providers/smtp/camel-smtp-transport.c:1204 #, c-format msgid "RCPT TO <%s> failed" msgstr "RCPT TO <%s> failed" -#: camel/providers/smtp/camel-smtp-transport.c:1252 -#: camel/providers/smtp/camel-smtp-transport.c:1310 -#: camel/providers/smtp/camel-smtp-transport.c:1329 +#: camel/providers/smtp/camel-smtp-transport.c:1243 +#: camel/providers/smtp/camel-smtp-transport.c:1301 +#: camel/providers/smtp/camel-smtp-transport.c:1320 #, c-format msgid "DATA command failed: %s: mail not sent" msgstr "DATA command failed: %s: mail not sent" @@ -11401,26 +11425,26 @@ msgstr "DATA command failed: %s: mail not sent" #. we should have gotten instructions on how to use the DATA command: #. * 354 Enter mail, end with "." on a line by itself #. -#: camel/providers/smtp/camel-smtp-transport.c:1269 -#: camel/providers/smtp/camel-smtp-transport.c:1345 +#: camel/providers/smtp/camel-smtp-transport.c:1260 +#: camel/providers/smtp/camel-smtp-transport.c:1336 msgid "DATA command failed" msgstr "DATA command failed" -#: camel/providers/smtp/camel-smtp-transport.c:1368 +#: camel/providers/smtp/camel-smtp-transport.c:1359 #, c-format msgid "RSET command failed: %s" msgstr "RSET command failed: %s" -#: camel/providers/smtp/camel-smtp-transport.c:1384 +#: camel/providers/smtp/camel-smtp-transport.c:1375 msgid "RSET command failed" msgstr "RSET command failed" -#: camel/providers/smtp/camel-smtp-transport.c:1407 +#: camel/providers/smtp/camel-smtp-transport.c:1398 #, c-format msgid "QUIT command failed: %s" msgstr "QUIT command failed: %s" -#: camel/providers/smtp/camel-smtp-transport.c:1421 +#: camel/providers/smtp/camel-smtp-transport.c:1412 msgid "QUIT command failed" msgstr "QUIT command failed" @@ -11532,44 +11556,16 @@ msgstr[1] "<b>%d</b> Files Attached" msgid "Hide _Attachment Bar (drop attachments here)" msgstr "Hide _Attachment Bar (drop attachments here)" -#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234 +#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3208 msgid "Show _Attachment Bar (drop attachments here)" msgstr "Show _Attachment Bar (drop attachments here)" -#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113 -#: composer/e-msg-composer.c:3114 +#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3100 +#: composer/e-msg-composer.c:3101 msgid "Compose a message" msgstr "Compose a message" -#: composer/e-msg-composer.c:3147 -msgid "" -"Could not create composer window:\n" -"Unable to activate address selector control." -msgstr "" -"Could not create composer window:\n" -"Unable to activate address selector control." - -#: composer/e-msg-composer.c:3175 -msgid "" -"Could not create composer window:\n" -"Unable to activate HTML editor component.\n" -"Please make sure you have the correct version\n" -"of gtkhtml and libgtkhtml installed.\n" -msgstr "" -"Could not create composer window:\n" -"Unable to activate HTML editor component.\n" -"Please make sure you have the correct version\n" -"of gtkhtml and libgtkhtml installed.\n" - -#: composer/e-msg-composer.c:3279 -msgid "" -"Could not create composer window:\n" -"Unable to activate HTML editor component." -msgstr "" -"Could not create composer window:\n" -"Unable to activate HTML editor component." - -#: composer/e-msg-composer.c:4284 +#: composer/e-msg-composer.c:4254 msgid "" "<b>(The composer contains a non-text message body, which cannot be edited.)" "<b>" @@ -11788,6 +11784,30 @@ msgstr "All accounts have been removed." msgid "You need to configure an account before you can compose mail." msgstr "You need to configure an account before you can compose mail." +#. mail-composer:no-address-control primary +#: composer/mail-composer-errors.xml.h:44 +#: composer/mail-composer-errors.xml.h:48 +msgid "Could not create composer window." +msgstr "Could not create composer window." + +#. mail-composer:no-address-control secondary +#: composer/mail-composer-errors.xml.h:46 +msgid "Unable to activate the address selector control." +msgstr "Unable to activate the address selector control." + +#. mail-composer:no-editor-control secondary +#: composer/mail-composer-errors.xml.h:50 +msgid "" +"Unable to activate the HTML editor control.\n" +"\n" +"Please make sure that you have the correct version of gtkhtml and libgtkhtml " +"installed." +msgstr "" +"Unable to activate the HTML editor control.\n" +"\n" +"Please make sure that you have the correct version of gtkhtml and libgtkhtml " +"installed." + #: data/evolution.desktop.in.in.h:1 msgid "The Ximian Evolution Groupware Suite" msgstr "The Ximian Evolution Groupware Suite" @@ -12441,17 +12461,17 @@ msgstr "Add signature script" msgid "Signature(s)" msgstr "Signature(s)" -#: mail/em-composer-utils.c:888 +#: mail/em-composer-utils.c:887 msgid "-------- Forwarded Message --------" msgstr "-------- Forwarded Message --------" -#: mail/em-composer-utils.c:1495 +#: mail/em-composer-utils.c:1501 msgid "an unknown sender" msgstr "an unknown sender" #. translators: attribution string used when quoting messages, #. it must contain a single single %%+05d followed by a single '%%s' -#: mail/em-composer-utils.c:1505 +#: mail/em-composer-utils.c:1511 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:" msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:" @@ -12489,117 +12509,122 @@ msgstr "<click here to select a folder>" msgid "Create New Folder" msgstr "Create New Folder" -#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274 -#: mail/mail-component.c:704 -#: shell/glade/e-shell-folder-creation-dialog.glade.h:4 +#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2310 +#: mail/mail-component.c:719 msgid "Specify where to create the folder:" msgstr "Specify where to create the folder:" -#: mail/em-folder-selector.c:299 +#: mail/em-folder-selector.c:300 msgid "Create" msgstr "Create" -#: mail/em-folder-selector.c:303 -#: shell/glade/e-shell-folder-creation-dialog.glade.h:2 +#: mail/em-folder-selector.c:304 msgid "Folder _name:" msgstr "Folder _name:" -#: mail/em-folder-tree.c:833 +#: mail/em-folder-tree.c:841 #, c-format msgid "Moving folder %s" msgstr "Moving folder %s" -#: mail/em-folder-tree.c:835 +#: mail/em-folder-tree.c:843 #, c-format msgid "Copying folder %s" msgstr "Copying folder %s" -#: mail/em-folder-tree.c:842 mail/message-list.c:1561 +#: mail/em-folder-tree.c:850 mail/message-list.c:1561 #, c-format msgid "Moving messages into folder %s" msgstr "Moving messages into folder %s" -#: mail/em-folder-tree.c:844 mail/message-list.c:1563 +#: mail/em-folder-tree.c:852 mail/message-list.c:1563 #, c-format msgid "Copying messages into folder %s" msgstr "Copying messages into folder %s" -#: mail/em-folder-tree.c:860 +#: mail/em-folder-tree.c:868 msgid "Cannot drop message(s) into toplevel store" msgstr "Cannot drop message(s) into toplevel store" -#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110 +#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110 msgid "_Copy to Folder" msgstr "_Copy to Folder" -#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119 +#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119 msgid "_Move to Folder" msgstr "_Move to Folder" -#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061 -#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798 -#: mail/message-list.c:1651 +#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096 +#: mail/em-folder-view.c:798 mail/message-list.c:1651 msgid "_Move" msgstr "_Move" -#: mail/em-folder-tree.c:955 mail/message-list.c:1653 +#: mail/em-folder-tree.c:963 mail/message-list.c:1653 msgid "Cancel _Drag" msgstr "Cancel _Drag" -#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061 +#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812 #: mail/importers/evolution-mbox-importer.c:119 #: mail/importers/evolution-outlook-importer.c:133 msgid "Select folder" msgstr "Select folder" -#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812 +#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812 msgid "C_opy" msgstr "C_opy" -#: mail/em-folder-tree.c:2088 +#: mail/em-folder-tree.c:2123 #, c-format msgid "Creating folder `%s'" msgstr "Creating folder `%s'" -#: mail/em-folder-tree.c:2274 mail/mail-component.c:704 +#: mail/em-folder-tree.c:2310 mail/mail-component.c:719 msgid "Create folder" msgstr "Create folder" -#: mail/em-folder-tree.c:2463 +#: mail/em-folder-tree.c:2499 #, c-format msgid "Rename the \"%s\" folder to:" msgstr "Rename the \"%s\" folder to:" -#: mail/em-folder-tree.c:2465 +#: mail/em-folder-tree.c:2501 msgid "Rename Folder" msgstr "Rename Folder" -#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44 +#: mail/em-folder-tree.c:2572 ui/evolution-addressbook.xml.h:44 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37 msgid "_View" msgstr "_View" -#: mail/em-folder-tree.c:2537 +#: mail/em-folder-tree.c:2573 msgid "Open in _New Window" msgstr "Open in _New Window" +#: mail/em-folder-tree.c:2577 +msgid "_Copy..." +msgstr "_Copy..." + +#: mail/em-folder-tree.c:2578 +msgid "_Move..." +msgstr "_Move..." + #. FIXME: need to disable for nochildren folders -#: mail/em-folder-tree.c:2546 +#: mail/em-folder-tree.c:2582 msgid "_New Folder..." msgstr "_New Folder..." -#: mail/em-folder-tree.c:2549 -msgid "_Rename" -msgstr "_Rename" +#: mail/em-folder-tree.c:2585 +msgid "_Rename..." +msgstr "_Rename..." -#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27 -msgid "_Properties..." -msgstr "_Properties..." +#: mail/em-folder-tree.c:2588 ui/evolution-mail-list.xml.h:27 +msgid "_Properties" +msgstr "_Properties" #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201 -#: mail/mail-vfolder.c:888 +#: mail/mail-vfolder.c:869 msgid "VFolders" msgstr "VFolders" @@ -12619,8 +12644,8 @@ msgstr "Loading..." #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902 -#: mail/importers/pine-importer.c:474 mail/mail-component.c:508 -#: mail/mail-component.c:554 +#: mail/importers/pine-importer.c:474 mail/mail-component.c:516 +#: mail/mail-component.c:569 msgid "Mail" msgstr "Mail" @@ -12754,20 +12779,20 @@ msgid "Filter on _Mailing List" msgstr "Filter on _Mailing List" #. default charset used in mail view -#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746 +#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750 #: mail/mail-config.glade.h:68 msgid "Default" msgstr "Default" -#: mail/em-folder-view.c:1796 +#: mail/em-folder-view.c:1800 msgid "Print Message" msgstr "Print Message" -#: mail/em-folder-view.c:2076 +#: mail/em-folder-view.c:2080 msgid "_Copy Link Location" msgstr "_Copy Link Location" -#: mail/em-folder-view.c:2341 +#: mail/em-folder-view.c:2345 #, c-format msgid "Click to mail %s" msgstr "Click to mail %s" @@ -12914,7 +12939,7 @@ msgstr "Formatting message" #. pseudo-header #: mail/em-format-html.c:1523 mail/em-format-quote.c:309 -#: mail/em-mailer-prefs.c:930 +#: mail/em-mailer-prefs.c:939 msgid "Mailer" msgstr "Mailer" @@ -13161,7 +13186,7 @@ msgstr "This store does not support subscriptions, or they are not enabled." msgid "Subscribed" msgstr "Subscribed" -#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2 +#: mail/em-subscribe-editor.c:639 msgid "Folder" msgstr "Folder" @@ -13981,66 +14006,80 @@ msgstr "%s mailing list" msgid "Add Filter Rule" msgstr "Add Filter Rule" -#: mail/mail-component.c:461 +#: mail/mail-component.c:469 #, c-format msgid "%d deleted" -msgstr "%d deleted" +msgid_plural "%d deleted" +msgstr[0] "%d deleted" +msgstr[1] "%d deleted" -#: mail/mail-component.c:463 +#: mail/mail-component.c:471 #, c-format msgid "%d junk" -msgstr "%d junk" +msgid_plural "%d junk" +msgstr[0] "%d junk" +msgstr[1] "%d junk" -#: mail/mail-component.c:486 +#: mail/mail-component.c:494 #, c-format -msgid "%d drafts" -msgstr "%d drafts" +msgid "%d draft" +msgid_plural "%d drafts" +msgstr[0] "%d draft" +msgstr[1] "%d drafts" -#: mail/mail-component.c:488 +#: mail/mail-component.c:496 #, c-format msgid "%d sent" -msgstr "%d sent" +msgid_plural "%d send" +msgstr[0] "%d sent" +msgstr[1] "%d sent" -#: mail/mail-component.c:490 +#: mail/mail-component.c:498 #, c-format msgid "%d unsent" -msgstr "%d unsent" +msgid_plural "%d unsent" +msgstr[0] "%d unsent" +msgstr[1] "%d unsent" -#: mail/mail-component.c:494 +#: mail/mail-component.c:502 #, c-format msgid "%d total" -msgstr "%d total" +msgid_plural "%d total" +msgstr[0] "%d total" +msgstr[1] "%d total" -#: mail/mail-component.c:496 +#: mail/mail-component.c:504 #, c-format msgid ", %d unread" -msgstr ", %d unread" +msgid_plural ", %d unread" +msgstr[0] ", %d unread" +msgstr[1] ", %d unread" -#: mail/mail-component.c:656 +#: mail/mail-component.c:671 msgid "New Mail Message" msgstr "New Mail Message" -#: mail/mail-component.c:657 +#: mail/mail-component.c:672 msgid "_Mail Message" msgstr "_Mail Message" -#: mail/mail-component.c:658 +#: mail/mail-component.c:673 msgid "Compose a new mail message" msgstr "Compose a new mail message" -#: mail/mail-component.c:664 +#: mail/mail-component.c:679 msgid "New Mail Folder" msgstr "New Mail Folder" -#: mail/mail-component.c:665 +#: mail/mail-component.c:680 msgid "Mail _Folder" msgstr "Mail _Folder" -#: mail/mail-component.c:666 +#: mail/mail-component.c:681 msgid "Create a new mail folder" msgstr "Create a new mail folder" -#: mail/mail-component.c:798 +#: mail/mail-component.c:813 msgid "Failed upgrading Mail settings or folders." msgstr "Failed upgrading Mail settings or folders." @@ -14373,7 +14412,7 @@ msgstr "Do not quote original message" msgid "Don't sign _meeting requests (for Outlook compatibility)" msgstr "Don't sign _meeting requests (for Outlook compatibility)" -#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1 +#: mail/mail-config.glade.h:74 msgid "Done" msgstr "Done" @@ -15467,24 +15506,24 @@ msgstr "Updating..." msgid "Waiting..." msgstr "Waiting..." -#: mail/mail-session.c:239 +#: mail/mail-session.c:240 msgid "User canceled operation." msgstr "User cancelled operation." -#: mail/mail-session.c:272 +#: mail/mail-session.c:274 #, c-format msgid "Enter Password for %s" msgstr "Enter Password for %s" -#: mail/mail-session.c:274 +#: mail/mail-session.c:276 msgid "Enter Password" msgstr "Enter Password" -#: mail/mail-session.c:297 +#: mail/mail-session.c:304 msgid "_Remember this password" msgstr "_Remember this password" -#: mail/mail-session.c:298 +#: mail/mail-session.c:305 msgid "_Remember this password for the remainder of this session" msgstr "_Remember this password for the remainder of this session" @@ -15539,15 +15578,15 @@ msgstr "Updating vFolders for '%s:%s'" msgid "Updating vFolders for '%s'" msgstr "Updating vFolders for '%s'" -#: mail/mail-vfolder.c:958 +#: mail/mail-vfolder.c:939 msgid "vFolders" msgstr "vFolders" -#: mail/mail-vfolder.c:997 +#: mail/mail-vfolder.c:978 msgid "Edit VFolder" msgstr "Edit VFolder" -#: mail/mail-vfolder.c:1081 +#: mail/mail-vfolder.c:1062 msgid "New VFolder" msgstr "New VFolder" @@ -15611,7 +15650,7 @@ msgstr "%d %b %l:%M %p" msgid "%b %d %Y" msgstr "%d %b %Y" -#: mail/message-list.c:3321 +#: mail/message-list.c:3324 msgid "Generating message list" msgstr "Generating message list" @@ -16035,26 +16074,22 @@ msgstr "Bug buddy is not installed." msgid "Bug buddy could not be run." msgstr "Bug buddy could not be run." -#: shell/e-shell-window-commands.c:323 +#: shell/e-shell-window-commands.c:322 msgid "Groupware Suite" msgstr "Groupware Suite" -#: shell/e-shell-window-commands.c:563 +#: shell/e-shell-window-commands.c:562 msgid "_Work Online" msgstr "_Work Online" -#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39 +#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39 msgid "_Work Offline" msgstr "_Work Offline" -#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25 +#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25 msgid "Work Offline" msgstr "Work Offline" -#: shell/e-storage-set-view.etspec.h:1 -msgid "Checkbox" -msgstr "Checkbox" - #: shell/e-user-creatable-items-handler.c:691 msgid "New" msgstr "New" @@ -16071,96 +16106,6 @@ msgstr "_Test" msgid "Create a new test item" msgstr "Create a new test item" -#: shell/glade/e-active-connection-dialog.glade.h:1 -msgid "<b>Active Connections</b>" -msgstr "<b>Active Connections</b>" - -#: shell/glade/e-active-connection-dialog.glade.h:2 -msgid "Active Connections" -msgstr "Active Connections" - -#: shell/glade/e-active-connection-dialog.glade.h:3 -msgid "Click OK to close these connections and go offline" -msgstr "Click OK to close these connections and go offline" - -#: shell/glade/e-shell-config-default-folders.glade.h:1 -msgid "C_alendar:" -msgstr "C_alendar:" - -#: shell/glade/e-shell-config-default-folders.glade.h:2 -msgid "_Contacts:" -msgstr "_Contacts:" - -#: shell/glade/e-shell-config-default-folders.glade.h:3 -msgid "_Mail:" -msgstr "_Mail:" - -#: shell/glade/e-shell-config-default-folders.glade.h:4 -msgid "_Tasks:" -msgstr "_Tasks:" - -#: shell/glade/e-shell-folder-creation-dialog.glade.h:3 -msgid "Folder _type:" -msgstr "Folder _type:" - -#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1 -msgid "Open Other User's Folder" -msgstr "Open Other User's Folder" - -#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2 -msgid "_Account:" -msgstr "_Account:" - -#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3 -msgid "_Folder Name:" -msgstr "_Folder Name:" - -#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4 -msgid "_User:" -msgstr "_User:" - -#: shell/glade/evolution-startup-wizard.glade.h:2 -msgid "Evolution Setup Assistant" -msgstr "Evolution Setup Assistant" - -#: shell/glade/evolution-startup-wizard.glade.h:3 -msgid "Importing Files" -msgstr "Importing Files" - -#: shell/glade/evolution-startup-wizard.glade.h:4 -msgid "Timezone " -msgstr "Timezone " - -#: shell/glade/evolution-startup-wizard.glade.h:5 -msgid "Welcome" -msgstr "Welcome" - -#: shell/glade/evolution-startup-wizard.glade.h:6 -msgid "" -"Welcome to Evolution. The next few screens will allow\n" -"Evolution to connect to your email accounts, and to import\n" -"files from other applications. \n" -"\n" -"Please click the \"Forward\" button to continue. " -msgstr "" -"Welcome to Evolution. The next few screens will allow\n" -"Evolution to connect to your email accounts, and to import\n" -"files from other applications. \n" -"\n" -"Please click the \"Forward\" button to continue. " - -#: shell/glade/evolution-startup-wizard.glade.h:11 -msgid "" -"You have successfully entered all of the information\n" -"needed to set up Evolution. \n" -"\n" -"Click the \"Apply\" button to save your settings. " -msgstr "" -"You have successfully entered all of the information\n" -"needed to set up Evolution. \n" -"\n" -"Click the \"Apply\" button to save your settings. " - #: shell/GNOME_Evolution_Shell.server.in.in.h:1 msgid "Evolution Shell" msgstr "Evolution Shell" @@ -16316,88 +16261,6 @@ msgstr "" "%s: --online and --offline cannot be used together.\n" " Use %s --help for more information.\n" -#. shell:upgrade-nospace primary -#: shell/shell-errors.xml.h:2 -msgid "Insufficient disk space for upgrade." -msgstr "Insufficient disk space for upgrade." - -#. shell:upgrade-nospace secondary -#: shell/shell-errors.xml.h:4 -msgid "" -"Upgrading your data and settings will require upto {0} of disk space, but " -"you only have {1} available.\n" -"\n" -"You will need to make more space available in your home directory before you " -"can continue." -msgstr "" -"Upgrading your data and settings will require upto {0} of disk space, but " -"you only have {1} available.\n" -"\n" -"You will need to make more space available in your home directory before you " -"can continue." - -#. shell:upgrade-failed primary -#: shell/shell-errors.xml.h:8 -msgid "" -"Upgrade from previous version failed:\n" -"{0}" -msgstr "" -"Upgrade from previous version failed:\n" -"{0}" - -#. shell:upgrade-failed secondary -#: shell/shell-errors.xml.h:11 -msgid "" -"{1}\n" -"\n" -"If you choose to continue, you may not have access to some of your old " -"data.\n" -msgstr "" -"{1}\n" -"\n" -"If you choose to continue, you may not have access to some of your old " -"data.\n" - -#: shell/shell-errors.xml.h:15 -msgid "Continue" -msgstr "Continue" - -#. shell:noshell title -#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25 -msgid "Cannot start Evolution" -msgstr "Cannot start Evolution" - -#. shell:noshell primary -#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27 -msgid "Evolution can not start." -msgstr "Evolution can not start." - -#. shell:noshell secondary -#: shell/shell-errors.xml.h:21 -msgid "" -"Your system configuration does not match your Evolution configuration.\n" -"\n" -"Click help for details" -msgstr "" -"Your system configuration does not match your Evolution configuration.\n" -"\n" -"Click help for details" - -#. shell:noshell-reason secondary -#: shell/shell-errors.xml.h:29 -msgid "" -"Your system configuration does not match your Evolution configuration:\n" -"\n" -"{0}\n" -"\n" -"Click help for details." -msgstr "" -"Your system configuration does not match your Evolution configuration:\n" -"\n" -"{0}\n" -"\n" -"Click help for details." - #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353 #: smime/gui/certificate-manager.c:556 msgid "Select a cert to import..." @@ -16841,7 +16704,7 @@ msgid "Certificate Signature Value" msgstr "Certificate Signature Value" #. XXX we shouldn't be popping up dialogs in this code. -#: smime/lib/e-cert-db.c:608 +#: smime/lib/e-cert-db.c:612 msgid "Certificate already exists" msgstr "Certificate already exists" @@ -18507,7 +18370,7 @@ msgid "Evolution Query" msgstr "Evolution Query" #. setup a dummy error -#: widgets/misc/e-error.c:415 +#: widgets/misc/e-error.c:417 #, c-format msgid "" "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>" @@ -18657,6 +18520,187 @@ msgstr "%s (...)" msgid "%s (%d%% complete)" msgstr "%s (%d%% complete)" +#~ msgid "contact-list-editor" +#~ msgstr "contact-list-editor" + +#~ msgid "Save List as VCard" +#~ msgstr "Save List as VCard" + +#~ msgid "Groupwise" +#~ msgstr "Groupwise" + +#~ msgid "<b>Starts:</b> " +#~ msgstr "<b>Starts:</b> " + +#~ msgid "<b>Ends:</b> " +#~ msgstr "<b>Ends:</b> " + +#~ msgid "<b>Completed:</b> " +#~ msgstr "<b>Completed:</b> " + +#~ msgid "<b>Due:</b> " +#~ msgstr "<b>Due:</b> " + +#~ msgid "<i>None</i>" +#~ msgstr "<i>None</i>" + +#~ msgid "" +#~ "Error opening %s:\n" +#~ "%s" +#~ msgstr "" +#~ "Error opening %s:\n" +#~ "%s" + +#~ msgid "" +#~ "Could not create composer window:\n" +#~ "Unable to activate HTML editor component." +#~ msgstr "" +#~ "Could not create composer window:\n" +#~ "Unable to activate HTML editor component." + +#~ msgid "_Properties..." +#~ msgstr "_Properties..." + +#~ msgid "Checkbox" +#~ msgstr "Checkbox" + +#~ msgid "<b>Active Connections</b>" +#~ msgstr "<b>Active Connections</b>" + +#~ msgid "Active Connections" +#~ msgstr "Active Connections" + +#~ msgid "Click OK to close these connections and go offline" +#~ msgstr "Click OK to close these connections and go offline" + +#~ msgid "C_alendar:" +#~ msgstr "C_alendar:" + +#~ msgid "_Contacts:" +#~ msgstr "_Contacts:" + +#~ msgid "_Mail:" +#~ msgstr "_Mail:" + +#~ msgid "_Tasks:" +#~ msgstr "_Tasks:" + +#~ msgid "Folder _type:" +#~ msgstr "Folder _type:" + +#~ msgid "Open Other User's Folder" +#~ msgstr "Open Other User's Folder" + +#~ msgid "_Account:" +#~ msgstr "_Account:" + +#~ msgid "_Folder Name:" +#~ msgstr "_Folder Name:" + +#~ msgid "_User:" +#~ msgstr "_User:" + +#~ msgid "Evolution Setup Assistant" +#~ msgstr "Evolution Setup Assistant" + +#~ msgid "Importing Files" +#~ msgstr "Importing Files" + +#~ msgid "Timezone " +#~ msgstr "Timezone " + +#~ msgid "Welcome" +#~ msgstr "Welcome" + +#~ msgid "" +#~ "Welcome to Evolution. The next few screens will allow\n" +#~ "Evolution to connect to your email accounts, and to import\n" +#~ "files from other applications. \n" +#~ "\n" +#~ "Please click the \"Forward\" button to continue. " +#~ msgstr "" +#~ "Welcome to Evolution. The next few screens will allow\n" +#~ "Evolution to connect to your email accounts, and to import\n" +#~ "files from other applications. \n" +#~ "\n" +#~ "Please click the \"Forward\" button to continue. " + +#~ msgid "" +#~ "You have successfully entered all of the information\n" +#~ "needed to set up Evolution. \n" +#~ "\n" +#~ "Click the \"Apply\" button to save your settings. " +#~ msgstr "" +#~ "You have successfully entered all of the information\n" +#~ "needed to set up Evolution. \n" +#~ "\n" +#~ "Click the \"Apply\" button to save your settings. " + +#~ msgid "Insufficient disk space for upgrade." +#~ msgstr "Insufficient disk space for upgrade." + +#~ msgid "" +#~ "Upgrading your data and settings will require upto {0} of disk space, but " +#~ "you only have {1} available.\n" +#~ "\n" +#~ "You will need to make more space available in your home directory before " +#~ "you can continue." +#~ msgstr "" +#~ "Upgrading your data and settings will require upto {0} of disk space, but " +#~ "you only have {1} available.\n" +#~ "\n" +#~ "You will need to make more space available in your home directory before " +#~ "you can continue." + +#~ msgid "" +#~ "Upgrade from previous version failed:\n" +#~ "{0}" +#~ msgstr "" +#~ "Upgrade from previous version failed:\n" +#~ "{0}" + +#~ msgid "" +#~ "{1}\n" +#~ "\n" +#~ "If you choose to continue, you may not have access to some of your old " +#~ "data.\n" +#~ msgstr "" +#~ "{1}\n" +#~ "\n" +#~ "If you choose to continue, you may not have access to some of your old " +#~ "data.\n" + +#~ msgid "Continue" +#~ msgstr "Continue" + +#~ msgid "Cannot start Evolution" +#~ msgstr "Cannot start Evolution" + +#~ msgid "Evolution can not start." +#~ msgstr "Evolution can not start." + +#~ msgid "" +#~ "Your system configuration does not match your Evolution configuration.\n" +#~ "\n" +#~ "Click help for details" +#~ msgstr "" +#~ "Your system configuration does not match your Evolution configuration.\n" +#~ "\n" +#~ "Click help for details" + +#~ msgid "" +#~ "Your system configuration does not match your Evolution configuration:\n" +#~ "\n" +#~ "{0}\n" +#~ "\n" +#~ "Click help for details." +#~ msgstr "" +#~ "Your system configuration does not match your Evolution configuration:\n" +#~ "\n" +#~ "{0}\n" +#~ "\n" +#~ "Click help for details." + #~ msgid "" #~ "Some fields are no longer representable in the contact editor. Please " #~ "wait while Evolution copies those fields to the 'Notes' field..." |