aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-09-22 06:38:52 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-09-22 06:38:52 +0800
commit3bd445ce427fc38eecb060a62f6ad5733f6fedc0 (patch)
tree27bf82705c3a74a6c2ff36236bb0a718e48ac168 /po/en_GB.po
parent7474e9e5ac34bc98bab137c17f62d4da8660da4d (diff)
downloadgsoc2013-evolution-3bd445ce427fc38eecb060a62f6ad5733f6fedc0.tar
gsoc2013-evolution-3bd445ce427fc38eecb060a62f6ad5733f6fedc0.tar.gz
gsoc2013-evolution-3bd445ce427fc38eecb060a62f6ad5733f6fedc0.tar.bz2
gsoc2013-evolution-3bd445ce427fc38eecb060a62f6ad5733f6fedc0.tar.lz
gsoc2013-evolution-3bd445ce427fc38eecb060a62f6ad5733f6fedc0.tar.xz
gsoc2013-evolution-3bd445ce427fc38eecb060a62f6ad5733f6fedc0.tar.zst
gsoc2013-evolution-3bd445ce427fc38eecb060a62f6ad5733f6fedc0.zip
Sync for 0.14.
svn path=/trunk/; revision=13073
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po4157
1 files changed, 2320 insertions, 1837 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 2156265d31..8df15549cb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,11 +2,10 @@
# Copyright (C) 2000 Free Software Foundation, Inc.
# Robert Brady <rwb197@zepler.org> 2000
#
-#: mail/component-factory.c:97 mail/component-factory.c:98
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-08-22 18:50-0400\n"
+"POT-Creation-Date: 2001-09-21 18:31-0400\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
"Language-Team: \n"
@@ -22,197 +21,478 @@ msgstr ""
msgid "Imports VCard files into Evolution."
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3595
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "File As"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+msgid "Name"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+msgid "Family Name"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Email"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+msgid "Primary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+msgid "Prim"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/contact-editor/e-contact-editor.c:1594
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+msgid "Business"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+msgid "Bus"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+msgid "Callback"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+msgid "Company"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#, fuzzy
+msgid "Comp"
+msgstr "Colours"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1663
+msgid "Home"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+msgid "Org"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+msgid "Mobile"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+msgid "Car"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1597
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Business Fax"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+msgid "Bus Fax"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Home Fax"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+msgid "Business 2"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+msgid "Bus 2"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+msgid "Home 2"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "ISDN"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/contact-editor/e-contact-editor.c:1606
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: mail/mail-config.glade.h:51
+msgid "Other"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+msgid "Other Fax"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Pager"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Radio"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1611
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+msgid "Telex"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "TTY"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1637
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1638
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Email 3"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Web Site"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Url"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Department"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Dep"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Office"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+msgid "Off"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Title"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Profession"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+msgid "Prof"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Manager"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+msgid "Man"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Ass"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Nickname"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+msgid "Nick"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Spouse"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Note"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "Calendar URI"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "CALUri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Free-busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "FBUrl"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "Anniversary"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Birth Date"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:103
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3564
msgid "Card: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3597
+#: addressbook/backend/ebook/e-card.c:3566
msgid ""
"\n"
"Name: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3567
msgid ""
"\n"
" Prefix: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3568
msgid ""
"\n"
" Given: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3569
msgid ""
"\n"
" Additional: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3570
msgid ""
"\n"
" Family: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3571
msgid ""
"\n"
" Suffix: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3616
+#: addressbook/backend/ebook/e-card.c:3585
msgid ""
"\n"
"Birth Date: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3596
msgid ""
"\n"
"Address:"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3598
msgid ""
"\n"
" Postal Box: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3599
msgid ""
"\n"
" Ext: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3600
msgid ""
"\n"
" Street: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3601
msgid ""
"\n"
" City: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3602
msgid ""
"\n"
" Region: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3603
msgid ""
"\n"
" Postal Code: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3604
msgid ""
"\n"
" Country: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3617
msgid ""
"\n"
"Delivery Label: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3629
msgid ""
"\n"
"Telephones:\n"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3632
msgid ""
"\n"
"Telephone:"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3656
msgid ""
"\n"
"E-mail:\n"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3659
msgid ""
"\n"
"E-mail:"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3678
msgid ""
"\n"
"Mailer: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3684
msgid ""
"\n"
"Time Zone: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3723
+#: addressbook/backend/ebook/e-card.c:3692
msgid ""
"\n"
"Geo Location: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3727
+#: addressbook/backend/ebook/e-card.c:3696
msgid ""
"\n"
"Business Role: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3739
+#: addressbook/backend/ebook/e-card.c:3708
msgid ""
"\n"
"Org: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3709
msgid ""
"\n"
" Name: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3710
msgid ""
"\n"
" Unit: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3711
msgid ""
"\n"
" Unit2: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3712
msgid ""
"\n"
" Unit3: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3713
msgid ""
"\n"
" Unit4: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3717
msgid ""
"\n"
"Categories: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3718
msgid ""
"\n"
"Comment: "
@@ -228,23 +508,23 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3762
+#: addressbook/backend/ebook/e-card.c:3731
msgid ""
"\n"
"Unique String: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3734
msgid ""
"\n"
"Public Key: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:4087
msgid "Multiple VCards"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:4045
+#: addressbook/backend/ebook/e-card.c:4095
#, c-format
msgid "VCard for %s"
msgstr ""
@@ -253,36 +533,82 @@ msgstr ""
#: addressbook/backend/ebook/load-pine-addressbook.c:22
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/conduit/address-conduit.c:1119
#: addressbook/gui/component/addressbook-factory.c:48
#: calendar/conduits/calendar/calendar-conduit.c:1204
#: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
-#: addressbook/conduit/address-conduit.c:201
+#: addressbook/backend/pas/pas-backend-file.c:257
+#: addressbook/backend/pas/pas-backend-ldap.c:2047
+msgid "Searching..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-file.c:259
+msgid "Loading..."
+msgstr ""
+
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:268
+msgid "Error in search expression."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:467
+msgid "Connecting to LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:477
+msgid "Unable to connect to LDAP server."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:493
+msgid "Waiting for connection to LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:862
+msgid "Adding card to LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:959
+msgid "Removing card from LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1064
+msgid "Modifying card from LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1992
+msgid "Receiving LDAP search results..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1997
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:204
msgid "Cursor could not be loaded\n"
msgstr ""
-#: addressbook/conduit/address-conduit.c:214
+#: addressbook/conduit/address-conduit.c:217
msgid "EBook not loaded\n"
msgstr ""
-#: addressbook/conduit/address-conduit.c:662
+#: addressbook/conduit/address-conduit.c:681
#: calendar/conduits/calendar/calendar-conduit.c:778
#: calendar/conduits/todo/todo-conduit.c:592
msgid "Could not start wombat server"
msgstr ""
-#: addressbook/conduit/address-conduit.c:663
+#: addressbook/conduit/address-conduit.c:682
#: calendar/conduits/calendar/calendar-conduit.c:779
#: calendar/conduits/todo/todo-conduit.c:593
msgid "Could not start wombat"
msgstr ""
-#: addressbook/conduit/address-conduit.c:695
-#: addressbook/conduit/address-conduit.c:698
+#: addressbook/conduit/address-conduit.c:714
+#: addressbook/conduit/address-conduit.c:717
msgid "Could not read pilot's Address application block"
msgstr ""
@@ -324,25 +650,28 @@ msgid "Factory for the Addressbook's address popup"
msgstr ""
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
msgid "Factory for the sample Addressbook control"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1048
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1062
msgid "Contacts"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
msgid "Folder containing contact information"
msgstr ""
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "LDAP Server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:68
+msgid "LDAP server containing contact information"
+msgstr ""
+
#: addressbook/gui/component/addressbook-component.c:386
#: ui/evolution-addressbook.xml.h:11
msgid "New Contact"
@@ -360,7 +689,7 @@ msgstr ""
msgid "New Contact _List"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:188
msgid "Edit Addressbook"
msgstr ""
@@ -389,7 +718,7 @@ msgid "Base"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:151
+#: calendar/gui/dialogs/task-editor.c:172
msgid "Basic"
msgstr ""
@@ -456,19 +785,20 @@ msgid "_Account name:"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
msgid "_Add"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:23
#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:48
#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:36
+#: ui/evolution-tasks.xml.h:16
msgid "_Edit"
msgstr ""
@@ -484,39 +814,39 @@ msgstr ""
msgid "_Server name:"
msgstr ""
-#: addressbook/gui/component/addressbook-storage.c:138
+#: addressbook/gui/component/addressbook-storage.c:163
msgid "Other Contacts"
msgstr ""
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:393
#, c-format
msgid "Please enter your email address and password for access to %s"
msgstr ""
-#: addressbook/gui/component/addressbook.c:394
+#: addressbook/gui/component/addressbook.c:401
msgid "LDAP Authentication"
msgstr ""
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
msgid "Email Address:"
msgstr ""
-#: addressbook/gui/component/addressbook.c:418
+#: addressbook/gui/component/addressbook.c:425
msgid "Password:"
msgstr ""
-#: addressbook/gui/component/addressbook.c:481
+#: addressbook/gui/component/addressbook.c:488
msgid "Unable to open addressbook"
msgstr ""
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:495
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
"is down"
msgstr ""
-#: addressbook/gui/component/addressbook.c:493
+#: addressbook/gui/component/addressbook.c:500
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -524,43 +854,43 @@ msgid ""
"retrieving OpenLDAP from the link below.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:508
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
msgstr ""
-#: addressbook/gui/component/addressbook.c:642
+#: addressbook/gui/component/addressbook.c:649
#: calendar/gui/cal-search-bar.c:55
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:650
msgid "Name contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:651
msgid "Email contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:645
+#: addressbook/gui/component/addressbook.c:652
#: calendar/gui/cal-search-bar.c:59
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
#: widgets/misc/e-filter-bar.h:104
msgid "Advanced..."
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:874
+#: addressbook/gui/component/addressbook.c:883
#: calendar/gui/cal-search-bar.c:412
msgid "Any Category"
msgstr ""
-#: addressbook/gui/component/addressbook.c:912
+#: addressbook/gui/component/addressbook.c:925
msgid "The URI that the Folder Browser will display"
msgstr ""
@@ -574,23 +904,11 @@ msgid "(none)"
msgstr ""
#: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
msgid "Primary Email"
msgstr ""
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:860
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-msgid "Email 3"
-msgstr ""
-
#: addressbook/gui/component/e-address-popup.c:579
msgid "Select an Action"
msgstr ""
@@ -611,13 +929,13 @@ msgstr ""
#: addressbook/gui/component/e-address-popup.c:934
#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+#: addressbook/gui/component/select-names/e-select-names-popup.c:307
msgid "Edit Contact Info"
msgstr ""
#: addressbook/gui/component/e-address-popup.c:963
#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+#: addressbook/gui/component/select-names/e-select-names-popup.c:486
msgid "Add to Contacts"
msgstr ""
@@ -641,31 +959,48 @@ msgstr ""
msgid "Factory for the Addressbook's name selection interface"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:729
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
-#: shell/e-shortcuts-view.c:385
+#: addressbook/gui/component/select-names/e-select-names-popup.c:164
+#: addressbook/gui/component/select-names/e-select-names.c:764
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:436
+#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
msgid "Remove"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#: addressbook/gui/component/select-names/e-select-names-popup.c:179
msgid "Remove All"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:203
msgid "Send HTML Mail?"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+msgid "Edit Contact List"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+msgid "Unnamed Contact List"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#, c-format
+msgid "(%d not shown)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:507
msgid "Unnamed Contact"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:487
-msgid "Unable to get local storage. This should never happen."
+#: addressbook/gui/component/select-names/e-select-names.c:521
+msgid ""
+"Evolution is unable to get the addressbook local storage. This may have been "
+"caused by the evolution-addressbook component crashing. To help us better "
+"understand and ultimately resolve this problem, please send an e-mail to Jon "
+"Trowbridge <trow@ximian.com> with a detailed description of the "
+"circumstances under which this error occurred. Thank you."
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:598
msgid "Select Contacts from Addressbook"
msgstr ""
@@ -720,237 +1055,173 @@ msgid "Ca_tegories..."
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "Contact Editor"
+msgid "Collaboration"
msgstr ""
+#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:156
-msgid "Details"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+msgid "Contact Editor"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "File A_s:"
+#: calendar/gui/dialogs/task-editor.c:177
+msgid "Details"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "General"
+msgid "File A_s:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "New phone type"
+msgid "General"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "No_tes:"
+msgid "New phone type"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "No_tes:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
#, fuzzy
msgid "Organi_zation:"
msgstr "Organisation:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
msgid "Phone Types"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
msgid "Wants to receive _HTML mail"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
msgid "_Address..."
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
msgid "_Assistant's name:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
msgid "_Birthday:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "_Business"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "_Calendar Information:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
#: calendar/gui/dialogs/event-page.glade.h:12
#: calendar/gui/dialogs/task-page.glade.h:10
msgid "_Contacts..."
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
+#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
msgid "_Delete"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
msgid "_Department:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Free/Busy Information:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Full Name..."
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "_Home"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "_Job title:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "_Manager's Name:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Mobile"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Nickname:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Office:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_Profession:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_Spouse:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_This is the mailing address"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "_Web page address:"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:730
-msgid "This contact belongs to these categories:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
-#: addressbook/gui/widgets/e-addressbook-view.c:868
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
-msgid "Business"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
-msgid "Business 2"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:848
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-msgid "Callback"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
-msgid "Car"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-msgid "Company"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-msgid "Home"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-msgid "Home 2"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
-#: addressbook/gui/widgets/e-addressbook-view.c:849
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-msgid "Mobile"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: mail/mail-config.glade.h:51
-msgid "Other"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
-#: addressbook/gui/widgets/e-addressbook-view.c:854
-msgid "Other Fax"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: addressbook/gui/widgets/e-addressbook-view.c:855
-msgid "Pager"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
-msgid "Primary"
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: addressbook/gui/widgets/e-addressbook-view.c:856
-msgid "Radio"
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+msgid "Delete Contact?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1578
-#: addressbook/gui/widgets/e-addressbook-view.c:857
-msgid "Telex"
+#: addressbook/gui/contact-editor/e-contact-editor.c:759
+msgid "This contact belongs to these categories:"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1612
msgid "TTY/TDD"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#: addressbook/gui/contact-editor/e-contact-editor.c:2234
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
msgid "Contact Quick-Add"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
msgid "Edit Full"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/widgets/e-addressbook-view.c:869
msgid "Full Name"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
msgid "E-mail"
msgstr ""
@@ -2069,159 +2340,64 @@ msgid "Advanced Search"
msgstr ""
#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:260
+#: mail/mail-search.c:264
msgid "Search"
msgstr ""
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
+#: addressbook/gui/widgets/e-addressbook-model.c:121
+msgid "No cards"
msgstr ""
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
+#: addressbook/gui/widgets/e-addressbook-model.c:124
+msgid "1 card"
msgstr ""
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
+#: addressbook/gui/widgets/e-addressbook-model.c:127
+#, c-format
+msgid "%d cards"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:655
-#: addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1373
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
-#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: ui/evolution-message-composer.xml.h:13
msgid "Open"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:754
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:755
msgid "Send Message to Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:756
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
#: ui/my-evolution.xml.h:2
msgid "Print"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
+#: addressbook/gui/widgets/e-addressbook-view.c:758
msgid "Print Envelope"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
#: ui/evolution-tasks.xml.h:8
@@ -2230,7 +2406,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:451
+#: addressbook/gui/widgets/e-minicard.c:452
msgid "Error modifying card"
msgstr ""
@@ -2239,7 +2415,7 @@ msgid "Success"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
#: shell/e-storage.c:515
msgid "Unknown error"
msgstr ""
@@ -2265,10 +2441,10 @@ msgid "Protocol not supported"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
-#: camel/camel-service.c:581
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
+#: camel/camel-service.c:580
msgid "Cancelled"
msgstr ""
@@ -2293,134 +2469,85 @@ msgid "Error removing list"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1218
+#: addressbook/gui/widgets/e-addressbook-view.c:1248
msgid "Error removing card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-msgid "* Click here to add a contact *"
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:399
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-msgid "File As"
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:404
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Email"
+#: addressbook/gui/widgets/e-addressbook-view.c:867
+msgid "* Click here to add a contact *"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:837
+#: addressbook/gui/widgets/e-addressbook-view.c:871
msgid "Primary Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:872
msgid "Assistant Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:873
msgid "Business Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:874
msgid "Callback Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:875
msgid "Company Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: addressbook/gui/widgets/e-addressbook-view.c:876
msgid "Home Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:878
msgid "Business Address"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:879
msgid "Home Address"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:880
msgid "Mobile Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:847
+#: addressbook/gui/widgets/e-addressbook-view.c:881
msgid "Car Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:884
msgid "Business Phone 2"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:885
msgid "Home Phone 2"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:887
msgid "Other Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:858
-msgid "TTY"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:893
msgid "Other Address"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:862
-msgid "Web Site"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:863
-msgid "Department"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:864
-msgid "Office"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:865
-msgid "Title"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:866
-msgid "Profession"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:867
-msgid "Manager"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:869
-msgid "Nickname"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:870
-msgid "Spouse"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:871
-msgid "Note"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:872
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1215
-msgid "Done."
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1247
-msgid "Removing cards..."
-msgstr ""
-
#: addressbook/gui/widgets/e-minicard-control.c:283
msgid "Save in addressbook"
msgstr ""
@@ -2607,12 +2734,12 @@ msgstr ""
msgid "_Font..."
msgstr ""
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1092
msgid "Print cards"
msgstr ""
-#: addressbook/printing/e-contact-print.c:1111
-#: addressbook/printing/e-contact-print.c:1133
+#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1134
msgid "Print card"
msgstr ""
@@ -2660,22 +2787,22 @@ msgstr "Cannot initialise Evolution's mail component."
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
#, fuzzy
-msgid "Factory for the Evolution calendar component."
+msgid "Factory for the calendar iTip view control"
msgstr "Cannot initialise Evolution's mail component."
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
#, fuzzy
-msgid "Factory for the calendar iTip view control"
+msgid "Factory for the sample Calendar control"
msgstr "Cannot initialise Evolution's mail component."
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
#, fuzzy
-msgid "Factory for the sample Calendar control"
+msgid "Factory to centralize calendar component editor dialogs"
msgstr "Cannot initialise Evolution's mail component."
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
#, fuzzy
-msgid "Factory to centralize calendar component editor dialogs"
+msgid "Factory to create a component editor factory"
msgstr "Cannot initialise Evolution's mail component."
#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
@@ -2746,70 +2873,61 @@ msgstr ""
msgid "_Edit appointment"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:487
+#: calendar/gui/alarm-notify/alarm-queue.c:629
msgid "No description available."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:700
-#: calendar/gui/alarm-notify/alarm-queue.c:999
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:991
-msgid "Snooze"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1004
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
-msgid "Ok"
+#: calendar/gui/alarm-notify/alarm-queue.c:689
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email. Evolution will display\n"
+"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:58
+#: calendar/gui/alarm-notify/alarm-queue.c:740
#, c-format
msgid ""
-"It is %s. The Unix time is %ld right now. We just thought you may like to "
-"know."
+"An Evolution Calendar reminder is about to trigger.\n"
+"This reminder is configured to run the following program:\n"
+"\n"
+" %s\n"
+"\n"
+"Are you sure you want to run this program?"
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
#, fuzzy
msgid "Could not initialize GNOME"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
+#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
#, fuzzy
msgid "Could not initialize gnome-vfs"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/alarm-notify/notify-main.c:115
+#: calendar/gui/alarm-notify/notify-main.c:90
msgid "Could not create the alarm notify service factory"
msgstr ""
-#: calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:439
msgid "%A %d %B %Y"
msgstr ""
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
msgid "%a %d %b"
msgstr ""
-#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:451
msgid "%a %d %b %Y"
msgstr ""
-#: calendar/gui/calendar-commands.c:435
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
#, fuzzy
msgid "%d %B %Y"
msgstr "%m/%d/%Y"
@@ -2817,107 +2935,107 @@ msgstr "%m/%d/%Y"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:442
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
+#: calendar/gui/calendar-commands.c:467
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
msgid "%d %B"
msgstr ""
-#: calendar/gui/calendar-commands.c:604
+#: calendar/gui/calendar-commands.c:677
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
#: calendar/gui/e-calendar-table.c:307
msgid "Private"
msgstr ""
-#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
#: calendar/gui/e-calendar-table.c:308
msgid "Confidential"
msgstr ""
-#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
msgid "Public"
msgstr ""
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
msgid "N"
msgstr ""
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
msgid "S"
msgstr ""
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
msgid "E"
msgstr ""
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
msgid "W"
msgstr ""
-#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
msgid "High"
msgstr ""
-#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
-#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1700
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
msgid "Normal"
msgstr ""
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
msgid "Low"
msgstr ""
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
#: calendar/gui/e-calendar-table.c:380
msgid "Free"
msgstr ""
-#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-meeting-time-sel.c:393
msgid "Busy"
msgstr ""
-#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
#: calendar/gui/dialogs/task-details-page.glade.h:10
#: calendar/gui/e-calendar-table.c:401
msgid "Not Started"
msgstr ""
-#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:402
msgid "In Progress"
msgstr ""
-#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321
msgid "Completed"
msgstr ""
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
+#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:354
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
+#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:363
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %d/%m/%Y %I:%M:%S %p"
-#: calendar/gui/calendar-model.c:847
+#: calendar/gui/calendar-model.c:923
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -2925,56 +3043,55 @@ msgid ""
"%s"
msgstr ""
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1087
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
"45.436845,125.862501"
msgstr ""
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1127
msgid "The percent value must be between 0 and 100, inclusive"
msgstr ""
-#: calendar/gui/calendar-model.c:1092
+#: calendar/gui/calendar-model.c:1168
msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
msgstr ""
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1181
#: calendar/gui/dialogs/task-details-page.glade.h:13
#: calendar/gui/e-calendar-table.c:331
msgid "Undefined"
msgstr ""
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
-#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:49
#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
msgid "None"
msgstr ""
-#: calendar/gui/calendar-model.c:1626
+#: calendar/gui/calendar-model.c:1702
msgid "Recurring"
msgstr ""
-#: calendar/gui/calendar-model.c:1628
+#: calendar/gui/calendar-model.c:1704
msgid "Assigned"
msgstr ""
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
+#: calendar/gui/e-meeting-model.c:702
msgid "Yes"
msgstr ""
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/e-meeting-model.c:703
msgid "No"
msgstr ""
@@ -3006,44 +3123,44 @@ msgstr ""
msgid "Comment contains"
msgstr ""
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
msgid "Unmatched"
msgstr ""
-#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
msgid "Calendar"
msgstr ""
-#: calendar/gui/component-factory.c:55
+#: calendar/gui/component-factory.c:63
msgid "Folder containing appointments and events"
msgstr ""
-#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
-#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
+#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
#: views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr ""
-#: calendar/gui/component-factory.c:56
+#: calendar/gui/component-factory.c:68
msgid "Folder containing to-do items"
msgstr ""
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
msgid "Create a new appointment"
msgstr ""
-#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
msgid "New _Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
#: ui/evolution-tasks.xml.h:5
msgid "Create a new task"
msgstr ""
-#: calendar/gui/component-factory.c:409
+#: calendar/gui/component-factory.c:600
msgid "New _Task"
msgstr ""
@@ -3051,23 +3168,23 @@ msgstr ""
msgid "The URI that the calendar will display"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:357
+#: calendar/gui/dialogs/alarm-options.c:359
msgid "Audio Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:366
+#: calendar/gui/dialogs/alarm-options.c:368
msgid "Message Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:375
+#: calendar/gui/dialogs/alarm-options.c:377
msgid "Mail Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:384
+#: calendar/gui/dialogs/alarm-options.c:386
msgid "Program Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:393
+#: calendar/gui/dialogs/alarm-options.c:395
msgid "Unknown Alarm Options"
msgstr ""
@@ -3076,23 +3193,25 @@ msgid "Alarm Repeat"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "FIXME: mail alarm options"
+msgid "Message to Display"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display"
+msgid "Play sound:"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Play sound:"
+msgid "Repeat the alarm"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Repeat the alarm"
+msgid "Run program:"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Run program:"
+msgid ""
+"This is an email reminder, but Evolution does not yet support this kind of "
+"reminders. You will not be able to edit the options for this reminder."
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:7
@@ -3115,95 +3234,92 @@ msgstr ""
msgid "minutes"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:303
#, c-format
msgid "%d days"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:305
msgid "1 day"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:308
#, c-format
msgid "%d weeks"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:310
msgid "1 week"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:313
#, c-format
msgid "%d hours"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:315
msgid "1 hour"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:347
+#: calendar/gui/dialogs/alarm-page.c:318
#, c-format
msgid "%d minutes"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:320
msgid "1 minute"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:323
#, c-format
msgid "%d seconds"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:325
msgid "1 second"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:350
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:354
#: calendar/gui/dialogs/alarm-page.glade.h:3
msgid "Display a message"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:358
msgid "Send an email"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:362
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
#: camel/providers/smtp/camel-smtp-transport.c:224
#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
msgid "Unknown"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:380
msgid "before start of appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:383
msgid "after start of appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:422
+#: calendar/gui/dialogs/alarm-page.c:393
msgid "before end of appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:425
+#: calendar/gui/dialogs/alarm-page.c:396
msgid "after end of appointment"
msgstr ""
@@ -3221,42 +3337,43 @@ msgstr ""
msgid "Reminders"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
#: calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
msgid "_Options..."
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
msgid "after"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
msgid "before"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
#: calendar/gui/dialogs/recurrence-page.glade.h:14
msgid "day(s)"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
msgid "end of appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:15
msgid "hour(s)"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
msgid "minute(s)"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:17
msgid "start of appointment"
msgstr ""
@@ -3306,7 +3423,7 @@ msgid "First day of wee_k:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:955
msgid "Friday"
msgstr ""
@@ -3319,7 +3436,7 @@ msgid "Minutes"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:951
msgid "Monday"
msgstr ""
@@ -3328,7 +3445,7 @@ msgid "O_verdue tasks:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:970
+#: calendar/gui/dialogs/recurrence-page.c:956
msgid "Saturday"
msgstr ""
@@ -3349,7 +3466,7 @@ msgid "Su_n"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:957
msgid "Sunday"
msgstr ""
@@ -3367,7 +3484,7 @@ msgid "Tas_ks due today:"
msgstr "Colours for display"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:954
msgid "Thursday"
msgstr ""
@@ -3388,12 +3505,12 @@ msgid "Time format:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:952
msgid "Tuesday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:953
msgid "Wednesday"
msgstr ""
@@ -3522,108 +3639,108 @@ msgstr ""
msgid "%s You have made no changes, update the editor?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
msgid " to "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
msgid " (Completed "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
msgid "Completed "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
msgid " (Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
msgid "Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:515
msgid "Edit Appointment"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:520
#, c-format
msgid "Appointment - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:523
#, c-format
msgid "Task - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:526
#, c-format
msgid "Journal entry - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:487
+#: calendar/gui/dialogs/comp-editor.c:540
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:99
+#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: mail/mail-display.c:100
msgid "Overwrite file?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
-#: mail/mail-display.c:103
+#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: mail/mail-display.c:104
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
#: widgets/misc/e-filter-bar.h:101
msgid "Save As..."
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1077
+#: calendar/gui/dialogs/comp-editor.c:1170
msgid "Unable to obtain current version!"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:90
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:87
+#: calendar/gui/dialogs/delete-comp.c:93
msgid "Are you sure you want to delete this untitled appointment?"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:99
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/delete-comp.c:102
msgid "Are you sure you want to delete this untitled task?"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:108
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:111
msgid "Are you sure want to delete this untitled journal entry?"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:120
+#: calendar/gui/dialogs/delete-comp.c:126
#, c-format
msgid "Are you sure you want to delete %d appointments?"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:125
+#: calendar/gui/dialogs/delete-comp.c:131
#, c-format
msgid "Are you sure you want to delete %d tasks?"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:130
+#: calendar/gui/dialogs/delete-comp.c:136
#, c-format
msgid "Are you sure you want to delete %d journal entries?"
msgstr ""
@@ -3640,20 +3757,25 @@ msgstr ""
msgid "Enter Delegate"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:156
+#: calendar/gui/dialogs/event-editor.c:181
msgid "Appointment"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:161
+#: calendar/gui/dialogs/event-editor.c:186
msgid "Reminder"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:191
msgid "Recurrence"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:171
-#: calendar/gui/dialogs/event-editor.c:273
+#: calendar/gui/dialogs/event-editor.c:198
+#: calendar/gui/dialogs/event-editor.c:345
+msgid "Scheduling"
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:203
+#: calendar/gui/dialogs/event-editor.c:348
msgid "Meeting"
msgstr ""
@@ -3695,7 +3817,7 @@ msgid "Pu_blic"
msgstr ""
#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
msgid "Show Time As"
msgstr ""
@@ -3712,166 +3834,94 @@ msgstr ""
msgid "_Start time:"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
-msgid "Individual"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
-msgid "Group"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
-msgid "Resource"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
-msgid "Room"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
-msgid "Required Participant"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
-msgid "Needs Action"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
-msgid "Accepted"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
-msgid "Declined"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
-msgid "Delegated"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
-msgid "In Process"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:504
msgid "That person is already attending the meeting!"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:548
+#: calendar/gui/dialogs/meeting-page.c:583
msgid "Chair Persons"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
+#: calendar/gui/dialogs/meeting-page.c:550
+#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:703
msgid "Required Participants"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:552
+#: calendar/gui/dialogs/meeting-page.c:583
msgid "Optional Participants"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:554
+#: calendar/gui/dialogs/meeting-page.c:583
msgid "Non-Participants"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:661
msgid "Sent By:"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:829
msgid "_Delegate To..."
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:2
-msgid "Common Name"
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:3
-msgid "Delegated From"
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:4
-msgid "Delegated To"
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:5
-msgid "Language"
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:6
-msgid "Member"
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:7
-msgid "RSVP"
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-msgid "Role"
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
#: mail/message-list.etspec.h:8
msgid "Status"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr ""
@@ -3896,32 +3946,32 @@ msgstr ""
msgid "_Other Organizer"
msgstr "Organisation:"
-#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
-#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
msgid "%a %b %d %Y"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:584
+#: calendar/gui/dialogs/recurrence-page.c:570
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:938
+#: calendar/gui/dialogs/recurrence-page.c:924
msgid "on"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:950 filter/filter-datespec.c:83
msgid "day"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1080
msgid "on the"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1088
msgid "th"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1261
msgid "occurrences"
msgstr ""
@@ -4016,7 +4066,7 @@ msgid "Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:897
+#: my-evolution/e-summary-preferences.c:910
msgid "URL:"
msgstr ""
@@ -4028,8 +4078,8 @@ msgstr ""
msgid "_Status:"
msgstr ""
-#: calendar/gui/dialogs/task-editor.c:161
-#: calendar/gui/dialogs/task-editor.c:239
+#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:285
msgid "Assignment"
msgstr ""
@@ -4106,29 +4156,30 @@ msgstr ""
msgid "100%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
+#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: shell/e-shortcuts-view.c:385
msgid "_Open"
msgstr ""
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
+#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr ""
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:14
msgid "_Copy"
msgstr ""
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
+#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
+#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
msgid "_Paste"
msgstr ""
@@ -4149,6 +4200,7 @@ msgid "_Delete Selected Tasks"
msgstr ""
#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr ""
@@ -4156,52 +4208,48 @@ msgstr ""
msgid "Alarms"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
-#: camel/camel-filter-driver.c:815
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
+#: camel/camel-filter-driver.c:819
msgid "Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
msgid "Completion Date"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
msgid "Due Date"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
msgid "End Date"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
msgid "Geographical Position"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
msgid "Priority"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
msgid "Start Date"
msgstr ""
#. FIXME: Inbox shortcut should point to something else for
#. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
-#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
msgid "Summary"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
msgid "Task sort"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
msgid "URL"
msgstr ""
@@ -4212,236 +4260,289 @@ msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
msgid "%A %d %B"
msgstr ""
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
#: calendar/gui/e-week-view-main-item.c:348
msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
-#: calendar/gui/print.c:759
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
+#: calendar/gui/print.c:765
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
-#: calendar/gui/print.c:761
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
+#: calendar/gui/print.c:767
msgid "pm"
msgstr ""
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
#: ui/evolution-calendar.xml.h:17
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
msgid "_Delete this Appointment"
msgstr ""
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
msgid "Make this Occurrence _Movable"
msgstr ""
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
msgid "Delete _All Occurrences"
msgstr ""
-#: calendar/gui/e-itip-control.c:617
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:649
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:664
+#, c-format
+msgid "<b>Summary:</b> %s<br><br>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:664
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:674
+#, c-format
+msgid "<b>Description:</b> %s"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:710
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:711
msgid "Meeting Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:715
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:716
msgid "Meeting Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:627
+#: calendar/gui/e-itip-control.c:720
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:721
msgid "Meeting Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:725
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:726
msgid "Meeting Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:730
#, c-format
-msgid "<b>%s</b> has replyed to a meeting request."
+msgid "<b>%s</b> has replied to a meeting request."
msgstr ""
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:731
msgid "Meeting Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:735
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:736
msgid "Meeting Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:821
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:741
msgid "Bad Meeting Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:758
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:666
+#: calendar/gui/e-itip-control.c:759
msgid "Task Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:763
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:764
msgid "Task Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:768
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:769
msgid "Task Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:773
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:681
+#: calendar/gui/e-itip-control.c:774
msgid "Task Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:778
#, c-format
-msgid "<b>%s</b> has replyed to a task assignment."
+msgid "<b>%s</b> has replied to a task assignment."
msgstr ""
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:779
msgid "Task Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:783
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:784
msgid "Task Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:789
msgid "Bad Task Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:713
+#: calendar/gui/e-itip-control.c:806
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:714
+#: calendar/gui/e-itip-control.c:807
msgid "Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:811
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:812
msgid "Free/Busy Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:816
#, c-format
-msgid "<b>%s</b> has replyed to a free/busy request."
+msgid "<b>%s</b> has replied to a free/busy request."
msgstr ""
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:817
msgid "Free/Busy Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:822
msgid "Bad Free/Busy Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:940
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/e-itip-control.c:889
+msgid "The message does not appear to be properly formed"
msgstr ""
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:908
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1061
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1063
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1107
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1115
+msgid "Attendee status ould not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1117
+msgid "Attendee status updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1119
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1147
msgid "I couldn't remove the item from your calendar file!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1149
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
msgid "The item could not be sent!\n"
msgstr ""
+#: calendar/gui/e-itip-control.c:1380
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr ""
+
#: calendar/gui/e-itip-control.glade.h:2
#, no-c-format
msgid "%P %%"
@@ -4479,6 +4580,161 @@ msgstr ""
msgid "date-start"
msgstr ""
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:502 calendar/gui/e-meeting-model.c:670
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:671
+msgid "Group"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
+#: calendar/gui/e-meeting-model.c:672
+msgid "Resource"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:673
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:686
+msgid "Chair"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:504 calendar/gui/e-meeting-model.c:687
+msgid "Required Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:688
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:689
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:288 calendar/gui/e-meeting-model.c:311
+#: calendar/gui/e-meeting-model.c:512 calendar/gui/e-meeting-model.c:715
+msgid "Needs Action"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:716
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:717
+msgid "Declined"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:718 calendar/gui/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#: calendar/gui/e-meeting-model.c:719
+msgid "Delegated"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+msgid "In Process"
+msgstr ""
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:1936
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:345
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:394
+msgid "Out of Office"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:395
+msgid "No Information"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:411
+msgid "_Invite Others..."
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:431
+msgid "_Options"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:448
+msgid "Show _Only Working Hours"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:479
+msgid "_Update Free/Busy"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:497
+msgid "_<<"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:514
+msgid "_Autopick"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:528
+msgid ">_>"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:545
+msgid "_All People and Resources"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:558
+msgid "All _People and One Resource"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:571
+msgid "_Required People"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:584
+msgid "Required People and _One Resource"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:607
+msgid "Meeting _start time:"
+msgstr ""
+
+#: calendar/gui/e-meeting-time-sel.c:626
+msgid "Meeting _end time:"
+msgstr ""
+
#: calendar/gui/e-tasks.c:349
#, c-format
msgid "Could not load the tasks in `%s'"
@@ -4489,16 +4745,16 @@ msgstr ""
msgid "The method required to load `%s' is not supported"
msgstr ""
-#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/gnome-cal.c:1260
+#: calendar/gui/gnome-cal.c:1318
#, c-format
msgid "Could not open the folder in `%s'"
msgstr ""
-#: calendar/gui/gnome-cal.c:1271
+#: calendar/gui/gnome-cal.c:1329
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr ""
@@ -4559,205 +4815,210 @@ msgstr ""
msgid "September"
msgstr ""
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:274
msgid "An organizer must be set."
msgstr ""
-#: calendar/gui/print.c:422
+#: calendar/gui/main.c:92
+#, fuzzy
+msgid "Could not create the component editor factory"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/print.c:423
msgid "1st"
msgstr ""
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
msgid "2nd"
msgstr ""
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
msgid "3rd"
msgstr ""
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
msgid "4th"
msgstr ""
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
msgid "5th"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "6th"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "7th"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "8th"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "9th"
msgstr ""
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "10th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "11th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "12th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "13th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "14th"
msgstr ""
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "15th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "16th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "17th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "18th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "19th"
msgstr ""
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "20th"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "21st"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "22nd"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "23rd"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "24th"
msgstr ""
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "25th"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "26th"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "27th"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "28th"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "29th"
msgstr ""
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "30th"
msgstr ""
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:429
msgid "31st"
msgstr ""
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
msgid "Su"
msgstr ""
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
msgid "Mo"
msgstr ""
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
msgid "Tu"
msgstr ""
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
msgid "We"
msgstr ""
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
msgid "Th"
msgstr ""
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
msgid "Fr"
msgstr ""
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
msgid "Sa"
msgstr ""
#. Day
-#: calendar/gui/print.c:1815
+#: calendar/gui/print.c:1827
msgid "Selected day (%a %b %d %Y)"
msgstr ""
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
msgid "%a %b %d"
msgstr ""
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1847
msgid "%a %d %Y"
msgstr ""
-#: calendar/gui/print.c:1846
+#: calendar/gui/print.c:1858
#, c-format
msgid "Selected week (%s - %s)"
msgstr ""
#. Month
-#: calendar/gui/print.c:1854
+#: calendar/gui/print.c:1866
msgid "Selected month (%b %Y)"
msgstr ""
#. Year
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1873
msgid "Selected year (%Y)"
msgstr ""
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2214
msgid "Print Calendar"
msgstr ""
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
+#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
msgid "Print Preview"
msgstr ""
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2331
msgid "Print Item"
msgstr ""
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2412
msgid "Print Setup"
msgstr ""
@@ -4797,99 +5058,107 @@ msgstr ""
msgid "SMTWTFS"
msgstr ""
-#: calendar/pcs/query.c:218
+#: calendar/pcs/query.c:230
msgid "time-now expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:242
+#: calendar/pcs/query.c:254
msgid "make-time expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:259
msgid "make-time expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:267
msgid "make-time argument 1 must be an ISO 8601 date/time string"
msgstr ""
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:296
msgid "time-add-day expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:289
+#: calendar/pcs/query.c:301
msgid "time-add-day expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:296
+#: calendar/pcs/query.c:308
msgid "time-add-day expects argument 2 to be an integer"
msgstr ""
-#: calendar/pcs/query.c:323
+#: calendar/pcs/query.c:335
msgid "time-day-begin expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:328
+#: calendar/pcs/query.c:340
msgid "time-day-begin expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:355
+#: calendar/pcs/query.c:367
msgid "time-day-end expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:372
msgid "time-day-end expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:396
+#: calendar/pcs/query.c:408
msgid "get-vtype expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:492
+#: calendar/pcs/query.c:504
msgid "occur-in-time-range? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:497
+#: calendar/pcs/query.c:509
msgid "occur-in-time-range? expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:504
+#: calendar/pcs/query.c:516
msgid "occur-in-time-range? expects argument 2 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:634
+#: calendar/pcs/query.c:646
msgid "contains? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:639
+#: calendar/pcs/query.c:651
msgid "contains? expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:658
msgid "contains? expects argument 2 to be a string"
msgstr ""
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:675
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
"\""
msgstr ""
-#: calendar/pcs/query.c:705
+#: calendar/pcs/query.c:717
msgid "has-categories? expects at least 1 argument"
msgstr ""
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:729
msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
msgstr ""
-#: calendar/pcs/query.c:805
+#: calendar/pcs/query.c:817
msgid "is-completed? expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:1008
+#: calendar/pcs/query.c:862
+msgid "completed-before? expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:867
+msgid "completed-before? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:1155
msgid "Evaluation of the search expression did not yield a boolean value"
msgstr ""
@@ -4942,11 +5211,11 @@ msgstr ""
msgid "Syncing folders"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:643
msgid "Unable to open spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:653
+#: camel/camel-filter-driver.c:652
msgid "Unable to process spool folder"
msgstr ""
@@ -4964,60 +5233,60 @@ msgstr ""
msgid "Cannot open message"
msgstr ""
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
#, fuzzy
msgid "Syncing folder"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:766
+#: camel/camel-filter-driver.c:770
#, c-format
msgid "Getting message %d of %d"
msgstr ""
-#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
#, c-format
msgid "Failed at message %d of %d"
msgstr ""
-#: camel/camel-filter-driver.c:892
+#: camel/camel-filter-driver.c:900
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:898
+#: camel/camel-filter-driver.c:906
#, c-format
msgid "Error executing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
+#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr ""
-#: camel/camel-folder-search.c:328
+#: camel/camel-folder-search.c:333
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
"%s"
msgstr ""
-#: camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:343
#, c-format
msgid ""
"Error executing search expression: %s:\n"
"%s"
msgstr ""
-#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
msgid "(match-all) requires a single bool result"
msgstr ""
-#: camel/camel-folder-search.c:563
+#: camel/camel-folder-search.c:638
#, c-format
msgid "Performing query on unknown header: %s"
msgstr ""
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
+#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
msgid "Invalid type in body-contains, expecting string"
msgstr ""
@@ -5052,12 +5321,12 @@ msgstr ""
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr ""
-#: camel/camel-lock.c:201
+#: camel/camel-lock.c:205
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr ""
-#: camel/camel-lock.c:255
+#: camel/camel-lock.c:267
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr ""
@@ -5127,44 +5396,64 @@ msgid "Please enter your %s passphrase"
msgstr ""
#: camel/camel-pgp-context.c:518
-msgid "No plaintext to sign."
+msgid "Cannot sign this message: no plaintext to sign"
msgstr ""
#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
-msgid "No password provided."
+msgid "Cannot sign this message: no password provided"
msgstr ""
#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
-#: camel/camel-pgp-context.c:1302
#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
#: camel/camel-pgp-context.c:693
-msgid "No plaintext to clearsign."
+msgid "Cannot sign this message: no plaintext to clearsign"
msgstr ""
#: camel/camel-pgp-context.c:886
-msgid "No plaintext to verify."
+msgid "Cannot verify this message: no plaintext to verify"
+msgstr ""
+
+#: camel/camel-pgp-context.c:892
+#, c-format
+msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
#: camel/camel-pgp-context.c:903
#, c-format
-msgid "Couldn't create temp file: %s"
+msgid "Cannot verify this message: couldn't create temp file: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1069
+msgid "Cannot encrypt this message: no plaintext to encrypt"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1079
+msgid "Cannot encrypt this message: no password provided"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1086
+#, c-format
+msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
-#: camel/camel-pgp-context.c:1070
-msgid "No plaintext to encrypt."
+#: camel/camel-pgp-context.c:1095
+msgid "Cannot encrypt this message: no recipients specified"
msgstr ""
-#: camel/camel-pgp-context.c:1096
-msgid "No recipients specified"
+#: camel/camel-pgp-context.c:1258
+msgid "Cannot decrypt this message: no ciphertext to decrypt"
msgstr ""
-#: camel/camel-pgp-context.c:1287
-msgid "No ciphertext to decrypt."
+#: camel/camel-pgp-context.c:1266
+msgid "Cannot decrypt this message: no password provided"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1273
+#, c-format
+msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
msgstr ""
#: camel/camel-provider.c:131
@@ -5182,38 +5471,39 @@ msgstr ""
msgid "Could not load %s: No initialization code in module."
msgstr ""
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:203
#, c-format
msgid "%s server %s"
msgstr ""
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:207
#, c-format
msgid "%s service for %s on %s"
msgstr ""
-#: camel/camel-remote-store.c:252
+#: camel/camel-remote-store.c:264
msgid "Connection cancelled"
msgstr ""
-#: camel/camel-remote-store.c:255
+#: camel/camel-remote-store.c:267
#: camel/providers/smtp/camel-smtp-transport.c:272
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr ""
-#: camel/camel-remote-store.c:256
+#: camel/camel-remote-store.c:268
msgid "(unknown host)"
msgstr ""
-#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
+#: camel/camel-remote-store.c:486
#: camel/providers/imap/camel-imap-command.c:386
msgid "Operation cancelled"
msgstr ""
#: camel/camel-remote-store.c:489
-msgid "Server unexpectedly disconnected"
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
msgstr ""
#: camel/camel-sasl-anonymous.c:33
@@ -5309,7 +5599,7 @@ msgid ""
msgstr ""
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:492
msgid "Bad authentication response from server."
msgstr ""
@@ -5327,7 +5617,7 @@ msgstr ""
#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
msgid "Password"
msgstr ""
@@ -5356,55 +5646,55 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr ""
-#: camel/camel-service.c:155
+#: camel/camel-service.c:154
#, c-format
msgid "URL '%s' needs a username component"
msgstr ""
-#: camel/camel-service.c:163
+#: camel/camel-service.c:162
#, c-format
msgid "URL '%s' needs a host component"
msgstr ""
-#: camel/camel-service.c:171
+#: camel/camel-service.c:170
#, c-format
msgid "URL '%s' needs a path component"
msgstr ""
-#: camel/camel-service.c:549
+#: camel/camel-service.c:548
#, c-format
msgid "Resolving: %s"
msgstr ""
-#: camel/camel-service.c:576
+#: camel/camel-service.c:575
#, c-format
msgid "Failure in name lookup: %s"
msgstr ""
-#: camel/camel-service.c:601
+#: camel/camel-service.c:600
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr ""
-#: camel/camel-service.c:603
+#: camel/camel-service.c:602
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr ""
-#: camel/camel-session.c:68
+#: camel/camel-session.c:76
msgid "Virtual folder email provider"
msgstr ""
-#: camel/camel-session.c:70
+#: camel/camel-session.c:78
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:297 camel/camel-session.c:366
+#: camel/camel-session.c:322 camel/camel-session.c:391
#, c-format
msgid "No provider available for protocol `%s'"
msgstr ""
-#: camel/camel-session.c:483
+#: camel/camel-session.c:508
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -5430,24 +5720,28 @@ msgstr ""
msgid "The encryption certificate for \"%s\" does not exist."
msgstr ""
-#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
-#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
#, c-format
msgid "Failed to find certificate for \"%s\"."
msgstr ""
-#: camel/camel-smime-context.c:545
+#: camel/camel-smime-context.c:556
msgid "Failed to find a common bulk algorithm."
msgstr ""
-#: camel/camel-smime-context.c:799
+#: camel/camel-smime-context.c:810
msgid "Failed to decode message."
msgstr ""
-#: camel/camel-smime-context.c:844
+#: camel/camel-smime-context.c:855
msgid "Failed to verify certificates."
msgstr ""
+#: camel/camel-store.c:273
+msgid "Cannot create folder: Invalid operation on this store"
+msgstr ""
+
#: camel/camel-tcp-stream-openssl.c:463
#, c-format
msgid ""
@@ -5456,7 +5750,7 @@ msgid ""
msgstr ""
#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -5466,7 +5760,7 @@ msgid ""
"Do you wish to accept anyway?"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-ssl.c:353
#, c-format
msgid ""
"EMail: %s\n"
@@ -5483,17 +5777,17 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr ""
-#: camel/camel-vee-folder.c:452
+#: camel/camel-vee-folder.c:546
#, c-format
msgid "No such message %s in %s"
msgstr ""
-#: camel/camel-vee-folder.c:547
+#: camel/camel-vee-folder.c:641
#, c-format
msgid "No such message: %s"
msgstr ""
-#: camel/camel-vtrash-folder.c:109
+#: camel/camel-vtrash-folder.c:106
msgid "You cannot copy messages from this trash folder."
msgstr ""
@@ -5521,40 +5815,40 @@ msgstr ""
msgid "Unexpected OK response from IMAP server: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:190
+#: camel/providers/imap/camel-imap-folder.c:189
#, c-format
msgid "Could not create directory %s: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:209
+#: camel/providers/imap/camel-imap-folder.c:208
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:273
+#: camel/providers/imap/camel-imap-folder.c:272
msgid "Folder was destroyed and recreated on server."
msgstr ""
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:435
+#: camel/providers/imap/camel-imap-folder.c:434
msgid "Scanning for changed messages"
msgstr ""
#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1890
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1634
-#: camel/providers/imap/camel-imap-folder.c:1715
+#: camel/providers/imap/camel-imap-folder.c:1633
+#: camel/providers/imap/camel-imap-folder.c:1714
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1640
+#: camel/providers/imap/camel-imap-folder.c:1639
msgid "Scanning for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1923
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -5563,6 +5857,14 @@ msgstr ""
msgid "Could not open cache directory: %s"
msgstr ""
+#: camel/providers/imap/camel-imap-message-cache.c:243
+#: camel/providers/imap/camel-imap-message-cache.c:299
+#: camel/providers/imap/camel-imap-message-cache.c:330
+#: camel/providers/imap/camel-imap-message-cache.c:362
+#, c-format
+msgid "Failed to cache message %s: %s"
+msgstr ""
+
#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
msgid "Checking for new mail"
msgstr ""
@@ -5571,7 +5873,7 @@ msgstr ""
msgid "Check for new messages in all folders"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
msgid "Folders"
msgstr ""
@@ -5592,7 +5894,7 @@ msgid "Apply filters to new messages in INBOX on this server"
msgstr ""
#: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAPv4"
+msgid "IMAP"
msgstr ""
#: camel/providers/imap/camel-imap-provider.c:65
@@ -5603,28 +5905,28 @@ msgstr ""
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:463
+#: camel/providers/imap/camel-imap-store.c:515
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/imap/camel-imap-store.c:525
#: camel/providers/smtp/camel-smtp-transport.c:388
#, c-format
msgid "No support for authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:549
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/imap/camel-imap-store.c:564
#: camel/providers/smtp/camel-smtp-transport.c:432
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:538
+#: camel/providers/imap/camel-imap-store.c:590
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -5632,12 +5934,12 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:837
+#: camel/providers/imap/camel-imap-store.c:889
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1038
+#: camel/providers/imap/camel-imap-store.c:1090
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
@@ -5646,35 +5948,39 @@ msgid "MH-format mail directories"
msgstr ""
#: camel/providers/local/camel-local-provider.c:41
-msgid "For storing local mail in MH-like mail directories"
+msgid "For storing local mail in MH-like mail directories."
msgstr ""
#: camel/providers/local/camel-local-provider.c:50
-msgid "Standard Unix mailbox file"
+msgid "Local delivery"
msgstr ""
#: camel/providers/local/camel-local-provider.c:51
-msgid "For storing local mail in standard mbox format"
+msgid "For retrieving local mail from standard mbox formated spools."
msgstr ""
#: camel/providers/local/camel-local-provider.c:60
+msgid "Apply filters to new messages in INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:66
msgid "Qmail maildir-format mail files"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:61
-msgid "For storing local mail in qmail maildir directories"
+#: camel/providers/local/camel-local-provider.c:67
+msgid "For storing local mail in qmail maildir directories."
msgstr ""
-#: camel/providers/local/camel-local-provider.c:70
-msgid "Unix mbox spool-format mail files"
+#: camel/providers/local/camel-local-provider.c:77
+msgid "Standard Unix mbox spools"
msgstr ""
-#: camel/providers/local/camel-local-provider.c:71
-msgid "For storing local mail in standard Unix spool directories"
+#: camel/providers/local/camel-local-provider.c:78
+msgid "For reading and storing local mail in standard mbox spool files."
msgstr ""
#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:111
+#: camel/providers/local/camel-spool-store.c:112
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
@@ -5699,58 +6005,58 @@ msgstr ""
msgid "Local mail file %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:240
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:279
+#: camel/providers/local/camel-local-store.c:282
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:292
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-summary.c:417
-#: camel/providers/local/camel-spool-summary.c:1153
+#: camel/providers/local/camel-local-summary.c:418
+#: camel/providers/local/camel-spool-summary.c:1158
msgid "Unable to add message to summary: unknown reason"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:176
+#: camel/providers/local/camel-maildir-folder.c:181
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:206
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-maildir-folder.c:226
#: camel/providers/local/camel-mbox-folder.c:328
#: camel/providers/local/camel-mh-folder.c:195
#: camel/providers/local/camel-mh-folder.c:204
#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
#, c-format
msgid ""
"Cannot get message: %s\n"
" %s"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:206
#: camel/providers/local/camel-mbox-folder.c:328
#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
msgid "No such message"
msgstr ""
-#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-maildir-folder.c:227
#: camel/providers/local/camel-mh-folder.c:213
msgid "Invalid message contents"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-maildir-store.c:106
#: camel/providers/local/camel-mh-store.c:90
#, c-format
msgid ""
@@ -5758,14 +6064,14 @@ msgid ""
"%s"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:110
#: camel/providers/local/camel-mbox-store.c:101
#: camel/providers/local/camel-mh-store.c:97
#, c-format
msgid "Folder `%s' does not exist."
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-maildir-store.c:117
#: camel/providers/local/camel-mh-store.c:103
#, c-format
msgid ""
@@ -5773,23 +6079,23 @@ msgid ""
"%s"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:129
+#: camel/providers/local/camel-maildir-store.c:132
#, c-format
msgid "`%s' is not a maildir directory."
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
#: camel/providers/local/camel-mh-store.c:127
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:168
msgid "not a maildir directory"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:276
+#: camel/providers/local/camel-maildir-store.c:331
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr ""
@@ -5801,13 +6107,13 @@ msgid "Cannot open maildir directory path: %s: %s"
msgstr ""
#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:268
+#: camel/providers/local/camel-spool-folder.c:273
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr ""
#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:409
+#: camel/providers/local/camel-spool-folder.c:414
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr ""
@@ -5820,9 +6126,9 @@ msgstr ""
#: camel/providers/local/camel-mbox-folder.c:344
#: camel/providers/local/camel-mbox-folder.c:376
#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:548
-#: camel/providers/local/camel-spool-folder.c:580
-#: camel/providers/local/camel-spool-folder.c:593
+#: camel/providers/local/camel-spool-folder.c:553
+#: camel/providers/local/camel-spool-folder.c:585
+#: camel/providers/local/camel-spool-folder.c:598
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -5830,12 +6136,12 @@ msgid ""
msgstr ""
#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:581
+#: camel/providers/local/camel-spool-folder.c:586
msgid "The folder appears to be irrecoverably corrupted."
msgstr ""
#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:594
+#: camel/providers/local/camel-spool-folder.c:599
msgid "Message construction failed: Corrupt mailbox?"
msgstr ""
@@ -5875,15 +6181,17 @@ msgstr ""
#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
#. it should try and merge the summary info's. This is a bit tricky.
#: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-spool-summary.c:379
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:936
#, fuzzy
-msgid "Summarizing folder"
+msgid "Storing folder"
msgstr "Synchronising \"%s\""
#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
#, c-format
-msgid "Could not open folder: %s: summarizing from position %ld: %s"
+msgid "Could not open folder: %s: %s"
msgstr ""
#: camel/providers/local/camel-mbox-summary.c:296
@@ -5893,22 +6201,15 @@ msgid "Fatal mail parser error near position %ld in folder %s"
msgstr ""
#: camel/providers/local/camel-mbox-summary.c:371
-#, c-format
-msgid "Cannot summarize folder: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931
-#, fuzzy
-msgid "Synchronizing folder"
+#, fuzzy, c-format
+msgid "Cannot check folder: %s: %s"
msgstr "Synchronising \"%s\""
#: camel/providers/local/camel-mbox-summary.c:507
#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
#, c-format
-msgid "Could not open folder to summarize: %s: %s"
+msgid "Could not open file: %s: %s"
msgstr ""
#: camel/providers/local/camel-mbox-summary.c:524
@@ -5923,8 +6224,8 @@ msgstr ""
#: camel/providers/local/camel-mbox-summary.c:754
#: camel/providers/local/camel-spool-summary.c:698
#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:974
-#: camel/providers/local/camel-spool-summary.c:982
+#: camel/providers/local/camel-spool-summary.c:979
+#: camel/providers/local/camel-spool-summary.c:987
msgid "Summary and folder mismatch, even after a sync"
msgstr ""
@@ -5935,14 +6236,14 @@ msgid "Error writing to temp mailbox: %s"
msgstr ""
#: camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-spool-summary.c:767
+#: camel/providers/local/camel-spool-summary.c:772
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr ""
#: camel/providers/local/camel-mbox-summary.c:635
#: camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-spool-summary.c:1032
+#: camel/providers/local/camel-spool-summary.c:1037
#, c-format
msgid "Could not close source folder %s: %s"
msgstr ""
@@ -5959,7 +6260,7 @@ msgstr ""
#: camel/providers/local/camel-mbox-summary.c:878
#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1106
+#: camel/providers/local/camel-spool-summary.c:1111
#, c-format
msgid "Unknown error: %s"
msgstr ""
@@ -5979,12 +6280,12 @@ msgstr ""
msgid "Cannot open MH directory path: %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-folder.c:465
+#: camel/providers/local/camel-spool-folder.c:470
#, c-format
msgid "Cannot append message to spool file: %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:132
+#: camel/providers/local/camel-spool-store.c:133
#, c-format
msgid "Spool `%s' does not exist or is not a regular file"
msgstr ""
@@ -5994,55 +6295,62 @@ msgstr ""
msgid "Folder `%s/%s' does not exist."
msgstr ""
-#: camel/providers/local/camel-spool-store.c:176
-msgid "Spool stores do not have an inbox"
-msgstr ""
-
-#: camel/providers/local/camel-spool-store.c:186
+#: camel/providers/local/camel-spool-store.c:181
#, c-format
msgid "Spool mail file %s"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:227
msgid "Spool folders cannot be renamed"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:235
msgid "Spool folders cannot be deleted"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:498
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's. This is a bit tricky.
+#: camel/providers/local/camel-spool-summary.c:379
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-spool-summary.c:384
#, c-format
-msgid "Cannot summarise folder: %s: %s"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-spool-summary.c:498
#, c-format
-msgid "Could not open folder to summarise: %s: %s"
+msgid "Cannot summarise folder: %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:784
-#: camel/providers/local/camel-spool-summary.c:793
-#: camel/providers/local/camel-spool-summary.c:802
+#: camel/providers/local/camel-spool-summary.c:789
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:817
+#: camel/providers/local/camel-spool-summary.c:822
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-summary.c:847
-#: camel/providers/local/camel-spool-summary.c:865
-#: camel/providers/local/camel-spool-summary.c:877
+#: camel/providers/local/camel-spool-summary.c:852
+#: camel/providers/local/camel-spool-summary.c:870
+#: camel/providers/local/camel-spool-summary.c:882
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
"Folder may be corrupt, copy saved in `%s'"
msgstr ""
+#: camel/providers/local/camel-spool-summary.c:941
+#, c-format
+msgid "Could not file: %s: %s"
+msgstr ""
+
#: camel/providers/nntp/camel-nntp-auth.c:45
#, c-format
msgid "Please enter the NNTP password for %s@%s"
@@ -6123,22 +6431,26 @@ msgstr ""
msgid "Could not open folder: message listing was incomplete."
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:328
+#: camel/providers/pop3/camel-pop3-folder.c:259
+msgid "Expunging deleted messages"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:335
#, c-format
msgid "Could not fetch message: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:344
+#: camel/providers/pop3/camel-pop3-folder.c:351
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:374
#, c-format
msgid "No message with uid %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:378
#, c-format
msgid "Retrieving POP message %d"
msgstr ""
@@ -6151,35 +6463,33 @@ msgstr ""
msgid "Leave messages on server"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:42
#, c-format
msgid "Delete after %s day(s)"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
msgid "POP"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:50
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
+#: camel/providers/pop3/camel-pop3-provider.c:53
+msgid "For connecting to and downloading mail from POP servers."
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:70
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:80
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
"claim to support it."
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:91
+#: camel/providers/pop3/camel-pop3-provider.c:92
msgid ""
"This will connect to the POP server and use Kerberos 4 to authenticate to it."
msgstr ""
@@ -6234,6 +6544,11 @@ msgstr ""
msgid "No such folder `%s'."
msgstr ""
+#: camel/providers/pop3/camel-pop3-store.c:567
+#, c-format
+msgid "Unexpected response from POP server: %s"
+msgstr ""
+
#: camel/providers/sendmail/camel-sendmail-provider.c:37
#: mail/mail-config.glade.h:72
msgid "Sendmail"
@@ -6436,7 +6751,7 @@ msgstr ""
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:553
msgid "Sending message"
msgstr ""
@@ -6510,33 +6825,33 @@ msgstr ""
msgid "DATA response error: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1006
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1026
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1045
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1069
#, c-format
msgid "RSET request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:1088
#, c-format
msgid "RSET response error: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1111
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1130
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr ""
@@ -6566,7 +6881,7 @@ msgid "%.1fG"
msgstr ""
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
msgid "attachment"
msgstr ""
@@ -6599,52 +6914,52 @@ msgstr ""
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:326
msgid "Click here for the address book"
msgstr ""
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:357
msgid "From:"
msgstr ""
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:363
msgid "Reply-To:"
msgstr ""
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:374
msgid "Subject:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
msgid "To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
msgid "Enter the recipients of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
msgid "Cc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:396
msgid "Bcc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -6655,123 +6970,119 @@ msgstr ""
msgid "Attach a file"
msgstr ""
-#: composer/e-msg-composer.c:670
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:676
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:858
msgid "Save as..."
msgstr ""
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:867
msgid "Warning!"
msgstr ""
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:871
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:900
+#: composer/e-msg-composer.c:893
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:912
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:983
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
msgstr ""
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1036
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1044
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1050
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1056
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1065
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1165
msgid ""
-"Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1313
msgid ""
"This message has not been sent.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:217
-msgid "Evolution"
+#: composer/e-msg-composer.c:1320
+msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1343
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1492
msgid "Insert File"
msgstr ""
-#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
+#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2314
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:2406
+#: composer/e-msg-composer.c:2404
msgid "Could not create composer window."
msgstr ""
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:349
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
msgstr ""
-#: composer/evolution-composer.c:374
+#: composer/evolution-composer.c:364
#, fuzzy
msgid "Cannot initialize Evolution's composer."
msgstr "Cannot initialise Evolution's mail component."
+#: data/evolution.desktop.in.h:1 shell/main.c:76
+msgid "Evolution"
+msgstr ""
+
#: data/evolution.desktop.in.h:2
msgid "The Evolution groupware suite"
msgstr ""
@@ -6816,78 +7127,100 @@ msgstr ""
msgid "Subject does not contain"
msgstr ""
-#. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:240
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1531
-msgid "%m/%d/%Y"
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:178
+#, fuzzy
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:183
+#, fuzzy
+msgid "%a %m/%d/%Y %H"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: e-util/e-time-utils.c:194
+#, fuzzy
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: e-util/e-time-utils.c:198
+#, fuzzy
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:203
+#, fuzzy
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:208
+#, fuzzy
+msgid "%m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:213
+#, fuzzy
+msgid "%m/%d/%Y %I %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:218
+#, fuzzy
+msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y"
#. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:362
+#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
msgid "%I:%M:%S %p"
msgstr ""
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
-#: e-util/e-time-utils.c:354
+#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
msgid "%H:%M:%S"
msgstr ""
-#. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
-#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
-#: widgets/misc/e-dateedit.c:1566
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
+#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
msgid "%I:%M %p"
msgstr ""
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
-#: widgets/misc/e-dateedit.c:1563
+#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
+#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
msgid "%H:%M"
msgstr ""
-#. This is the second-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:244
-msgid "%d/%m/%Y"
-msgstr "%m/%d/%Y"
-
-#. This is the third-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:248
-msgid "%Y/%m/%d"
-msgstr ""
-
-#. This is the final-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:252
-#, c-format
-msgid "%x"
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:317
+msgid "%I %p"
msgstr ""
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:308
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:313
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:322
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
#: filter/filter-datespec.c:80
msgid "year"
msgstr ""
@@ -6969,6 +7302,11 @@ msgstr ""
msgid "a time relative to the current time"
msgstr ""
+#. The dialog
+#: filter/filter-datespec.c:394
+msgid "Select a time to compare against"
+msgstr ""
+
#. The label
#: filter/filter-datespec.c:428
msgid "Compare against"
@@ -6986,7 +7324,7 @@ msgstr ""
msgid "ago"
msgstr ""
-#: filter/filter-datespec.c:711 mail/message-list.c:936
+#: filter/filter-datespec.c:711 mail/message-list.c:940
msgid "%b %d %l:%M %p"
msgstr ""
@@ -6999,11 +7337,11 @@ msgid "Filter Rules"
msgstr ""
#. and now for the action area
-#: filter/filter-filter.c:452
+#: filter/filter-filter.c:487
msgid "Then"
msgstr ""
-#: filter/filter-filter.c:466
+#: filter/filter-filter.c:501
msgid "Add action"
msgstr ""
@@ -7013,8 +7351,8 @@ msgid ""
"Please go back and specify a valid folder to deliver mail to."
msgstr ""
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:809
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
+#: mail/mail-account-gui.c:820
msgid "Select Folder"
msgstr ""
@@ -7037,39 +7375,39 @@ msgstr ""
msgid "Test"
msgstr ""
-#: filter/filter-rule.c:626
+#: filter/filter-rule.c:696
msgid "Rule name: "
msgstr ""
-#: filter/filter-rule.c:630
+#: filter/filter-rule.c:700
msgid "Untitled"
msgstr ""
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:717
msgid "If"
msgstr ""
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:735
msgid "Execute actions"
msgstr ""
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:739
msgid "if all criteria are met"
msgstr ""
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:744
msgid "if any criteria are met"
msgstr ""
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:755
msgid "Add criterion"
msgstr ""
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
msgid "incoming"
msgstr ""
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
msgid "outgoing"
msgstr ""
@@ -7113,191 +7451,190 @@ msgstr ""
msgid "with all local folders"
msgstr ""
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Color"
-msgstr ""
-
#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Color"
msgstr ""
#: filter/libfilter-i18n.h:4
-msgid "Attachments"
+msgid "Assign Score"
msgstr ""
#: filter/libfilter-i18n.h:5
-msgid "Copy to Folder"
+msgid "Attachments"
msgstr ""
-#: filter/libfilter-i18n.h:6
-msgid "Date received"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
msgstr ""
-#: filter/libfilter-i18n.h:7
-msgid "Date sent"
+#: filter/libfilter-i18n.h:8
+msgid "Copy to Folder"
msgstr ""
#: filter/libfilter-i18n.h:9
-msgid "Deleted"
+msgid "Date received"
msgstr ""
#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
+msgid "Date sent"
msgstr ""
#: filter/libfilter-i18n.h:12
-msgid "Exist"
+msgid "Deleted"
msgstr ""
#: filter/libfilter-i18n.h:13
-msgid "Expression"
+msgid "does not contain"
msgstr ""
#: filter/libfilter-i18n.h:14
-msgid "Important"
+msgid "does not end with"
msgstr ""
#: filter/libfilter-i18n.h:15
-msgid "Mailing list"
+msgid "does not exist"
msgstr ""
#: filter/libfilter-i18n.h:16
-msgid "Message Body"
+msgid "does not sound like"
msgstr ""
#: filter/libfilter-i18n.h:17
-msgid "Message Header"
+msgid "does not start with"
msgstr ""
#: filter/libfilter-i18n.h:18
-msgid "Message was received"
+msgid "Do Not Exist"
msgstr ""
#: filter/libfilter-i18n.h:19
-msgid "Message was sent"
+msgid "Draft"
msgstr ""
#: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
+msgid "ends with"
msgstr ""
#: filter/libfilter-i18n.h:21
-msgid "Read"
+msgid "Exist"
msgstr ""
#: filter/libfilter-i18n.h:22
-msgid "Recipients"
+msgid "exists"
msgstr ""
#: filter/libfilter-i18n.h:23
-msgid "Regex Match"
+msgid "Expression"
msgstr ""
#: filter/libfilter-i18n.h:24
-msgid "Replied to"
+msgid "Important"
msgstr ""
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
+#: filter/libfilter-i18n.h:25
+msgid "is"
msgstr ""
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
-msgid "Sender"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
msgstr ""
#: filter/libfilter-i18n.h:27
-msgid "Set Status"
+msgid "is less than"
msgstr ""
#: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
+msgid "is not"
msgstr ""
#: filter/libfilter-i18n.h:29
-msgid "Source Account"
+msgid "Mailing list"
msgstr ""
#: filter/libfilter-i18n.h:30
-msgid "Specific header"
+msgid "Message Body"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "Message Header"
msgstr ""
#: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
+msgid "Message was received"
msgstr ""
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
-#: mail/message-list.etspec.h:9
-msgid "Subject"
+#: filter/libfilter-i18n.h:33
+msgid "Message was sent"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "Move to Folder"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
msgstr ""
#: filter/libfilter-i18n.h:36
-msgid "contains"
+msgid "on or before"
msgstr ""
#: filter/libfilter-i18n.h:37
-msgid "does not contain"
+msgid "Read"
msgstr ""
#: filter/libfilter-i18n.h:38
-msgid "does not end with"
+msgid "Recipients"
msgstr ""
#: filter/libfilter-i18n.h:39
-msgid "does not exist"
+msgid "Regex Match"
msgstr ""
#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
+msgid "Replied to"
msgstr ""
-#: filter/libfilter-i18n.h:41
-msgid "does not start with"
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:42
-msgid "ends with"
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+msgid "Sender"
msgstr ""
#: filter/libfilter-i18n.h:43
-msgid "exists"
+msgid "Set Status"
msgstr ""
#: filter/libfilter-i18n.h:44
-msgid "is greater than"
+msgid "Size (kB)"
msgstr ""
#: filter/libfilter-i18n.h:45
-msgid "is less than"
+msgid "sounds like"
msgstr ""
#: filter/libfilter-i18n.h:46
-msgid "is not"
+msgid "Source Account"
msgstr ""
#: filter/libfilter-i18n.h:47
-msgid "is"
+msgid "Specific header"
msgstr ""
#: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "on or before"
+msgid "starts with"
msgstr ""
#: filter/libfilter-i18n.h:50
-msgid "sounds like"
+msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:51
-msgid "starts with"
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: mail/message-list.etspec.h:9
+msgid "Subject"
msgstr ""
#: filter/libfilter-i18n.h:52
@@ -7316,7 +7653,7 @@ msgstr ""
msgid "Add Rule"
msgstr ""
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:301
msgid "Edit Rule"
msgstr ""
@@ -7324,59 +7661,100 @@ msgstr ""
msgid "Score Rules"
msgstr ""
-#: filter/vfolder-rule.c:198
+#: filter/vfolder-rule.c:203
msgid "Oops. You need to to specify at least one folder as a source."
msgstr ""
-#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:816 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
-msgid "Import"
+#: importers/elm-importer.c:96
+msgid "Evolution is importing your old Elm mail"
+msgstr ""
+
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:102
+msgid "Importing..."
+msgstr ""
+
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:104
+msgid "Please wait"
msgstr ""
-#: importers/elm-importer.c:475 importers/netscape-importer.c:821
-#: importers/pine-importer.c:632 mail/component-factory.c:96
+#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/pine-importer.c:369
+#, c-format
+msgid "Importing %s as %s"
+msgstr ""
+
+#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/pine-importer.c:506
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Synchronise \"%s\""
+
+#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/pine-importer.c:669 mail/component-factory.c:96
msgid "Mail"
msgstr ""
-#: importers/elm-importer.c:498
+#: importers/elm-importer.c:548
msgid ""
"Evolution has found Elm mail files\n"
"Would you like to import them into Evolution?"
msgstr ""
-#: importers/elm-importer.c:527
-msgid "Elm mail"
+#: importers/elm-importer.c:577
+msgid "Elm"
msgstr ""
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#: importers/evolution-gnomecard-importer.c:230
+msgid "GnomeCard:"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
msgid "Addressbook"
msgstr ""
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:250
msgid ""
"Evolution has found GnomeCard files.\n"
"Would you like them to be imported into Evolution?"
msgstr ""
-#: importers/netscape-importer.c:826
+#: importers/netscape-importer.c:107
+msgid "Evolution is importing your old Netscape data"
+msgstr ""
+
+#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#, fuzzy
+msgid "Scanning directory"
+msgstr "Synchronising \"%s\""
+
+#: importers/netscape-importer.c:906
+msgid "Starting import"
+msgstr ""
+
+#: importers/netscape-importer.c:972
msgid "Settings"
msgstr ""
-#: importers/netscape-importer.c:851
+#: importers/netscape-importer.c:993
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
msgstr ""
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:101
+msgid "Evolution is importing your old Pine data"
+msgstr ""
+
+#: importers/pine-importer.c:695
msgid ""
"Evolution has found Pine mail files.\n"
"Would you like to import them into Evolution?"
msgstr ""
-#: importers/pine-importer.c:691
-msgid "Pine mail"
+#: importers/pine-importer.c:723
+msgid "Pine"
msgstr ""
#: mail/GNOME_Evolution_Mail.oaf.in.h:1
@@ -7410,15 +7788,10 @@ msgstr "Cannot initialise Evolution's mail component."
#: mail/GNOME_Evolution_Mail.oaf.in.h:7
#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
msgid "Factory for the Mail Summary component."
msgstr "Cannot initialise Evolution's mail component."
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
msgid "Mail configuration interface"
msgstr ""
@@ -7426,31 +7799,43 @@ msgstr ""
msgid "Folder containing mail"
msgstr ""
+#: mail/component-factory.c:97
+msgid "Mail storage folder (internal)"
+msgstr ""
+
+#: mail/component-factory.c:98
+msgid "Virtual Trash"
+msgstr ""
+
+#: mail/component-factory.c:98
+msgid "Virtual Trash folder"
+msgstr ""
+
#: mail/component-factory.c:114
msgid "This folder cannot contain messages."
msgstr ""
-#: mail/component-factory.c:341
+#: mail/component-factory.c:356
msgid "Properties..."
msgstr ""
-#: mail/component-factory.c:341
+#: mail/component-factory.c:356
msgid "Change this folder's properties"
msgstr ""
-#: mail/component-factory.c:757
+#: mail/component-factory.c:790
msgid "New Mail Message"
msgstr ""
-#: mail/component-factory.c:757
+#: mail/component-factory.c:790
msgid "New _Mail Message"
msgstr ""
-#: mail/component-factory.c:789
+#: mail/component-factory.c:821
msgid "Cannot initialize Evolution's mail component."
msgstr "Cannot initialise Evolution's mail component."
-#: mail/component-factory.c:928
+#: mail/component-factory.c:1007
msgid "Cannot register storage with shell"
msgstr ""
@@ -7463,129 +7848,159 @@ msgstr ""
msgid "Properties"
msgstr ""
-#: mail/folder-browser.c:236 mail/mail-display.c:281
+#: mail/folder-browser.c:239 mail/mail-display.c:275
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/folder-browser.c:909
+#: mail/folder-browser.c:708
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/folder-browser.c:711 mail/folder-browser.c:716
+#: mail/folder-browser.c:720
+msgid ", "
+msgstr ""
+
+#: mail/folder-browser.c:712
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/folder-browser.c:717
+#, c-format
+msgid "%d selected"
+msgstr ""
+
+#: mail/folder-browser.c:722
+#, c-format
+msgid "%d unsent"
+msgstr ""
+
+#: mail/folder-browser.c:724
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/folder-browser.c:958
msgid "Create vFolder from Search"
msgstr ""
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1303
msgid "VFolder on _Subject"
msgstr ""
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1306
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1309
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1312
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1318
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1321
msgid "Filter on Sen_der"
msgstr ""
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1324
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/folder-browser.c:1278
+#: mail/folder-browser.c:1327
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
msgid "_Edit as New Message..."
msgstr ""
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
msgid "_Save As..."
msgstr ""
-#: mail/folder-browser.c:1293
+#: mail/folder-browser.c:1342
msgid "_Print"
msgstr ""
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
msgid "_Reply to Sender"
msgstr ""
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
msgid "Reply to _List"
msgstr ""
-#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
msgid "Reply to _All"
msgstr ""
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1353
msgid "_Forward"
msgstr ""
-#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
msgid "Mar_k as Read"
msgstr ""
-#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
msgid "Mark as U_nread"
msgstr ""
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1360
msgid "Mark as _Important"
msgstr ""
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1362
msgid "Mark as Unim_portant"
msgstr ""
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1367
msgid "_Move to Folder..."
msgstr ""
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1369
msgid "_Copy to Folder..."
msgstr ""
-#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
msgid "_Undelete"
msgstr ""
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1378
msgid "Add Sender to Address Book"
msgstr ""
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1383
msgid "Apply Filters"
msgstr ""
-#: mail/folder-browser.c:1338
+#: mail/folder-browser.c:1387
msgid "Create Ru_le From Message"
msgstr ""
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1538
msgid "Filter on Mailing List"
msgstr ""
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1539
msgid "VFolder on Mailing List"
msgstr ""
-#: mail/folder-browser.c:1499
+#: mail/folder-browser.c:1541
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:1500
+#: mail/folder-browser.c:1542
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr ""
@@ -7656,51 +8071,55 @@ msgstr ""
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:999
+#: mail/mail-account-gui.c:945
+msgid "Could not save signature file."
+msgstr ""
+
+#: mail/mail-account-gui.c:1022
msgid "Save signature"
msgstr ""
-#: mail/mail-account-gui.c:1005
+#: mail/mail-account-gui.c:1028
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: mail/mail-account-gui.c:1585
+#: mail/mail-account-gui.c:1611
msgid "You may not create two accounts with the same name."
msgstr ""
-#: mail/mail-accounts.c:145
+#: mail/mail-accounts.c:144
msgid " (default)"
msgstr ""
-#: mail/mail-accounts.c:190
+#: mail/mail-accounts.c:189
msgid "Disable"
msgstr ""
-#: mail/mail-accounts.c:192
+#: mail/mail-accounts.c:191
msgid "Enable"
msgstr ""
-#: mail/mail-accounts.c:280
+#: mail/mail-accounts.c:278
msgid "Are you sure you want to delete this account?"
msgstr ""
-#: mail/mail-accounts.c:284
+#: mail/mail-accounts.c:282
msgid "Don't delete"
msgstr ""
-#: mail/mail-accounts.c:287
+#: mail/mail-accounts.c:285
msgid "Really delete account?"
msgstr ""
-#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
+#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
msgid "Are you sure you want to delete this news account?"
msgstr ""
#. give our dialog an Close button and title
-#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
msgid "Mail Settings"
msgstr ""
@@ -7752,83 +8171,107 @@ msgstr ""
msgid "You have not set a mail transport method"
msgstr ""
-#: mail/mail-callbacks.c:218
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:216
+msgid ""
+"You are sending an HTML-formatted message, but the following recipients do "
+"not want HTML-formatted mail:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:231
+msgid "Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:273
msgid ""
"This message has no subject.\n"
"Really send?"
msgstr ""
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:317
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:321
+msgid "This message contains only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:325
msgid ""
-"This message contains only Bcc recipients.\n"
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
"Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:339
+#: mail/mail-callbacks.c:419
+msgid "This message contains invalid recipients:"
+msgstr ""
+
+#: mail/mail-callbacks.c:453
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:390
+#: mail/mail-callbacks.c:549
msgid "You must configure an account before you can send this email."
msgstr ""
-#: mail/mail-callbacks.c:632
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#: mail/mail-callbacks.c:779
+msgid "an unknown sender"
msgstr ""
-#: mail/mail-callbacks.c:895
-msgid "Forwarded message:\n"
+#: mail/mail-callbacks.c:784
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1162
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:997
+#: mail/mail-callbacks.c:1164
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1366
+#: mail/mail-callbacks.c:1538
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:1388
+#: mail/mail-callbacks.c:1560
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:1422
+#: mail/mail-callbacks.c:1594
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:1434
+#: mail/mail-callbacks.c:1606
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:1455
+#: mail/mail-callbacks.c:1627
msgid "No Message Selected"
msgstr ""
-#: mail/mail-callbacks.c:1540
+#: mail/mail-callbacks.c:1712
msgid "Save Message As..."
msgstr ""
-#: mail/mail-callbacks.c:1542
+#: mail/mail-callbacks.c:1714
msgid "Save Messages As..."
msgstr ""
-#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr ""
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1864
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -7836,30 +8279,30 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:1721
+#: mail/mail-callbacks.c:1871
msgid "Do not ask me again."
msgstr ""
-#: mail/mail-callbacks.c:1826
+#: mail/mail-callbacks.c:1976
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:1836
+#: mail/mail-callbacks.c:1986
msgid "Filters"
msgstr ""
-#: mail/mail-callbacks.c:1882
+#: mail/mail-callbacks.c:2032
msgid "Print Message"
msgstr ""
-#: mail/mail-callbacks.c:1928
+#: mail/mail-callbacks.c:2078
msgid "Printing of message failed"
msgstr ""
-#: mail/mail-callbacks.c:2012
+#: mail/mail-callbacks.c:2162
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr ""
@@ -7901,25 +8344,29 @@ msgid ""
msgstr ""
#. set window title
-#: mail/mail-config-druid.c:558
+#: mail/mail-config-druid.c:570
msgid "Evolution Account Assistant"
msgstr ""
+#: mail/mail-config.c:1486
+msgid "Evolution Shortcuts"
+msgstr ""
+
#. right now, the URL always works basically as a matter of luck...
#. * both IMAP and mbox spool stores have INBOX as their inbox folder
#. * name. I don't think this will work with maildir. How can we figure out
#. * what shortcut to insert?
#.
-#: mail/mail-config.c:1579
+#: mail/mail-config.c:1618
#, c-format
msgid "%s: Inbox"
msgstr ""
-#: mail/mail-config.c:1809
+#: mail/mail-config.c:1851
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:1880 mail/mail-config.c:1883
+#: mail/mail-config.c:1922 mail/mail-config.c:1925
msgid "Connecting to server..."
msgstr ""
@@ -7940,7 +8387,7 @@ msgstr ""
msgid "Account Information"
msgstr ""
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr ""
@@ -8011,11 +8458,11 @@ msgstr ""
msgid "Display"
msgstr ""
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr ""
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
msgid "Drafts"
msgstr ""
@@ -8052,7 +8499,7 @@ msgstr ""
msgid "IMAPv4 "
msgstr ""
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr ""
@@ -8128,7 +8575,7 @@ msgstr ""
msgid "Quoted"
msgstr ""
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr ""
@@ -8160,7 +8607,7 @@ msgstr ""
msgid "Select PGP binary"
msgstr ""
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr ""
@@ -8169,7 +8616,7 @@ msgid "Sending Mail"
msgstr ""
#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:179
+#: shell/e-local-storage.c:177
msgid "Sent"
msgstr ""
@@ -8317,15 +8764,19 @@ msgstr ""
msgid "_Username:"
msgstr ""
-#: mail/mail-config.glade.h:116
-msgid "newswindow1"
+#: mail/mail-config.glade.h:115
+msgid "description"
msgstr ""
#: mail/mail-config.glade.h:117
-msgid "placeholder"
+msgid "newswindow1"
msgstr ""
#: mail/mail-config.glade.h:118
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:119
msgid "seconds."
msgstr ""
@@ -8365,217 +8816,197 @@ msgstr ""
msgid "Could not create a S/MIME decode context."
msgstr ""
-#: mail/mail-display.c:222
+#: mail/mail-display.c:223
msgid "Save Attachment"
msgstr ""
-#: mail/mail-display.c:341
+#: mail/mail-display.c:327
msgid "Save to Disk..."
msgstr ""
-#: mail/mail-display.c:343
+#: mail/mail-display.c:329
msgid "View Inline"
msgstr ""
-#: mail/mail-display.c:345
+#: mail/mail-display.c:331
#, c-format
msgid "Open in %s..."
msgstr ""
-#: mail/mail-display.c:406
+#: mail/mail-display.c:392
#, c-format
msgid "View Inline (via %s)"
msgstr ""
-#: mail/mail-display.c:410
+#: mail/mail-display.c:396
msgid "Hide"
msgstr ""
-#: mail/mail-display.c:431
+#: mail/mail-display.c:417
msgid "External Viewer"
msgstr ""
-#: mail/mail-display.c:1055
+#: mail/mail-display.c:1053
msgid "Loading message content"
msgstr ""
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1515
msgid "Open Link in Browser"
msgstr ""
-#: mail/mail-display.c:1413
+#: mail/mail-display.c:1517
msgid "Copy Link Location"
msgstr ""
-#: mail/mail-display.c:1415
+#: mail/mail-display.c:1519
msgid "Save Link as (FIXME)"
msgstr ""
-#: mail/mail-display.c:1417
+#: mail/mail-display.c:1521
msgid "Save Image as..."
msgstr ""
-#: mail/mail-folder-cache.c:147
-#, c-format
-msgid "%d new"
-msgstr ""
-
-#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
-#: mail/mail-folder-cache.c:167
-msgid ", "
-msgstr ""
-
-#: mail/mail-folder-cache.c:154
-#, c-format
-msgid "%d hidden"
-msgstr ""
-
-#: mail/mail-folder-cache.c:161
-#, c-format
-msgid "%d selected"
-msgstr ""
-
-#: mail/mail-folder-cache.c:170
-#, c-format
-msgid "%d unsent"
-msgstr ""
-
-#: mail/mail-folder-cache.c:172
-#, c-format
-msgid "%d total"
-msgstr ""
-
-#: mail/mail-format.c:623
+#: mail/mail-format.c:627
#, c-format
msgid "%s attachment"
msgstr ""
-#: mail/mail-format.c:676
+#: mail/mail-format.c:680
msgid "Could not parse MIME message. Displaying as source."
msgstr ""
-#: mail/mail-format.c:760
+#: mail/mail-format.c:764
msgid "Date"
msgstr ""
-#: mail/mail-format.c:856
+#: mail/mail-format.c:860
msgid "Bad Address"
msgstr ""
-#: mail/mail-format.c:878 mail/message-list.etspec.h:3
+#: mail/mail-format.c:882 mail/message-list.etspec.h:3
msgid "From"
msgstr ""
-#: mail/mail-format.c:881
+#: mail/mail-format.c:885
msgid "Reply-To"
msgstr ""
-#: mail/mail-format.c:884 mail/message-list.etspec.h:10
+#: mail/mail-format.c:888 mail/message-list.etspec.h:10
msgid "To"
msgstr ""
-#: mail/mail-format.c:887
+#: mail/mail-format.c:891
msgid "Cc"
msgstr ""
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1311
msgid "No GPG/PGP program configured."
msgstr ""
-#: mail/mail-format.c:1322
+#: mail/mail-format.c:1327
msgid "Encrypted message not displayed"
msgstr ""
-#: mail/mail-format.c:1333
+#: mail/mail-format.c:1338
msgid "Encrypted message"
msgstr ""
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1339
msgid "Click icon to decrypt."
msgstr ""
-#: mail/mail-format.c:1392
+#: mail/mail-format.c:1394
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
-#: mail/mail-format.c:1403
+#: mail/mail-format.c:1405
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
-#: mail/mail-format.c:2061
+#: mail/mail-format.c:2083
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2097
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2080
+#: mail/mail-format.c:2102
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/mail-format.c:2109
+#: mail/mail-format.c:2131
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2139
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2144
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:330
-#, fuzzy, c-format
-msgid "No such folder /%s"
+#: mail/mail-local.c:547
+#, fuzzy
+msgid "Reconfiguring folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-local.c:460
+#: mail/mail-local.c:620
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s: %s"
+msgstr ""
+
+#: mail/mail-local.c:676
+#, c-format
+msgid "Cannot save folder metainfo to %s: %s"
+msgstr ""
+
+#: mail/mail-local.c:722
#, c-format
-msgid "Registering '%s'"
+msgid "Cannot delete folder metadata %s: %s"
msgstr ""
-#: mail/mail-local.c:748
+#: mail/mail-local.c:1052
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr ""
-#: mail/mail-local.c:869
+#: mail/mail-local.c:1067
#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
+msgid "%s may not be reconfigured because it is not a local folder"
msgstr ""
-#: mail/mail-local.c:909
+#: mail/mail-local.c:1089
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1002
+#: mail/mail-local.c:1180
msgid "You cannot change the format of a non-local folder."
msgstr ""
-#: mail/mail-local.c:1013
+#: mail/mail-local.c:1190
#, c-format
msgid "Reconfigure %s"
msgstr ""
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:188
#, c-format
msgid ""
"Error while '%s':\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:191
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -8583,158 +9014,166 @@ msgid ""
msgstr ""
#. Remember the password?
-#: mail/mail-mt.c:439
+#: mail/mail-mt.c:454
msgid "Remember this password"
msgstr ""
-#: mail/mail-mt.c:796
+#: mail/mail-mt.c:511
+#, c-format
+msgid "Enter Password for %s"
+msgstr ""
+
+#: mail/mail-mt.c:514
+msgid "Enter Password"
+msgstr ""
+
+#: mail/mail-mt.c:824
msgid "Working"
msgstr ""
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:86
#, fuzzy
msgid "Filtering Folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:229
msgid "Fetching Mail"
msgstr ""
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:482 mail/mail-ops.c:512
+msgid "However, the message was successfully sent."
+msgstr ""
+
+#: mail/mail-ops.c:549
#, c-format
msgid "Sending \"%s\""
msgstr ""
-#: mail/mail-ops.c:709
+#: mail/mail-ops.c:668
#, c-format
msgid "Sending message %d of %d"
msgstr ""
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:687
#, c-format
msgid "Failed on message %d of %d"
msgstr ""
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
+#: mail/mail-ops.c:689 mail/mail-send-recv.c:522
msgid "Complete."
msgstr ""
-#: mail/mail-ops.c:823
+#: mail/mail-ops.c:782
msgid "Saving message to folder"
msgstr ""
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:861
#, c-format
msgid "Moving messages to %s"
msgstr ""
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:861
#, c-format
msgid "Copying messages to %s"
msgstr ""
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:878
msgid "Moving"
msgstr ""
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
msgid "Copying"
msgstr ""
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:993
#, c-format
msgid "Scanning folders in \"%s\""
msgstr ""
#. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
+#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
msgid "Trash"
msgstr ""
-#: mail/mail-ops.c:1211
+#: mail/mail-ops.c:1173
msgid "Forwarded messages"
msgstr ""
-#: mail/mail-ops.c:1253
+#: mail/mail-ops.c:1215
#, c-format
msgid "Opening folder %s"
msgstr ""
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1284
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1395
-#, fuzzy, c-format
-msgid "Creating folder %s"
-msgstr "Synchronising \"%s\""
-
-#: mail/mail-ops.c:1465
+#: mail/mail-ops.c:1353
#, fuzzy, c-format
msgid "Removing folder %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1552
+#: mail/mail-ops.c:1445
#, fuzzy, c-format
-msgid "Synchronizing '%s'"
-msgstr "Synchronise \"%s\""
+msgid "Storing folder '%s'"
+msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1496
#, fuzzy
msgid "Refreshing folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1532
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1688
+#: mail/mail-ops.c:1581
#, c-format
msgid "Retrieving message %s"
msgstr ""
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1648
#, c-format
msgid "Retrieving %d message(s)"
msgstr ""
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:1734
#, c-format
msgid "Saving %d messsage(s)"
msgstr ""
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1846
#, c-format
msgid ""
"Unable to create output file: %s\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1874
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1948
msgid "Saving attachment"
msgstr ""
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:1964
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:1995
#, c-format
msgid "Could not write data: %s"
msgstr ""
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2064
#, c-format
msgid "Disconnecting from %s"
msgstr ""
@@ -8747,55 +9186,74 @@ msgstr ""
msgid "(Untitled Message)"
msgstr ""
-#: mail/mail-search.c:237
+#: mail/mail-search.c:241
msgid "Untitled Message"
msgstr ""
-#: mail/mail-search.c:241
+#: mail/mail-search.c:245
msgid "Empty Message"
msgstr ""
-#: mail/mail-search.c:288
+#: mail/mail-search.c:292
msgid "Find in Message"
msgstr ""
-#: mail/mail-search.c:318
+#: mail/mail-search.c:322
msgid "Case Sensitive"
msgstr ""
-#: mail/mail-search.c:320
+#: mail/mail-search.c:324
msgid "Search Forward"
msgstr ""
-#: mail/mail-search.c:340
+#: mail/mail-search.c:344
msgid "Find:"
msgstr ""
-#: mail/mail-search.c:343
+#: mail/mail-search.c:347
msgid "Matches:"
msgstr ""
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:139
msgid "Cancelling..."
msgstr ""
-#: mail/mail-send-recv.c:257
-msgid "Send & Receive mail"
+#: mail/mail-send-recv.c:243
+#, c-format
+msgid "Server: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:245
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr ""
+
+#: mail/mail-send-recv.c:247
+#, c-format
+msgid "Type: %s"
+msgstr ""
+
+#: mail/mail-send-recv.c:282
+msgid "Send & Receive Mail"
+msgstr ""
+
+#: mail/mail-send-recv.c:283
+msgid "Cancel All"
+msgstr ""
+
+#: mail/mail-send-recv.c:333
msgid "Updating..."
msgstr ""
-#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
+#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
msgid "Waiting..."
msgstr ""
-#: mail/mail-send-recv.c:494
+#: mail/mail-send-recv.c:518
msgid "Cancelled."
msgstr ""
-#: mail/mail-session.c:182
+#: mail/mail-session.c:183
msgid "User canceled operation."
msgstr ""
@@ -8804,93 +9262,98 @@ msgstr ""
msgid "Couldn't create temporary mbox `%s': %s"
msgstr ""
-#: mail/mail-tools.c:241
+#: mail/mail-tools.c:299
#, c-format
msgid "Forwarded message - %s"
msgstr ""
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:303
msgid "Forwarded message"
msgstr ""
-#: mail/mail-tools.c:471
+#: mail/mail-tools.c:439
msgid "Forwarded Message"
msgstr ""
-#: mail/mail-vfolder.c:278
+#: mail/mail-vfolder.c:161
+#, fuzzy, c-format
+msgid "Setting up vfolder: %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-vfolder.c:435
msgid "VFolders"
msgstr ""
-#: mail/mail-vfolder.c:498
+#: mail/mail-vfolder.c:541
msgid "New VFolder"
msgstr ""
-#: mail/message-browser.c:125
+#: mail/message-browser.c:121
msgid "(No subject)"
msgstr ""
-#: mail/message-browser.c:127
+#: mail/message-browser.c:123
#, c-format
msgid "%s - Message"
msgstr ""
-#: mail/message-list.c:636
+#: mail/message-list.c:640
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:637
+#: mail/message-list.c:641
msgid "Seen"
msgstr ""
-#: mail/message-list.c:638
+#: mail/message-list.c:642
msgid "Answered"
msgstr ""
-#: mail/message-list.c:639
+#: mail/message-list.c:643
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:640
+#: mail/message-list.c:644
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:644
+#: mail/message-list.c:648
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:645
+#: mail/message-list.c:649
msgid "Lower"
msgstr ""
-#: mail/message-list.c:649
+#: mail/message-list.c:653
msgid "Higher"
msgstr ""
-#: mail/message-list.c:650
+#: mail/message-list.c:654
msgid "Highest"
msgstr ""
-#: mail/message-list.c:900
+#: mail/message-list.c:904
msgid "?"
msgstr ""
-#: mail/message-list.c:907
+#: mail/message-list.c:911
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:916
+#: mail/message-list.c:920
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:928
+#: mail/message-list.c:932
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:938
+#: mail/message-list.c:942
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:2312
+#: mail/message-list.c:2331
msgid "Generating message list"
msgstr ""
@@ -8906,36 +9369,36 @@ msgstr ""
msgid "Size"
msgstr ""
-#: mail/subscribe-dialog.c:174
+#: mail/subscribe-dialog.c:219
#, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:176
+#: mail/subscribe-dialog.c:221
#, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:275
+#: mail/subscribe-dialog.c:320
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:277
+#: mail/subscribe-dialog.c:322
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:1
msgid "Folder"
msgstr ""
-#: mail/subscribe-dialog.c:1490
+#: mail/subscribe-dialog.c:1521
msgid "No server has been selected"
msgstr ""
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1582
msgid "Please select a server."
msgstr ""
@@ -8977,37 +9440,32 @@ msgstr ""
msgid "Evolution component for the executive summary."
msgstr "Cannot initialise Evolution's mail summary component."
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
#: my-evolution/component-factory.c:30
msgid "Folder containing the Evolution Summary"
msgstr ""
-#: my-evolution/component-factory.c:141
+#: my-evolution/component-factory.c:139
#, fuzzy
msgid "Cannot initialize Evolution's Executive Summary component."
msgstr "Cannot initialise Evolution's mail component."
-#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
msgid "Appointments"
msgstr ""
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:249
msgid "No appointments"
msgstr ""
-#: my-evolution/e-summary-calendar.c:236
-msgid "%l:%M%p"
+#: my-evolution/e-summary-calendar.c:286
+msgid "%k%M %d %B"
msgstr ""
-#: my-evolution/e-summary-calendar.c:238
-msgid "%a %l:%M%p"
+#: my-evolution/e-summary-calendar.c:288
+msgid "%l:%M %d %B"
msgstr ""
-#: my-evolution/e-summary-mail.c:111
+#: my-evolution/e-summary-mail.c:115
msgid "Mail summary"
msgstr ""
@@ -9016,75 +9474,76 @@ msgstr ""
#. stations and their codes in Evolution sources
#. (evolution/my-evolution/Locations)
#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:615
msgid "KBOS:ZSAM:EGAA"
msgstr ""
-#: my-evolution/e-summary-preferences.c:428
+#: my-evolution/e-summary-preferences.c:427
msgid "Dictionary.com Word of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:450
+#: my-evolution/e-summary-preferences.c:449
msgid "Quotes of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:890
msgid "Add a news feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:885
+#: my-evolution/e-summary-preferences.c:898
msgid "Enter the URL of the news feed you wish to add"
msgstr ""
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:902
msgid "Name:"
msgstr ""
-#: my-evolution/e-summary-preferences.c:1421
+#: my-evolution/e-summary-preferences.c:1438
msgid "Summary Settings"
msgstr ""
-#: my-evolution/e-summary-rdf.c:281
-msgid "There was an error downloading news feed"
+#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
+#: my-evolution/e-summary-rdf.c:395
+msgid "Error downloading RDF"
msgstr ""
-#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
-msgid "<b>Error downloading RDF</b>"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:479
+#: my-evolution/e-summary-rdf.c:487
msgid "News Feed"
msgstr ""
-#: my-evolution/e-summary-tasks.c:213
+#: my-evolution/e-summary-tasks.c:216
msgid "No tasks"
msgstr ""
+#: my-evolution/e-summary-tasks.c:255
+msgid "(No Description)"
+msgstr ""
+
#: my-evolution/e-summary-weather.c:57
msgid "My Weather"
msgstr ""
-#: my-evolution/e-summary-weather.c:324
+#: my-evolution/e-summary-weather.c:334
msgid "<dd><b>The weather server could not be contacted</b></dd>"
msgstr ""
-#: my-evolution/e-summary-weather.c:512
+#: my-evolution/e-summary-weather.c:524
msgid "Weather"
msgstr ""
-#: my-evolution/e-summary-weather.c:664
+#: my-evolution/e-summary-weather.c:676
msgid "Regions"
msgstr ""
-#: my-evolution/e-summary.c:145
+#: my-evolution/e-summary.c:162
msgid "%A, %B %e %Y"
msgstr ""
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
msgid "Print Summary"
msgstr ""
-#: my-evolution/e-summary.c:518
+#: my-evolution/e-summary.c:558
msgid "Printing of Summary failed"
msgstr ""
@@ -10317,68 +10776,68 @@ msgid "One w_eek"
msgstr ""
#: my-evolution/my-evolution.glade.h:12
-msgid "Refresh _time (seconds):"
+msgid "R_efresh time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:13
-msgid "Show _all tasks"
+msgid "Refresh _time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:14
-msgid "Show _today's tasks"
+msgid "S_how full path for folders"
msgstr ""
#: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
+msgid "Show _all tasks"
msgstr ""
#: my-evolution/my-evolution.glade.h:16
-msgid "Units: "
+msgid "Show _today's tasks"
msgstr ""
#: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+msgid "Tasks "
msgstr ""
-#: my-evolution/my-evolution.glade.h:19
-#, fuzzy
-msgid "_Display folders:"
-msgstr "Synchronising \"%s\""
+#: my-evolution/my-evolution.glade.h:18
+msgid "Units: "
+msgstr ""
-#: my-evolution/my-evolution.glade.h:20
-msgid "_Display stations:"
+#: my-evolution/my-evolution.glade.h:19
+msgid "Weather settings"
msgstr ""
#: my-evolution/my-evolution.glade.h:21
-msgid "_Displayed feeds:"
-msgstr ""
+#, fuzzy
+msgid "_Display folders:"
+msgstr "Synchronising \"%s\""
#: my-evolution/my-evolution.glade.h:22
-msgid "_Five days"
+msgid "_Display stations:"
msgstr ""
#: my-evolution/my-evolution.glade.h:23
-msgid "_Mail"
+msgid "_Displayed feeds:"
msgstr ""
#: my-evolution/my-evolution.glade.h:24
-msgid "_News Feeds"
+msgid "_Five days"
msgstr ""
#: my-evolution/my-evolution.glade.h:25
-msgid "_One day"
+msgid "_Mail"
msgstr ""
#: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
+msgid "_News Feeds"
msgstr ""
#: my-evolution/my-evolution.glade.h:27
-msgid "_Schedule"
+msgid "_One day"
msgstr ""
#: my-evolution/my-evolution.glade.h:28
-msgid "_Show full path for folders"
+msgid "_Schedule"
msgstr ""
#: my-evolution/my-evolution.glade.h:29
@@ -10398,27 +10857,27 @@ msgstr ""
msgid "The Evolution shell."
msgstr "Cannot initialise the Evolution shell."
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:200
msgid "Show Details"
msgstr ""
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:202
msgid "Cancel Operation"
msgstr ""
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
msgid "Inbox"
msgstr ""
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:176
msgid "Outbox"
msgstr ""
-#: shell/e-local-storage.c:593
+#: shell/e-local-storage.c:624
msgid "Local Folders"
msgstr ""
-#: shell/e-setup.c:125 shell/e-setup.c:196
+#: shell/e-setup.c:125
msgid "Evolution installation"
msgstr ""
@@ -10436,15 +10895,7 @@ msgstr ""
msgid "Could not update files correctly"
msgstr ""
-#: shell/e-setup.c:200
-msgid "This seems to be the first time you are running Evolution."
-msgstr ""
-
-#: shell/e-setup.c:201
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-
-#: shell/e-setup.c:220
+#: shell/e-setup.c:193
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -10452,14 +10903,14 @@ msgid ""
"Error: %s"
msgstr ""
-#: shell/e-setup.c:235
+#: shell/e-setup.c:208
#, c-format
msgid ""
"An error occurred in copying files into\n"
"`%s'."
msgstr ""
-#: shell/e-setup.c:309
+#: shell/e-setup.c:282
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -10467,7 +10918,7 @@ msgid ""
"of the Evolution user files."
msgstr ""
-#: shell/e-setup.c:323
+#: shell/e-setup.c:296
msgid ""
"Evolution has detected an old\n"
"Executive-Summary directory.\n"
@@ -10476,7 +10927,7 @@ msgid ""
"Do you want me to remove this directory?"
msgstr ""
-#: shell/e-setup.c:348
+#: shell/e-setup.c:321
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -10496,56 +10947,56 @@ msgstr ""
msgid "Cannot move a folder into one of its descendants."
msgstr ""
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:294
#, c-format
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:299
#, fuzzy
msgid "Copy folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-folder-commands.c:328
+#: shell/e-shell-folder-commands.c:337
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:333
+#: shell/e-shell-folder-commands.c:342
msgid "Move folder"
msgstr ""
-#: shell/e-shell-folder-commands.c:358
+#: shell/e-shell-folder-commands.c:367
#, c-format
msgid ""
"Cannot delete folder:\n"
"%s"
msgstr ""
-#: shell/e-shell-folder-commands.c:374
+#: shell/e-shell-folder-commands.c:383
#, c-format
msgid "Delete folder '%s'"
msgstr ""
#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:384
+#: shell/e-shell-folder-commands.c:393
#, c-format
msgid "Are you sure you want to remove the '%s' folder?"
msgstr ""
#. Popup a dialog asking what the user would like to rename
#. the folder to
-#: shell/e-shell-folder-commands.c:459
+#: shell/e-shell-folder-commands.c:468
#, c-format
msgid "Rename folder '%s'"
msgstr ""
-#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:472
msgid "Rename"
msgstr ""
#. Make, pack the label
-#: shell/e-shell-folder-commands.c:471
+#: shell/e-shell-folder-commands.c:480
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
msgid "Folder name:"
msgstr ""
@@ -10557,11 +11008,28 @@ msgid ""
"%s"
msgstr ""
-#: shell/e-shell-folder-creation-dialog.c:168
-msgid "The specified folder name is not valid."
+#: shell/e-shell-folder-creation-dialog.c:126
+msgid "No folder name specified."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:132
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:137
+msgid "Folder cannot contain the directory separator."
msgstr ""
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:142
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:180
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:300
msgid "Evolution - Create new folder"
msgstr ""
@@ -10575,11 +11043,11 @@ msgstr ""
msgid "New..."
msgstr ""
-#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
+#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
msgid "(Untitled)"
msgstr ""
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:102
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -10590,7 +11058,7 @@ msgstr ""
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:197
#, c-format
msgid ""
"Importing %s\n"
@@ -10598,99 +11066,123 @@ msgid ""
"Waiting 5 seconds to retry."
msgstr ""
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
#, c-format
msgid ""
"Importing %s\n"
"Importing item %d."
msgstr ""
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:351
+#, c-format
+msgid "File %s does not exist"
+msgstr ""
+
+#: shell/e-shell-importer.c:363
+msgid "You may only import to local folders"
+msgstr ""
+
+#: shell/e-shell-importer.c:378
#, c-format
msgid ""
"There is no importer that is able to handle\n"
"%s"
msgstr ""
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:388
msgid "Importing"
msgstr ""
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:396
#, c-format
msgid ""
"Importing %s.\n"
"Starting %s"
msgstr ""
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:409
#, c-format
msgid "Error starting %s"
msgstr ""
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:428
#, c-format
msgid "Error loading %s"
msgstr ""
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:445
#, c-format
msgid ""
"Importing %s\n"
"Importing item 1."
msgstr ""
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:515
msgid "Automatic"
msgstr ""
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:566
msgid "Filename:"
msgstr ""
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:571
msgid "Select a file"
msgstr ""
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:581
msgid "File type:"
msgstr ""
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:645
#, fuzzy
msgid "Select folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-importer.c:624
+#: shell/e-shell-importer.c:646
msgid "Select a destination folder for importing this data"
msgstr ""
-#: shell/e-shell-offline-handler.c:564
+#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:562
msgid "Closing connections..."
msgstr ""
-#: shell/e-shell-startup-wizard.c:144
+#: shell/e-shell-startup-wizard.c:159
#, c-format
msgid ""
"Could not start the Evolution Mailer Wizard interface\n"
"%s"
msgstr ""
-#: shell/e-shell-startup-wizard.c:153
+#: shell/e-shell-startup-wizard.c:168
#, fuzzy
msgid "Cannot initialize the Evolution Mailer Wizard interface"
msgstr "Cannot initialise Evolution's mail storage hash."
-#: shell/e-shell-startup-wizard.c:558
+#: shell/e-shell-startup-wizard.c:582
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-startup-wizard.c:561
+#: shell/e-shell-startup-wizard.c:585
msgid "Starting Intelligent Importers"
msgstr ""
+#: shell/e-shell-startup-wizard.c:703
+#, c-format
+msgid "From %s:"
+msgstr ""
+
+#: shell/e-shell-startup-wizard.c:745
+msgid ""
+"Please select the information\n"
+"that you would like to import"
+msgstr ""
+
#: shell/e-shell-view-menu.c:183
msgid "Bug buddy was not found in your $PATH."
msgstr ""
@@ -10699,200 +11191,224 @@ msgstr ""
msgid "Bug buddy could not be run."
msgstr ""
+#: shell/e-shell-view-menu.c:217
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Cannot initialise the Evolution shell."
+
#: shell/e-shell-view-menu.c:219
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr ""
#: shell/e-shell-view-menu.c:221
msgid ""
-"Evolution is a suite of groupware applications\n"
+"Ximian Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
"within the GNOME desktop environment."
msgstr ""
-#: shell/e-shell-view-menu.c:423
+#: shell/e-shell-view-menu.c:424
msgid "Go to folder..."
msgstr ""
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:425
msgid "Select the folder that you want to open"
msgstr ""
-#: shell/e-shell-view-menu.c:569
+#: shell/e-shell-view-menu.c:570
msgid "Create a new shortcut"
msgstr ""
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:571
msgid "Select the folder you want the shortcut to point to:"
msgstr ""
-#: shell/e-shell-view-menu.c:684
+#: shell/e-shell-view-menu.c:685
msgid "Work Online"
msgstr ""
-#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: ui/evolution.xml.h:30
msgid "Work Offline"
msgstr ""
-#: shell/e-shell-view.c:184
+#: shell/e-shell-view.c:214
msgid "(No folder displayed)"
msgstr ""
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1478
#, c-format
-msgid "%s - Evolution %s"
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:1480
+msgid "(None)"
msgstr ""
-#: shell/e-shell-view.c:1461
+#: shell/e-shell-view.c:1485
#, c-format
-msgid "%s - Evolution %s [%s]"
+msgid "%s - Ximian Evolution %s"
msgstr ""
-#: shell/e-shell-view.c:1499
-msgid "Evolution is currently online. Click on this button to work offline."
+#: shell/e-shell-view.c:1487
+#, c-format
+msgid "%s - Ximian Evolution %s [%s]"
msgstr ""
-#: shell/e-shell-view.c:1506
-msgid "Evolution is in the process of going offline."
+#: shell/e-shell-view.c:1527
+msgid ""
+"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-view.c:1512
-msgid "Evolution is currently offline. Click on this button to work online."
+#: shell/e-shell-view.c:1534
+msgid "Ximian Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell.c:509
+#: shell/e-shell-view.c:1540
+msgid ""
+"Ximian Evolution is currently offline. Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:560
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr ""
-#: shell/e-shell.c:1438
+#: shell/e-shell.c:1496
#, c-format
msgid ""
"Ooops! The views for `%s' have died unexpectedly. :-(\n"
"This probably means that the %s component has crashed."
msgstr ""
-#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
msgid "OK"
msgstr ""
-#: shell/e-shell.c:1644
+#: shell/e-shell.c:1702
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:1646
+#: shell/e-shell.c:1704
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1706
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:1650 shell/e-storage.c:491
+#: shell/e-shell.c:1708 shell/e-storage.c:491
msgid "Generic error"
msgstr ""
-#: shell/e-shortcuts-view.c:72
+#: shell/e-shortcuts-view.c:75
msgid "Create new shortcut group"
msgstr ""
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:76
msgid "Group name:"
msgstr ""
-#: shell/e-shortcuts-view.c:171
+#: shell/e-shortcuts-view.c:176
#, c-format
msgid ""
"Do you really want to remove group\n"
"`%s' from the shortcut bar?"
msgstr ""
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:181
msgid "Don't remove"
msgstr ""
-#: shell/e-shortcuts-view.c:204
+#: shell/e-shortcuts-view.c:210
msgid "Rename Shortcut Group"
msgstr ""
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:211
msgid "Rename selected shortcut group to:"
msgstr ""
-#: shell/e-shortcuts-view.c:218
+#: shell/e-shortcuts-view.c:225
msgid "_Small Icons"
msgstr ""
-#: shell/e-shortcuts-view.c:219
+#: shell/e-shortcuts-view.c:226
msgid "Show the shortcuts as small icons"
msgstr ""
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:228
msgid "_Large Icons"
msgstr ""
-#: shell/e-shortcuts-view.c:222
+#: shell/e-shortcuts-view.c:229
msgid "Show the shortcuts as large icons"
msgstr ""
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:240
msgid "_New Group..."
msgstr ""
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:241
msgid "Create a new shortcut group"
msgstr ""
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:243
msgid "_Remove this Group..."
msgstr ""
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:244
msgid "Remove this shortcut group"
msgstr ""
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:246
msgid "Re_name this Group..."
msgstr ""
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:247
msgid "Rename this shortcut group"
msgstr ""
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
msgid "_Hide the Shortcut Bar"
msgstr ""
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:253
msgid "Hide the shortcut bar"
msgstr ""
-#: shell/e-shortcuts-view.c:365
+#: shell/e-shortcuts-view.c:372
msgid "Rename shortcut"
msgstr ""
-#: shell/e-shortcuts-view.c:366
+#: shell/e-shortcuts-view.c:373
msgid "Rename selected shortcut to:"
msgstr ""
-#: shell/e-shortcuts-view.c:378
+#: shell/e-shortcuts-view.c:385
msgid "Open the folder linked to this shortcut"
msgstr ""
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
-msgid "Open in New Window"
+#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+msgid "Open in New _Window"
msgstr ""
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:387
msgid "Open the folder linked to this shortcut in a new window"
msgstr ""
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:390
+msgid "_Rename"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:390
msgid "Rename this shortcut"
msgstr ""
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:392
+msgid "Re_move"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:392
msgid "Remove this shortcut from the shortcut bar"
msgstr ""
@@ -10900,7 +11416,7 @@ msgstr ""
msgid "Error saving shortcuts."
msgstr ""
-#: shell/e-shortcuts.c:1040
+#: shell/e-shortcuts.c:1044
msgid "Shortcuts"
msgstr ""
@@ -10952,12 +11468,12 @@ msgstr ""
msgid "Cannot make a folder a child of one of its descendants"
msgstr ""
-#: shell/e-task-widget.c:170
+#: shell/e-task-widget.c:192
#, c-format
msgid "%s (...)"
msgstr ""
-#: shell/e-task-widget.c:175
+#: shell/e-task-widget.c:197
#, c-format
msgid "%s (%d%% complete)"
msgstr ""
@@ -10986,6 +11502,33 @@ msgstr ""
msgid "Specify where to create the folder:"
msgstr ""
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "First Run Setup Assistant"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Importing Data"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:8
+msgid "Setup Assistant"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:9
+msgid "Timezone "
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:10
+msgid ""
+"Welcome to the Evolution first run setup assistant\n"
+"\n"
+"This assistant will help you get started"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:13
+msgid "Your configuration is complete."
+msgstr ""
+
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr ""
@@ -11029,13 +11572,17 @@ msgstr ""
msgid "Evolution can import data from the following files:"
msgstr ""
-#: shell/main.c:95
+#: shell/main.c:82
+msgid "Evolution is now exiting ..."
+msgstr ""
+
+#: shell/main.c:153
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
+"of the Ximian Evolution groupware suite.\n"
"\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
+"Ximian Evolution is not yet complete. It's getting close, but there are\n"
"places where features are either missing or only half working. \n"
"\n"
"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -11046,31 +11593,31 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
-#: shell/main.c:116
+#: shell/main.c:174
msgid ""
"Thanks\n"
-"The Evolution Team\n"
+"The Ximian Evolution Team\n"
msgstr ""
-#: shell/main.c:173
+#: shell/main.c:231
#, fuzzy
-msgid "Cannot access the Evolution shell."
+msgid "Cannot access the Ximian Evolution shell."
msgstr "Cannot initialise the Evolution shell."
-#: shell/main.c:184
+#: shell/main.c:242
#, fuzzy, c-format
-msgid "Cannot initialize the Evolution shell: %s"
+msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Cannot initialise the Evolution shell."
-#: shell/main.c:228
+#: shell/main.c:286
msgid "Disable splash screen"
msgstr ""
-#: shell/main.c:229
+#: shell/main.c:287
msgid "Send the debugging output of all components to a file."
msgstr ""
-#: shell/main.c:271
+#: shell/main.c:329
msgid "Cannot initialize the Bonobo component system."
msgstr "Cannot initialise the Bonobo component system."
@@ -11180,31 +11727,31 @@ msgstr ""
msgid "_Contact List"
msgstr ""
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
msgid "_Forward Contact..."
msgstr ""
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
#: ui/my-evolution.xml.h:7
msgid "_Print..."
msgstr ""
-#: ui/evolution-addressbook.xml.h:37
+#: ui/evolution-addressbook.xml.h:38
msgid "_Save as VCard"
msgstr ""
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:39
msgid "_Search for Contacts"
msgstr ""
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:40
msgid "_Select All"
msgstr ""
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
#: ui/my-evolution.xml.h:9
msgid "_Tools"
msgstr ""
@@ -11317,11 +11864,11 @@ msgstr ""
msgid "_Calendar Settings..."
msgstr ""
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:42
msgid "_Publish Free/Busy Information"
msgstr ""
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:43
msgid "_Task..."
msgstr ""
@@ -11344,7 +11891,7 @@ msgid "Delete this item"
msgstr ""
#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
msgid "Main toolbar"
msgstr ""
@@ -11360,14 +11907,13 @@ msgstr ""
msgid "Print..."
msgstr ""
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
#: ui/evolution-message-composer.xml.h:19
#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
msgid "Save"
msgstr ""
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
msgid "Save and Close"
msgstr ""
@@ -11384,7 +11930,7 @@ msgstr ""
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:49
#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
msgid "_File"
msgstr ""
@@ -11392,7 +11938,7 @@ msgstr ""
msgid "Print En_velope..."
msgstr ""
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:7
#: ui/evolution-contact-list-editor.xml.h:6
#: ui/evolution-message-composer.xml.h:21
msgid "Save _As..."
@@ -11646,23 +12192,23 @@ msgstr ""
msgid "Threaded Message list"
msgstr ""
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
msgid "_Expunge"
msgstr ""
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
msgid "_Folder"
msgstr ""
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
msgid "_Invert Selection"
msgstr ""
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
msgid "_Properties..."
msgstr ""
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:31
msgid "_Threaded Message List"
msgstr ""
@@ -11907,7 +12453,7 @@ msgid "Reply to All"
msgstr ""
#: ui/evolution-mail-message.xml.h:70
-msgid "S_earch Message"
+msgid "S_earch Message..."
msgstr ""
#: ui/evolution-mail-message.xml.h:71
@@ -12007,7 +12553,7 @@ msgid "_Close"
msgstr "Colours"
#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
msgid "_View"
msgstr ""
@@ -12198,7 +12744,7 @@ msgstr ""
msgid "_Security"
msgstr ""
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
msgid "_Help"
msgstr ""
@@ -12278,12 +12824,12 @@ msgstr ""
msgid "Tasks Settings..."
msgstr ""
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-tasks.xml.h:18
msgid "_Task"
msgstr ""
#: ui/evolution.xml.h:1
-msgid "About Evolution..."
+msgid "About Ximian Evolution..."
msgstr ""
#: ui/evolution.xml.h:2
@@ -12324,114 +12870,115 @@ msgid "E_xit"
msgstr ""
#: ui/evolution.xml.h:13
-msgid "Evolution _FAQ"
+msgid "Evolution _Window"
msgstr ""
#: ui/evolution.xml.h:14
-msgid "Evolution _Window"
+msgid "Exit the program"
msgstr ""
#: ui/evolution.xml.h:15
-msgid "Exit the program"
+msgid "Import an external file format"
msgstr ""
-#: ui/evolution.xml.h:16
-msgid "Import an external file format"
+#: ui/evolution.xml.h:17
+msgid "Move this folder to another place"
msgstr ""
#: ui/evolution.xml.h:18
-msgid "Move this folder to another place"
+msgid "Open in New Window"
msgstr ""
#: ui/evolution.xml.h:20
-msgid "Open in New _Window"
+msgid "Open this folder in an other window"
msgstr ""
#: ui/evolution.xml.h:21
-msgid "Open this folder in an other window"
+msgid "Show information about Ximian Evolution"
msgstr ""
#: ui/evolution.xml.h:22
-msgid "Show information about Evolution"
-msgstr ""
-
-#: ui/evolution.xml.h:23
msgid "Submit Bug Report"
msgstr ""
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
msgid "Submit _Bug Report"
msgstr ""
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
msgid "Submit a bug report using Bug Buddy"
msgstr ""
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
msgid "Toggle"
msgstr ""
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
msgid "Toggle whether to show the folder bar"
msgstr ""
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
msgid "Toggle whether to show the shortcut bar"
msgstr ""
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
msgid "Toggle whether we are working offline."
msgstr ""
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
msgid "View the selected folder"
msgstr ""
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Ximian Evolution _FAQ"
+msgstr "Cannot initialise the Evolution shell."
+
#: ui/evolution.xml.h:32
-msgid "_About Evolution..."
+msgid "_About Ximian Evolution..."
msgstr ""
#: ui/evolution.xml.h:34
msgid "_Copy..."
msgstr ""
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
msgid "_Folder Bar"
msgstr ""
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
msgid "_Go to Folder..."
msgstr ""
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
msgid "_Import File..."
msgstr ""
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
msgid "_Move..."
msgstr ""
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
msgid "_New"
msgstr ""
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
msgid "_New Folder"
msgstr ""
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:45
msgid "_Rename..."
msgstr ""
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:46
msgid "_Shortcut"
msgstr ""
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:47
msgid "_Shortcut Bar"
msgstr ""
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
msgid "_Work Offline"
msgstr ""
@@ -12506,81 +13053,6 @@ msgid ""
" Use the right mouse button to zoom out."
msgstr ""
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
-msgid "Out of Office"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
-msgid "_Options"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
-msgid "Show _Only Working Hours"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
-msgid "Show _Zoomed Out"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
-msgid "_Update Free/Busy"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
-msgid "_<<"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
-msgid "_Autopick"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
-msgid ">_>"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
-msgid "_All People and Resources"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
-msgid "All _People and One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
-msgid "_Required People"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
-msgid "Required People and _One Resource"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
-msgid "Meeting _start time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
-msgid "Meeting _end time:"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
-msgid "All Attendees"
-msgstr ""
-
#: widgets/menus/gal-view-menus.c:218
msgid "_Current View"
msgstr ""
@@ -12749,32 +13221,47 @@ msgstr ""
msgid "The Personal Calendar Server; calendar factory"
msgstr ""
-#: wombat/wombat.c:173
+#: wombat/wombat.c:175
#, fuzzy
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "Could not initialise Bonobo"
-#: wombat/wombat.c:185
+#: wombat/wombat.c:187
#, fuzzy
msgid "init_corba(): could not initialize GNOME"
msgstr "Could not initialise Bonobo"
-#: wombat/wombat.c:198
+#: wombat/wombat.c:200
#, fuzzy
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
#, fuzzy
-#~ msgid "Colors for Tasks"
-#~ msgstr "Colours for display"
+#~ msgid "Factory for the Evolution addressbook component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Synchronizing folder"
+#~ msgstr "Synchronising \"%s\""
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%m/%d/%Y"
#, fuzzy
-#~ msgid "My Evolution"
-#~ msgstr "Cannot initialise the Evolution shell."
+#~ msgid "Factory for the Evolution mail component."
+#~ msgstr "Cannot initialise Evolution's mail component."
#, fuzzy
-#~ msgid "Compose"
-#~ msgstr "Colours"
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Colors for Tasks"
+#~ msgstr "Colours for display"
#, fuzzy
#~ msgid "I don't recognize this type of calendar component."
@@ -12785,10 +13272,6 @@ msgstr "Could not initialise Bonobo"
#~ msgstr "Organisation:"
#, fuzzy
-#~ msgid "Scanning IMAP folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
#~ msgid "Factory for the test bonobo component."
#~ msgstr "Cannot initialise Evolution's mail component."