aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po1955
1 files changed, 997 insertions, 958 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 09e9211f68..986f7dd8b0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2002-10-07 17:25-0400\n"
+"POT-Creation-Date: 2002-10-28 16:49-0500\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
"Language-Team: \n"
@@ -31,22 +31,23 @@ msgid "Imports VCard files into Evolution."
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
msgid "File As"
msgstr ""
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
-#: my-evolution/e-summary-table.c:59
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
msgid "Name"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
msgid "Email"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1756
msgid "Primary"
msgstr ""
@@ -56,16 +57,16 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:64
#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/widgets/e-addressbook-view.c:390
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
msgid "Assistant"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:65
#: addressbook/backend/ebook/e-card-simple.c:70
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/contact-editor/e-contact-editor.c:1804
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1809
msgid "Business"
msgstr ""
@@ -75,12 +76,12 @@ msgid "Bus"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
msgid "Callback"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
msgid "Company"
msgstr ""
@@ -92,13 +93,13 @@ msgstr "Colours"
#: addressbook/backend/ebook/e-card-simple.c:68
#: addressbook/backend/ebook/e-card-simple.c:71
#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/contact-editor/e-contact-editor.c:1805
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1810
msgid "Home"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Organization"
msgstr "Organisation"
@@ -108,19 +109,19 @@ msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:72
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
msgid "Mobile"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
msgid "Car"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:74
#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Business Fax"
msgstr ""
@@ -129,13 +130,13 @@ msgid "Bus Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
msgid "Home Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
msgid "Business 2"
msgstr ""
@@ -144,68 +145,68 @@ msgid "Bus 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
msgid "Home 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: addressbook/gui/widgets/e-addressbook-view.c:374
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
msgid "ISDN"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:79
#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1806
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/contact-editor/e-contact-editor.c:1811
msgid "Other"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
-#: addressbook/gui/widgets/e-addressbook-view.c:376
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
msgid "Other Fax"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.c:377
+#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
msgid "Pager"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-#: addressbook/gui/widgets/e-addressbook-view.c:378
+#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
msgid "Radio"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.c:379
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
msgid "Telex"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:380
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
msgid "TTY"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:86
#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1779
-#: addressbook/gui/widgets/e-addressbook-view.c:382
+#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Email 2"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:87
#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-#: addressbook/gui/widgets/e-addressbook-view.c:383
+#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
msgid "Email 3"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:384
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
msgid "Web Site"
msgstr ""
@@ -214,7 +215,7 @@ msgid "Url"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:385
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
msgid "Department"
msgstr ""
@@ -223,7 +224,7 @@ msgid "Dep"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:386
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Office"
msgstr ""
@@ -232,12 +233,12 @@ msgid "Off"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:387
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
msgid "Title"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
msgid "Profession"
msgstr ""
@@ -246,7 +247,7 @@ msgid "Prof"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:389
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
msgid "Manager"
msgstr ""
@@ -259,7 +260,7 @@ msgid "Ass"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:391
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
msgid "Nickname"
msgstr ""
@@ -268,12 +269,12 @@ msgid "Nick"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:392
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
msgid "Spouse"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:393
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Note"
msgstr ""
@@ -286,7 +287,7 @@ msgid "CALUri"
msgstr ""
#: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
msgid "Free-busy URL"
msgstr ""
@@ -325,11 +326,11 @@ msgstr ""
msgid "Unnamed List"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:2681
+#: addressbook/backend/ebook/e-card.c:2683
msgid "Multiple VCards"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:2689
+#: addressbook/backend/ebook/e-card.c:2691
#, c-format
msgid "VCard for %s"
msgstr ""
@@ -554,10 +555,18 @@ msgstr ""
msgid "Server did not respond with valid schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1640
+#: addressbook/gui/component/addressbook-config.c:1630
msgid "LDAP was not enabled in this build of Evolution"
msgstr ""
+#: addressbook/gui/component/addressbook-config.etspec.h:1
+msgid "Account Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.etspec.h:2
+msgid "Server Name"
+msgstr ""
+
#: addressbook/gui/component/addressbook-factory.c:72
#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
#, fuzzy
@@ -689,7 +698,7 @@ msgstr ""
#: addressbook/gui/component/e-address-popup.c:474
#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1778
+#: addressbook/gui/contact-editor/e-contact-editor.c:1783
msgid "Primary Email"
msgstr ""
@@ -792,7 +801,7 @@ msgid "Addressbook Sources"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
msgid "Always"
msgstr ""
@@ -879,7 +888,7 @@ msgid "Mappings"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
msgid "Never"
msgstr ""
@@ -935,8 +944,8 @@ msgstr ""
#. No time range is set, so don't start a query
#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1242
+#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
+#: calendar/gui/e-week-view.c:1240
msgid "Searching"
msgstr ""
@@ -981,41 +990,48 @@ msgstr ""
msgid ""
"Selecting this option will let you change Evolution's default settings for "
"LDAP\n"
-"searches, and for creating and editting contacts. "
+"searches, and for creating and editing contacts. "
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:66
msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid "Step 1: Server Information"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
#, fuzzy
msgid "Step 2: Connecting to Server"
msgstr "Synchronise \"%s\""
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "Step 3: Searching the Directory"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid "Step 4: Display Name"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid "Sub"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:74
msgid "Supported Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"The first step in configuring an LDAP server is to provide its name, and "
"your log in\n"
@@ -1023,7 +1039,7 @@ msgid ""
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:77
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -1032,7 +1048,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1040,7 +1056,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:82
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -1050,7 +1066,7 @@ msgid ""
"your base."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1060,34 +1076,34 @@ msgid ""
"need help finding this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
"too large will slow down your addressbook."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
"server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
"It is for display purposes only. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:97
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -1095,11 +1111,11 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:100
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:101
msgid ""
"To add an attribute to the DN, select it from the list and click the \"Add "
"Attribute\" button.\n"
@@ -1108,70 +1124,70 @@ msgid ""
"that you add to the directory on the LDAP server. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
msgid "U_se SSL/TLS:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
msgid "Using distinguished name (DN)"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
msgid "Using email address"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:105
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:107
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
msgid "Whenever Possible"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
#: addressbook/gui/contact-editor/contact-editor.glade.h:30
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
msgid "_Add"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
msgid "_Add ->"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
msgid "_Add Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
msgid "_Add to DN"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
msgid "_Always"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
msgid "_Delete Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
#, fuzzy
msgid "_Display name:"
msgstr "Synchronising \"%s\""
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
msgid "_Distinguished Name (DN):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:116
msgid "_Don't use SSL/TLS"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
msgid "_Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:116 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:41
@@ -1180,93 +1196,93 @@ msgstr ""
msgid "_Edit"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
msgid "_Edit Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
#, fuzzy
msgid "_Evolution attribute:"
msgstr "Cannot initialise the Evolution shell."
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
msgid "_If necessary "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
msgid "_LDAP attribute:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:123
msgid "_LDAP attributes:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
msgid "_Log in method:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
msgid "_More Options >>"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
msgid "_Port number:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
msgid "_Restore Defaults"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
msgid "_Search base:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
msgid "_Server name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
msgid "_Timeout (minutes):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
msgid "account-druid"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
msgid "account-editor"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
msgid "cards"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
#, fuzzy
msgid "connecting-tab"
msgstr "Synchronise \"%s\""
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
msgid "dn-customization-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
msgid "edit_server_window_simple"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
msgid "general-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
msgid "mappings-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:139
msgid "objectclasses-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:140
msgid "searching-tab"
msgstr ""
@@ -1280,9 +1296,9 @@ msgstr ""
#. Fixme: Ditto
#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:712
-#: composer/e-msg-composer-attachment-bar.c:515 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:699
+#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
#: shell/e-shortcuts-view.c:178
msgid "Remove"
msgstr ""
@@ -1312,11 +1328,11 @@ msgstr ""
msgid "Unnamed Contact"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:514
+#: addressbook/gui/component/select-names/e-select-names.c:503
msgid "Select Contacts from Addressbook"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:576
+#: addressbook/gui/component/select-names/e-select-names.c:564
msgid "Find contact in"
msgstr ""
@@ -1446,9 +1462,9 @@ msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3770
-#: calendar/gui/e-week-view.c:3566 filter/filter.glade.h:15
-#: mail/folder-browser.c:1747 mail/mail-config.glade.h:151
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
+#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
+#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
@@ -2525,11 +2541,11 @@ msgstr ""
msgid "Save Contact as VCard"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
msgid "TTY/TDD"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2435
+#: addressbook/gui/contact-editor/e-contact-editor.c:2440
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr ""
@@ -2543,7 +2559,7 @@ msgid "Edit Full"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
msgid "Full Name"
msgstr ""
@@ -2552,15 +2568,15 @@ msgid "E-mail"
msgstr ""
#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
msgid "card.vcf"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#: addressbook/gui/contact-editor/e-contact-save-as.c:183
msgid "list"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#: addressbook/gui/contact-editor/e-contact-save-as.c:221
#, c-format
msgid ""
"%s already exists\n"
@@ -2713,6 +2729,11 @@ msgstr ""
msgid "Save List as VCard"
msgstr ""
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#, fuzzy
+msgid "Contact"
+msgstr "Organisation:"
+
#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
msgid "Add Anyway"
msgstr ""
@@ -2764,20 +2785,20 @@ msgstr ""
msgid "Search"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:146
msgid "No cards"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:145
+#: addressbook/gui/widgets/e-addressbook-model.c:149
msgid "1 card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:148
+#: addressbook/gui/widgets/e-addressbook-model.c:152
#, c-format
msgid "%d cards"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:404
+#: addressbook/gui/widgets/e-addressbook-model.c:408
msgid "Error getting book view"
msgstr ""
@@ -2795,8 +2816,8 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:36
#: camel/providers/imap/camel-imap-command.c:309
#: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2185
-#: shell/e-storage.c:588 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
+#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
msgid "Unknown error"
msgstr ""
@@ -2804,7 +2825,7 @@ msgstr ""
msgid "Repository offline"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
#: shell/evolution-shell-component.c:1171
msgid "Permission denied"
msgstr ""
@@ -2822,11 +2843,13 @@ msgid "Protocol not supported"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
#: camel/camel-service.c:739 camel/camel-service.c:779
#: camel/camel-service.c:847 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:513
msgid "Cancelled"
msgstr ""
@@ -2874,7 +2897,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:101
#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1672
+#: addressbook/gui/widgets/e-addressbook-view.c:1588
msgid "Error removing card"
msgstr ""
@@ -2911,153 +2934,93 @@ msgstr ""
msgid "Copy cards to"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "* Click here to add a contact *"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Primary Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Assistant Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Business Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Callback Phone"
-msgstr ""
-
#: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Company Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Home Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Business Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Home Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Mobile Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Car Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:372
-msgid "Business Phone 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:373
-msgid "Home Phone 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:375
-msgid "Other Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:381
-msgid "Other Address"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:461
#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
msgid "Addressbook"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:722
-#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1874
+#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:813
+#: addressbook/gui/widgets/e-addressbook-view.c:1790
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:800
msgid "New Contact..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:801
msgid "New Contact List..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:804
msgid "Go to Folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:805
msgid "Import..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:807
msgid "Search for Contacts..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/gui/widgets/e-addressbook-view.c:808
msgid "Addressbook Sources..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:810
msgid "Pilot Settings..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:814
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: addressbook/gui/widgets/e-addressbook-view.c:815
msgid "Send Message to Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: addressbook/gui/widgets/e-addressbook-view.c:816
#: 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:67
#: ui/my-evolution.xml.h:1
msgid "Print"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:916
+#: addressbook/gui/widgets/e-addressbook-view.c:818
msgid "Print Envelope"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:822
#, fuzzy
msgid "Copy to folder..."
msgstr "Synchronising \"%s\""
-#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:823
#, fuzzy
msgid "Move to folder..."
msgstr "Synchronising \"%s\""
-#: addressbook/gui/widgets/e-addressbook-view.c:924
+#: addressbook/gui/widgets/e-addressbook-view.c:826
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:925
+#: addressbook/gui/widgets/e-addressbook-view.c:827
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:926
+#: addressbook/gui/widgets/e-addressbook-view.c:828
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
msgid "Paste"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
#: ui/evolution-contact-editor.xml.h:2
@@ -3065,8 +3028,8 @@ msgstr ""
msgid "Delete"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: addressbook/gui/widgets/e-addressbook-view.c:833
+#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
msgid "Current View"
msgstr ""
@@ -3074,7 +3037,7 @@ msgstr ""
#. 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:965
+#: addressbook/gui/widgets/e-addressbook-view.c:867
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 ""
@@ -3082,11 +3045,11 @@ msgstr ""
#. 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:970
+#: addressbook/gui/widgets/e-addressbook-view.c:872
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:1374
+#: addressbook/gui/widgets/e-addressbook-view.c:1290
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -3094,6 +3057,66 @@ msgid ""
"has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Home Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Address"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Other Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+msgid "Primary Phone"
+msgstr ""
+
#: addressbook/gui/widgets/e-minicard-control.c:185
#, c-format
msgid "and %d other cards."
@@ -3326,7 +3349,7 @@ msgid "High"
msgstr ""
#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1721
#: calendar/gui/dialogs/task-details-page.glade.h:10
#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
msgid "Normal"
@@ -3484,7 +3507,7 @@ msgid ""
msgstr ""
#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr ""
@@ -3536,7 +3559,7 @@ 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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
msgid "%a %d %b"
msgstr ""
@@ -3564,67 +3587,67 @@ msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
#: calendar/gui/e-calendar-table.c:397
msgid "Private"
msgstr ""
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
+#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
#: calendar/gui/e-calendar-table.c:398
msgid "Confidential"
msgstr ""
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
msgid "Public"
msgstr ""
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
msgid "N"
msgstr ""
-#: calendar/gui/calendar-model.c:536
+#: calendar/gui/calendar-model.c:542
msgid "S"
msgstr ""
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
msgid "E"
msgstr ""
-#: calendar/gui/calendar-model.c:538
+#: calendar/gui/calendar-model.c:544
msgid "W"
msgstr ""
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
#: calendar/gui/e-calendar-table.c:470
msgid "Free"
msgstr ""
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
#: calendar/gui/e-meeting-time-sel.c:438
#: shell/evolution-shell-component.c:1165
msgid "Busy"
msgstr ""
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
#: calendar/gui/dialogs/task-details-page.glade.h:11
#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
msgid "Not Started"
msgstr ""
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
msgid "In Progress"
msgstr ""
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
msgid "Completed"
msgstr ""
-#: calendar/gui/calendar-model.c:1049
+#: calendar/gui/calendar-model.c:1055
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -3632,32 +3655,32 @@ msgid ""
msgstr ""
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1709 mail/mail-account-gui.c:1230
+#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
msgid "None"
msgstr ""
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1723
msgid "Recurring"
msgstr ""
-#: calendar/gui/calendar-model.c:1719
+#: calendar/gui/calendar-model.c:1725
msgid "Assigned"
msgstr ""
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
#: calendar/gui/e-meeting-model.c:862
msgid "Yes"
msgstr ""
-#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
#: calendar/gui/e-meeting-model.c:863
msgid "No"
msgstr ""
@@ -3678,7 +3701,7 @@ msgstr ""
msgid "Month View"
msgstr ""
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
msgid "Calendar"
@@ -3700,8 +3723,8 @@ msgstr ""
#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:311
-#: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
+#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
+#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
#: shell/e-shortcuts.c:1063
msgid "Tasks"
msgstr ""
@@ -3718,51 +3741,51 @@ msgstr ""
msgid "Public folder containing to-do items"
msgstr ""
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
msgid "New appointment"
msgstr ""
-#: calendar/gui/component-factory.c:735
+#: calendar/gui/component-factory.c:750
msgid "_Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:736
+#: calendar/gui/component-factory.c:751
msgid "Create a new appointment"
msgstr ""
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
msgid "New meeting"
msgstr ""
-#: calendar/gui/component-factory.c:740
+#: calendar/gui/component-factory.c:755
msgid "_Meeting"
msgstr ""
-#: calendar/gui/component-factory.c:741
+#: calendar/gui/component-factory.c:756
msgid "Create a new meeting request"
msgstr ""
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
msgid "New task"
msgstr ""
-#: calendar/gui/component-factory.c:745
+#: calendar/gui/component-factory.c:760
msgid "_Task"
msgstr ""
-#: calendar/gui/component-factory.c:746
+#: calendar/gui/component-factory.c:761
msgid "Create a new task"
msgstr ""
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
msgid "New All Day Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:750
+#: calendar/gui/component-factory.c:765
msgid "All _Day Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:751
+#: calendar/gui/component-factory.c:766
msgid "Create a new all-day appointment"
msgstr ""
@@ -3972,7 +3995,7 @@ msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr ""
@@ -4001,7 +4024,7 @@ msgstr ""
msgid "hour(s)"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
msgid "minute(s)"
msgstr ""
@@ -4029,7 +4052,7 @@ msgstr ""
msgid "60 minutes"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
msgid "Alerts"
msgstr ""
@@ -4055,7 +4078,7 @@ msgid "Days"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1135
msgid "Friday"
msgstr ""
@@ -4068,7 +4091,7 @@ msgid "Minutes"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1131
msgid "Monday"
msgstr ""
@@ -4077,7 +4100,7 @@ msgid "S_un"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1128
+#: calendar/gui/dialogs/recurrence-page.c:1136
msgid "Saturday"
msgstr ""
@@ -4090,7 +4113,7 @@ msgid "Show week _numbers in date navigator"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1129
+#: calendar/gui/dialogs/recurrence-page.c:1137
msgid "Sunday"
msgstr ""
@@ -4108,7 +4131,7 @@ msgid "Task List"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1134
msgid "Thursday"
msgstr ""
@@ -4125,7 +4148,7 @@ msgid "Time format:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1132
msgid "Tuesday"
msgstr ""
@@ -4134,7 +4157,7 @@ msgid "W_eek starts:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1133
msgid "Wednesday"
msgstr ""
@@ -4176,7 +4199,7 @@ msgid "_Fri"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:155
msgid "_General"
msgstr ""
@@ -4310,61 +4333,61 @@ msgstr ""
msgid "Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
#, fuzzy
msgid "Could not update invalid object"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
msgid "Object not found, not updated"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
msgid "You don't have permissions to update this object"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
#, fuzzy
msgid "Could not update object"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
msgid "Edit Appointment"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
#, c-format
msgid "Appointment - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
#, c-format
msgid "Task - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
#, c-format
msgid "Journal entry - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3986
-#: calendar/gui/e-week-view.c:3765 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1221
+#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
+#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
msgid "Save as..."
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1321
-#: calendar/gui/dialogs/comp-editor.c:1345
-#: calendar/gui/dialogs/comp-editor.c:1369
+#: calendar/gui/dialogs/comp-editor.c:1322
+#: calendar/gui/dialogs/comp-editor.c:1346
+#: calendar/gui/dialogs/comp-editor.c:1370
msgid ""
"Changes made to this item may be discarded if an update arrives via email"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1396
+#: calendar/gui/dialogs/comp-editor.c:1397
msgid "Unable to obtain current version!"
msgstr ""
@@ -4563,7 +4586,7 @@ msgid "Member"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:905
+#: calendar/gui/e-itip-control.c:958
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr ""
@@ -4575,7 +4598,7 @@ 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:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
#: mail/message-list.etspec.h:12
msgid "Status"
msgstr ""
@@ -4650,44 +4673,48 @@ msgstr ""
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:999
+#: calendar/gui/dialogs/recurrence-page.c:898
+msgid "Recurrent date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1007
msgid "on"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1072
msgid "first"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
msgid "second"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1074
msgid "third"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1067
+#: calendar/gui/dialogs/recurrence-page.c:1075
msgid "fourth"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1068
+#: calendar/gui/dialogs/recurrence-page.c:1076
msgid "last"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1102
#, fuzzy
msgid "Other Date"
msgstr "Organisation:"
-#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
msgid "day"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
msgid "on the"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.c:1455
msgid "occurrences"
msgstr ""
@@ -4788,7 +4815,7 @@ msgid "Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:860
msgid "URL:"
msgstr ""
@@ -4810,9 +4837,9 @@ msgstr ""
msgid "Assignment"
msgstr ""
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
msgid "Description:"
msgstr ""
@@ -4879,13 +4906,13 @@ msgstr ""
msgid "100%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1919
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
+#: calendar/gui/e-week-view.c:1917
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3752
-#: calendar/gui/e-week-view.c:3548 mail/folder-browser.c:1720
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
+#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr ""
@@ -4894,30 +4921,30 @@ msgstr ""
msgid "_Save as..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3754
-#: calendar/gui/e-week-view.c:3522 calendar/gui/e-week-view.c:3550
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
+#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
msgid "_Print..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3759
-#: calendar/gui/e-week-view.c:3555 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
+#: calendar/gui/e-week-view.c:3552 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:994 calendar/gui/e-day-view.c:3760
-#: calendar/gui/e-week-view.c:3556 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3756
+#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:15
msgid "_Copy"
msgstr ""
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3723
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3526
-#: calendar/gui/e-week-view.c:3557 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:19
msgid "_Paste"
@@ -4943,8 +4970,8 @@ msgstr ""
msgid "_Delete Selected Tasks"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
-#: calendar/gui/e-week-view.c:4266
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
+#: calendar/gui/e-week-view.c:4240
msgid "Updating objects"
msgstr ""
@@ -4958,7 +4985,7 @@ msgid "Alarms"
msgstr ""
#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1109
+#: camel/camel-filter-driver.c:1096
msgid "Complete"
msgstr ""
@@ -5027,174 +5054,162 @@ 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:284 calendar/gui/e-day-view.c:1424
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
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:292 calendar/gui/e-day-view.c:1451
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
#: calendar/gui/e-week-view-main-item.c:347
msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
#: calendar/gui/print.c:791
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:380
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
#: calendar/gui/print.c:793
msgid "pm"
msgstr ""
-#: calendar/gui/e-day-view.c:3707
+#: calendar/gui/e-day-view.c:3705
msgid "New _Appointment"
msgstr ""
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
msgid "New Task"
msgstr ""
-#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr ""
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
-msgid "_Configure..."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
-msgid "_Configure Pilot..."
-msgstr ""
+#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Cannot initialise the Evolution shell."
-#: calendar/gui/e-day-view.c:3753 calendar/gui/e-week-view.c:3549
-#: mail/folder-browser.c:1722 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
+#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
msgid "_Save As..."
msgstr ""
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
+#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
+#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
+#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
msgid "Make this Occurrence _Movable"
msgstr ""
-#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
+#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
+#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
msgid "Delete _All Occurrences"
msgstr ""
-#: calendar/gui/e-day-view.c:4138 calendar/gui/e-week-view.c:3893
-#: shell/e-shell-view-menu.c:94
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-#: calendar/gui/e-day-view.c:4144 calendar/gui/e-week-view.c:3899
-#: shell/e-shell-view-menu.c:102
-#, c-format
-msgid "Error executing %s."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:590
+#: calendar/gui/e-itip-control.c:615
msgid "<b>Starts:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:600
+#: calendar/gui/e-itip-control.c:625
msgid "<b>Ends:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:638
msgid "<b>Completed:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:648
msgid "<b>Due:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
msgid "iCalendar Information"
msgstr ""
#. Title
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:700
msgid "iCalendar Error"
msgstr ""
-#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
msgid "An unknown person"
msgstr ""
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:817
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:832
msgid "<i>None</i>"
msgstr ""
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:842
#, fuzzy
msgid "Location:"
msgstr "Organisation"
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:856
msgid "Status:"
msgstr ""
-#: calendar/gui/e-itip-control.c:808 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:490
msgid "Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
+#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
msgid "Tentatively Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:816 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:506 calendar/gui/itip-utils.c:532
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
msgid "Declined"
msgstr ""
-#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
@@ -5205,289 +5220,299 @@ msgstr ""
msgid "Unknown"
msgstr ""
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:901
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:940
-#: calendar/gui/e-itip-control.c:953 calendar/gui/e-itip-control.c:966
+#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
msgid "Choose an action:"
msgstr ""
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:927
msgid "Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:875 calendar/gui/e-itip-control.c:906
-#: calendar/gui/e-itip-control.c:929 calendar/gui/e-itip-control.c:942
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-itip-control.c:968
-#: shell/e-shell.c:2175 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
+#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
msgid "OK"
msgstr ""
-#: calendar/gui/e-itip-control.c:902
+#: calendar/gui/e-itip-control.c:955
msgid "Accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:956
msgid "Tentatively accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:957
msgid "Decline"
msgstr ""
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:981
msgid "Send Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:941
+#: calendar/gui/e-itip-control.c:994
msgid "Update respondent status"
msgstr ""
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1007
msgid "Send Latest Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
+#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr ""
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1101
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1102
msgid "Meeting Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1107
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1109
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1110
msgid "Meeting Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1114
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1115
msgid "Meeting Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1119
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1120
msgid "Meeting Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1127
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1128
msgid "Meeting Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1076
+#: calendar/gui/e-itip-control.c:1135
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1136
msgid "Meeting Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1245
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1144
msgid "Bad Meeting Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1168
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1169
msgid "Task Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1174
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1176
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1112
+#: calendar/gui/e-itip-control.c:1177
msgid "Task Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1116
+#: calendar/gui/e-itip-control.c:1181
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1182
msgid "Task Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1186
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1187
msgid "Task Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr ""
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1195
msgid "Task Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1137
+#: calendar/gui/e-itip-control.c:1202
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1203
msgid "Task Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1211
msgid "Bad Task Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1230
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1231
msgid "Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1170
+#: calendar/gui/e-itip-control.c:1235
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1236
msgid "Free/Busy Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1240
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1241
msgid "Free/Busy Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1246
msgid "Bad Free/Busy Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1320
msgid "The message does not appear to be properly formed"
msgstr ""
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1382
msgid "The message contains only unsupported requests."
msgstr ""
-#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1441
msgid "The attachment has no viewable calendar items"
msgstr ""
-#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
+#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
msgid "There was an error on the CORBA system\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
msgid "Object could not be found\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1517
+#: calendar/gui/e-itip-control.c:1671
#, fuzzy
msgid "You do not have the right permissions to update the calendar\n"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-itip-control.c:1520
+#: calendar/gui/e-itip-control.c:1674
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1677
msgid "Calendar file could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
+#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1573
+#: calendar/gui/e-itip-control.c:1727
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
-#: calendar/gui/e-itip-control.c:1585
+#: calendar/gui/e-itip-control.c:1739
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1609
+#: calendar/gui/e-itip-control.c:1763
#, fuzzy
msgid "You don't have the right permissions to update the calendar\n"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1766
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1615
+#: calendar/gui/e-itip-control.c:1769
msgid "Attendee status could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1804
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
+#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
+#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
msgid "The item could not be sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1807
+#: calendar/gui/e-itip-control.c:1961
#, fuzzy
msgid "Select Calendar Folder"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-itip-control.c:1814
+#: calendar/gui/e-itip-control.c:1968
#, fuzzy
msgid "Select Tasks Folder"
msgstr "Synchronising \"%s\""
@@ -5681,8 +5706,8 @@ msgstr ""
msgid "Meeting _end time:"
msgstr ""
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/gnome-cal.c:2024
#, c-format
msgid "Opening tasks at %s"
msgstr ""
@@ -5697,12 +5722,12 @@ msgstr ""
msgid "The method required to load `%s' is not supported"
msgstr ""
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
#, fuzzy, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
#, c-format
msgid ""
"Error on %s:\n"
@@ -5721,27 +5746,27 @@ msgstr ""
msgid "Expunging"
msgstr ""
-#: calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-week-view.c:3513
msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/gnome-cal.c:1524
+#: calendar/gui/gnome-cal.c:1530
#, c-format
msgid "Could not open the folder in `%s'"
msgstr ""
-#: calendar/gui/gnome-cal.c:1535
+#: calendar/gui/gnome-cal.c:1541
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr ""
#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1575
+#: calendar/gui/gnome-cal.c:1581
#, fuzzy, c-format
msgid "Adding alarms for %s"
msgstr "Synchronising \"%s\""
-#: calendar/gui/gnome-cal.c:1761
+#: calendar/gui/gnome-cal.c:1767
#, c-format
msgid ""
"The calendar backend for\n"
@@ -5749,7 +5774,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1766
+#: calendar/gui/gnome-cal.c:1772
#, c-format
msgid ""
"The task backend for\n"
@@ -5757,12 +5782,12 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1990
+#: calendar/gui/gnome-cal.c:1996
#, c-format
msgid "Opening calendar at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:2029
+#: calendar/gui/gnome-cal.c:2035
#, fuzzy
msgid "Opening default tasks folder"
msgstr "Synchronising \"%s\""
@@ -5823,56 +5848,56 @@ msgstr ""
msgid "September"
msgstr ""
-#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
msgid "An organizer must be set."
msgstr ""
-#: calendar/gui/itip-utils.c:393
+#: calendar/gui/itip-utils.c:383
msgid "At least one attendee is necessary"
msgstr ""
-#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
msgid "Event information"
msgstr ""
-#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
msgid "Task information"
msgstr ""
-#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
+#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
msgid "Journal information"
msgstr ""
-#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
+#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
msgid "Free/Busy information"
msgstr ""
-#: calendar/gui/itip-utils.c:480
+#: calendar/gui/itip-utils.c:470
msgid "Calendar information"
msgstr ""
-#: calendar/gui/itip-utils.c:516
+#: calendar/gui/itip-utils.c:506
msgid "Updated"
msgstr ""
-#: calendar/gui/itip-utils.c:524
+#: calendar/gui/itip-utils.c:514
msgid "Refresh"
msgstr ""
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:518
msgid "Counter-proposal"
msgstr ""
-#: calendar/gui/itip-utils.c:596
+#: calendar/gui/itip-utils.c:586
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr ""
-#: calendar/gui/itip-utils.c:608
+#: calendar/gui/itip-utils.c:598
msgid "iCalendar information"
msgstr ""
-#: calendar/gui/itip-utils.c:766
+#: calendar/gui/itip-utils.c:756
msgid "You must be an attendee of the event."
msgstr ""
@@ -6109,8 +6134,8 @@ msgid "Print Calendar"
msgstr ""
#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
-#: my-evolution/e-summary.c:619
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
+#: my-evolution/e-summary.c:633
msgid "Print Preview"
msgstr ""
@@ -6139,8 +6164,8 @@ msgid ""
"Really erase these tasks?"
msgstr ""
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
-#: mail/mail-callbacks.c:2911
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
+#: mail/mail-callbacks.c:2912
msgid "Do not ask me again."
msgstr ""
@@ -7920,12 +7945,12 @@ msgstr ""
msgid "Syncing folders"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
#, c-format
msgid "Error executing filter: %s: %s"
msgstr ""
@@ -7952,17 +7977,17 @@ msgstr ""
msgid "Failed on message %d"
msgstr ""
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
#, fuzzy
msgid "Syncing folder"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:1071
+#: camel/camel-filter-driver.c:1058
#, c-format
msgid "Getting message %d of %d"
msgstr ""
-#: camel/camel-filter-driver.c:1086
+#: camel/camel-filter-driver.c:1073
#, c-format
msgid "Failed at message %d of %d"
msgstr ""
@@ -8040,7 +8065,7 @@ msgstr ""
msgid "Copying messages"
msgstr ""
-#: camel/camel-gpg-context.c:713
+#: camel/camel-gpg-context.c:697
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -8048,45 +8073,45 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:727
+#: camel/camel-gpg-context.c:711
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:734
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:742
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
msgstr ""
-#: camel/camel-gpg-context.c:769 camel/camel-gpg-context.c:1228
-#: camel/camel-gpg-context.c:1336 camel/camel-gpg-context.c:1411
-#: camel/camel-gpg-context.c:1469 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
+#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
+#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
msgid "Cancelled."
msgstr ""
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:771
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
-#: camel/camel-gpg-context.c:793
+#: camel/camel-gpg-context.c:777
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr ""
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:787
msgid "No data provided"
msgstr ""
-#: camel/camel-gpg-context.c:848
+#: camel/camel-gpg-context.c:830
msgid "Failed to encrypt: No valid recipients specified."
msgstr ""
-#: camel/camel-gpg-context.c:1103
+#: camel/camel-gpg-context.c:1082
#, c-format
msgid ""
"Failed to GPG %s message: %s\n"
@@ -8094,23 +8119,23 @@ msgid ""
"%.*s"
msgstr ""
-#: camel/camel-gpg-context.c:1109
+#: camel/camel-gpg-context.c:1088
#, c-format
msgid "Failed to GPG %s message: %s\n"
msgstr ""
-#: camel/camel-gpg-context.c:1219
+#: camel/camel-gpg-context.c:1197
#, fuzzy, c-format
msgid "Failed to execute gpg: %s"
msgstr "Synchronising \"%s\""
-#: camel/camel-gpg-context.c:1249 camel/camel-gpg-context.c:1328
-#: camel/camel-gpg-context.c:1402 camel/camel-gpg-context.c:1432
-#: camel/camel-gpg-context.c:1460 camel/camel-gpg-context.c:1490
+#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
+#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
msgid "Failed to execute gpg."
msgstr ""
-#: camel/camel-gpg-context.c:1313
+#: camel/camel-gpg-context.c:1290
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr ""
@@ -8338,7 +8363,7 @@ msgid ""
msgstr ""
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1064
+#: camel/providers/imap/camel-imap-store.c:1059
msgid "Bad authentication response from server."
msgstr ""
@@ -8623,7 +8648,7 @@ msgstr ""
msgid "Error in application verification"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
#, c-format
msgid ""
"Issuer: %s\n"
@@ -8632,11 +8657,11 @@ msgid ""
"Signature: %s"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
msgid "GOOD"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
msgid "BAD"
msgstr ""
@@ -8653,7 +8678,7 @@ msgid ""
msgstr ""
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:535
+#: camel/camel-tcp-stream-ssl.c:690
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -8663,6 +8688,34 @@ msgid ""
"Do you wish to accept?"
msgstr ""
+#: camel/camel-tcp-stream-ssl.c:734
+#, c-format
+msgid ""
+"Certificate problem: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:786
+#, c-format
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:804
+#, c-format
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:821
+#, c-format
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
+msgstr ""
+
#: camel/camel-url.c:288
#, c-format
msgid "Could not parse URL `%s'"
@@ -8705,12 +8758,12 @@ msgstr "Synchronising \"%s\""
#: camel/providers/imap/camel-imap-command.c:224
#: camel/providers/imap/camel-imap-command.c:263
#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2641
+#: camel/providers/imap/camel-imap-store.c:2611
msgid "Operation cancelled"
msgstr ""
#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap/camel-imap-store.c:2614
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr ""
@@ -8832,7 +8885,7 @@ msgstr ""
msgid "Check for new messages in all folders"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
msgid "Folders"
msgstr ""
@@ -8910,28 +8963,28 @@ msgstr ""
msgid "SSL negotiations failed"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1087
+#: camel/providers/imap/camel-imap-store.c:1082
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1097
+#: camel/providers/imap/camel-imap-store.c:1092
#: camel/providers/smtp/camel-smtp-transport.c:482
#, c-format
msgid "No support for authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1121
+#: camel/providers/imap/camel-imap-store.c:1116
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/imap/camel-imap-store.c:1131
#: camel/providers/smtp/camel-smtp-transport.c:523
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1165
+#: camel/providers/imap/camel-imap-store.c:1160
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -8939,24 +8992,24 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1471
-#: camel/providers/imap/camel-imap-store.c:1613
+#: camel/providers/imap/camel-imap-store.c:1462
+#: camel/providers/imap/camel-imap-store.c:1604
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1814
+#: camel/providers/imap/camel-imap-store.c:1805
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1826
+#: camel/providers/imap/camel-imap-store.c:1817
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/imap/camel-imap-store.c:1862
+#: camel/providers/imap/camel-imap-store.c:1853
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
@@ -9556,7 +9609,7 @@ msgid "Could not connect to POP server %s"
msgstr "Synchronising \"%s\""
#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:498
+#: camel/providers/pop3/camel-pop3-store.c:502
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -9573,31 +9626,31 @@ msgstr ""
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:436
+#: camel/providers/pop3/camel-pop3-store.c:439
#, fuzzy, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/pop3/camel-pop3-store.c:458
+#: camel/providers/pop3/camel-pop3-store.c:462
#, c-format
msgid "%sPlease enter the POP password for %s@%s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-store.c:509
-#: camel/providers/pop3/camel-pop3-store.c:514
+#: camel/providers/pop3/camel-pop3-store.c:516
+#: camel/providers/pop3/camel-pop3-store.c:522
#, fuzzy, c-format
msgid ""
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/pop3/camel-pop3-store.c:609
+#: camel/providers/pop3/camel-pop3-store.c:614
#, c-format
msgid "No such folder `%s'."
msgstr ""
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
msgid "Sendmail"
msgstr ""
@@ -9938,15 +9991,15 @@ msgstr ""
msgid "attachment"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:516
+#: composer/e-msg-composer-attachment-bar.c:520
msgid "Remove selected items from the attachment list"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:547
+#: composer/e-msg-composer-attachment-bar.c:551
msgid "Add attachment..."
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:548
+#: composer/e-msg-composer-attachment-bar.c:552
msgid "Attach a file to the message"
msgstr ""
@@ -9978,7 +10031,7 @@ msgstr ""
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:365
msgid "Click here for the address book"
msgstr ""
@@ -9989,45 +10042,45 @@ msgstr ""
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:400
msgid "Reply-To:"
msgstr ""
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:411
msgid "From:"
msgstr ""
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:416
+#: composer/e-msg-composer-hdrs.c:417
msgid "Subject:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:430
+#: composer/e-msg-composer-hdrs.c:431
msgid "To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:432
msgid "Enter the recipients of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:434
+#: composer/e-msg-composer-hdrs.c:435
msgid "Cc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:436
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:438
+#: composer/e-msg-composer-hdrs.c:439
msgid "Bcc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:439
+#: composer/e-msg-composer-hdrs.c:440
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -10036,15 +10089,15 @@ msgstr ""
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:446
+#: composer/e-msg-composer-hdrs.c:447
msgid "Post To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:448
+#: composer/e-msg-composer-hdrs.c:449
msgid "Posting destination"
msgstr ""
-#: composer/e-msg-composer-select-file.c:274
+#: composer/e-msg-composer-select-file.c:275
#: ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr ""
@@ -10229,7 +10282,7 @@ msgstr ""
msgid "Subject does not contain"
msgstr ""
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
#: mail/mail-display.c:192
msgid ""
"A file by that name already exists.\n"
@@ -10347,7 +10400,7 @@ msgid "%I %p"
msgstr ""
#: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:181
msgid "seconds"
msgstr ""
@@ -10455,30 +10508,30 @@ msgid ""
"%s"
msgstr ""
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
-#: mail/mail-config.glade.h:63
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
+#: mail/mail-config.glade.h:62
msgid "Important"
msgstr ""
#. red
-#: filter/filter-label.c:137 mail/mail-config.c:77
-#: mail/mail-config.glade.h:136
+#: filter/filter-label.c:137 mail/mail-config.c:69
+#: mail/mail-config.glade.h:133
msgid "Work"
msgstr ""
#. orange
-#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
+#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
msgid "Personal"
msgstr ""
#. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:79
-#: mail/mail-config.glade.h:127
+#: filter/filter-label.c:139 mail/mail-config.c:71
+#: mail/mail-config.glade.h:124
msgid "To Do"
msgstr ""
#. blue
-#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
+#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
msgid "Later"
msgstr ""
@@ -10626,218 +10679,214 @@ msgid "Beep"
msgstr ""
#: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
+msgid "contains"
msgstr ""
#: filter/libfilter-i18n.h:8
-msgid "Date received"
+msgid "Copy to Folder"
msgstr ""
#: filter/libfilter-i18n.h:9
-msgid "Date sent"
+msgid "Date received"
msgstr ""
-#: filter/libfilter-i18n.h:11
-msgid "Deleted"
+#: filter/libfilter-i18n.h:10
+msgid "Date sent"
msgstr ""
#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
+msgid "Deleted"
msgstr ""
#: filter/libfilter-i18n.h:13
-msgid "Draft"
+msgid "does not contain"
msgstr ""
#: filter/libfilter-i18n.h:14
-msgid "Exist"
+msgid "does not end with"
msgstr ""
#: filter/libfilter-i18n.h:15
-msgid "Expression"
+msgid "does not exist"
msgstr ""
#: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+msgid "does not return"
msgstr ""
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
-msgid "Label"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
msgstr ""
#: filter/libfilter-i18n.h:19
-msgid "Mailing list"
+msgid "Do Not Exist"
msgstr ""
#: filter/libfilter-i18n.h:20
-msgid "Message Body"
+msgid "Draft"
msgstr ""
#: filter/libfilter-i18n.h:21
-msgid "Message Header"
+msgid "ends with"
msgstr ""
#: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
+msgid "Exist"
msgstr ""
#: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
+msgid "exists"
msgstr ""
#: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
-msgid "Read"
+msgid "Expression"
msgstr ""
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
msgstr ""
#: filter/libfilter-i18n.h:27
-msgid "Regex Match"
+msgid "is"
msgstr ""
#: filter/libfilter-i18n.h:28
-msgid "Replied to"
+msgid "is after"
msgstr ""
#: filter/libfilter-i18n.h:29
-msgid "Run Once"
+msgid "is before"
msgstr ""
-#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
msgstr ""
-#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
-msgid "Sender"
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
msgstr ""
#: filter/libfilter-i18n.h:32
-msgid "Set Status"
+msgid "is less than"
msgstr ""
#: filter/libfilter-i18n.h:33
-#, fuzzy
-msgid "Shell Command"
-msgstr "Colours"
+msgid "is not"
+msgstr ""
#: filter/libfilter-i18n.h:34
-msgid "Size (kB)"
+msgid "is not Flagged"
msgstr ""
-#: filter/libfilter-i18n.h:35
-msgid "Source Account"
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
+msgid "Label"
msgstr ""
#: filter/libfilter-i18n.h:36
-msgid "Specific header"
+msgid "Mailing list"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "Message Body"
msgstr ""
#: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
+msgid "Message Header"
msgstr ""
-#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
-msgid "Subject"
+#: filter/libfilter-i18n.h:39
+msgid "Move to Folder"
msgstr ""
#: filter/libfilter-i18n.h:40
-msgid "Unset Status"
+msgid "Pipe Message to Shell Command"
msgstr ""
#: filter/libfilter-i18n.h:41
-msgid "contains"
+msgid "Play Sound"
msgstr ""
-#: filter/libfilter-i18n.h:42
-msgid "does not contain"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
+msgid "Read"
msgstr ""
#: filter/libfilter-i18n.h:43
-msgid "does not end with"
+msgid "Recipients"
msgstr ""
#: filter/libfilter-i18n.h:44
-msgid "does not exist"
+msgid "Regex Match"
msgstr ""
#: filter/libfilter-i18n.h:45
-msgid "does not return"
+msgid "Replied to"
msgstr ""
#: filter/libfilter-i18n.h:46
-msgid "does not sound like"
+msgid "returns"
msgstr ""
#: filter/libfilter-i18n.h:47
-msgid "does not start with"
+msgid "returns greater than"
msgstr ""
#: filter/libfilter-i18n.h:48
-msgid "ends with"
+msgid "returns less than"
msgstr ""
-#: filter/libfilter-i18n.h:49
-msgid "exists"
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:50
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
+msgid "Sender"
msgstr ""
#: filter/libfilter-i18n.h:51
-msgid "is after"
+msgid "Set Status"
msgstr ""
#: filter/libfilter-i18n.h:52
-msgid "is before"
-msgstr ""
+#, fuzzy
+msgid "Shell Command"
+msgstr "Colours"
#: filter/libfilter-i18n.h:53
-msgid "is greater than"
+msgid "Size (kB)"
msgstr ""
#: filter/libfilter-i18n.h:54
-msgid "is less than"
+msgid "sounds like"
msgstr ""
#: filter/libfilter-i18n.h:55
-msgid "is not Flagged"
+msgid "Source Account"
msgstr ""
#: filter/libfilter-i18n.h:56
-msgid "is not"
+msgid "Specific header"
msgstr ""
#: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "returns greater than"
+msgid "starts with"
msgstr ""
#: filter/libfilter-i18n.h:59
-msgid "returns less than"
+msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:60
-msgid "returns"
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
msgstr ""
#: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
+msgid "Unset Status"
msgstr ""
#: filter/rule-editor.c:180
@@ -11091,7 +11140,7 @@ msgstr ""
msgid "Mail Accounts"
msgstr ""
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
msgid "Mail Preferences"
msgstr ""
@@ -11189,11 +11238,11 @@ msgstr "Cannot initialise Evolution's mail component."
msgid "Cannot initialize Evolution's folder info component."
msgstr "Cannot initialise Evolution's mail component."
-#: mail/component-factory.c:1325 mail/component-factory.c:1355
+#: mail/component-factory.c:1334 mail/component-factory.c:1364
msgid "Connecting..."
msgstr ""
-#: mail/component-factory.c:1366
+#: mail/component-factory.c:1375
msgid "Cannot register storage with shell"
msgstr ""
@@ -11251,135 +11300,135 @@ msgstr ""
msgid "%d total"
msgstr ""
-#: mail/folder-browser.c:1113
+#: mail/folder-browser.c:1118
msgid "Create _Virtual Folder From Search..."
msgstr ""
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1702
msgid "VFolder on _Subject"
msgstr ""
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1703
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/folder-browser.c:1695
+#: mail/folder-browser.c:1704
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1705
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1709
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1710
msgid "Filter on Sen_der"
msgstr ""
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1711
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
+#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1730
msgid "_Edit as New Message..."
msgstr ""
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1732
msgid "_Print"
msgstr ""
-#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
msgid "_Reply to Sender"
msgstr ""
-#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
msgid "Reply to _List"
msgstr ""
-#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
msgid "Reply to _All"
msgstr ""
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1739
msgid "_Forward"
msgstr ""
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1743
msgid "Follo_w Up..."
msgstr ""
-#: mail/folder-browser.c:1735
+#: mail/folder-browser.c:1744
msgid "Fla_g Completed"
msgstr ""
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1745
#, fuzzy
msgid "Cl_ear Flag"
msgstr "Colours"
#. separator here?
-#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
msgid "Mar_k as Read"
msgstr ""
-#: mail/folder-browser.c:1741
+#: mail/folder-browser.c:1750
msgid "Mark as _Unread"
msgstr ""
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1751
msgid "Mark as _Important"
msgstr ""
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1752
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/folder-browser.c:1748
+#: mail/folder-browser.c:1757
msgid "U_ndelete"
msgstr ""
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1761
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr ""
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1770
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/folder-browser.c:1765
+#: mail/folder-browser.c:1774
msgid "Appl_y Filters"
msgstr ""
-#: mail/folder-browser.c:1769
+#: mail/folder-browser.c:1778
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2036
msgid "VFolder on M_ailing List"
msgstr ""
-#: mail/folder-browser.c:2029
+#: mail/folder-browser.c:2038
#, c-format
msgid "Filter on _Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:2030
+#: mail/folder-browser.c:2039
#, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr ""
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
#, fuzzy
msgid "Default"
msgstr "Synchronising \"%s\""
@@ -11445,15 +11494,15 @@ msgstr ""
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
msgid "_Host:"
msgstr ""
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
msgid "User_name:"
msgstr ""
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
msgid "_Path:"
msgstr ""
@@ -11474,19 +11523,19 @@ msgid "Really delete account?"
msgstr ""
#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
+#: mail/mail-composer-prefs.c:707
msgid "Disable"
msgstr ""
#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
-#: mail/mail-composer-prefs.c:704
+#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
+#: mail/mail-composer-prefs.c:707
msgid "Enable"
msgstr ""
#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
msgid "Enabled"
msgstr ""
@@ -11598,71 +11647,71 @@ msgid ""
"Would you like to use the default drafts folder?"
msgstr ""
-#: mail/mail-callbacks.c:1206
+#: mail/mail-callbacks.c:1207
msgid "an unknown sender"
msgstr ""
-#: mail/mail-callbacks.c:1210
+#: mail/mail-callbacks.c:1211
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:2380
+#: mail/mail-callbacks.c:2381
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2405
+#: mail/mail-callbacks.c:2406
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:2444
+#: mail/mail-callbacks.c:2445
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:2458
+#: mail/mail-callbacks.c:2459
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2484
+#: mail/mail-callbacks.c:2485
msgid "No Message Selected"
msgstr ""
-#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
+#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
msgid "Overwrite file?"
msgstr ""
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2584
msgid "Save Message As..."
msgstr ""
-#: mail/mail-callbacks.c:2585
+#: mail/mail-callbacks.c:2586
msgid "Save Messages As..."
msgstr ""
-#: mail/mail-callbacks.c:2654
+#: mail/mail-callbacks.c:2655
msgid "Go to next folder with unread messages?"
msgstr ""
-#: mail/mail-callbacks.c:2661
+#: mail/mail-callbacks.c:2662
msgid ""
"There are no more new messages in this folder.\n"
"Would you like to go to the next folder?"
msgstr ""
-#: mail/mail-callbacks.c:2904
+#: mail/mail-callbacks.c:2905
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -11670,35 +11719,35 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:3017
+#: mail/mail-callbacks.c:3018
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:3029
+#: mail/mail-callbacks.c:3030
msgid "Filters"
msgstr ""
-#: mail/mail-callbacks.c:3073
+#: mail/mail-callbacks.c:3074
#, c-format
msgid "Page %d of %d"
msgstr ""
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3129
msgid "Print Message"
msgstr ""
-#: mail/mail-callbacks.c:3155
+#: mail/mail-callbacks.c:3156
msgid "US-Letter"
msgstr ""
-#: mail/mail-callbacks.c:3196
+#: mail/mail-callbacks.c:3197
msgid "Printing of message failed"
msgstr ""
-#: mail/mail-callbacks.c:3386
+#: mail/mail-callbacks.c:3387
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr ""
@@ -11709,29 +11758,24 @@ msgid ""
"in Andvanced section of signature settings."
msgstr ""
-#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
-#: mail/mail-composer-prefs.c:413
+#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
+#: mail/mail-composer-prefs.c:416
msgid " [script]"
msgstr ""
-#: mail/mail-composer-prefs.c:306
+#: mail/mail-composer-prefs.c:309
msgid "Please specify a valid script name"
msgstr ""
-#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
+#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
msgid "Unnamed"
msgstr ""
-#: mail/mail-composer-prefs.c:562
-#, fuzzy
-msgid "en"
-msgstr "Organisation"
-
-#: mail/mail-composer-prefs.c:872
+#: mail/mail-composer-prefs.c:875
msgid "Add script signature"
msgstr ""
-#: mail/mail-composer-prefs.c:873
+#: mail/mail-composer-prefs.c:876
msgid "Add Signature"
msgstr ""
@@ -11768,142 +11812,138 @@ msgid ""
msgstr ""
#. set window title
-#: mail/mail-config-druid.c:633
+#: mail/mail-config-druid.c:637
msgid "Evolution Account Assistant"
msgstr ""
-#: mail/mail-config.c:636
+#: mail/mail-config.c:622
#, c-format
msgid "Account %d"
msgstr ""
-#: mail/mail-config.c:2660
+#: mail/mail-config.c:2316
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:2738 mail/mail-config.c:2742
+#: mail/mail-config.c:2394 mail/mail-config.c:2398
msgid "Connecting to server..."
msgstr ""
#: mail/mail-config.glade.h:1
-msgid " "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
msgid " _Check for supported types "
msgstr ""
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:2
msgid "(SSL is not supported in this build of Evolution)"
msgstr ""
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:3
msgid "(SSL is not supported in this build of evolution)"
msgstr ""
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:4
msgid "A_lways encrypt to myself when sending encrypted mail"
msgstr ""
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:5
msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
msgstr ""
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:6
msgid "Account Editor"
msgstr ""
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
msgid "Account Information"
msgstr ""
-#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr ""
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
msgid "Add Sc_ript"
msgstr ""
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
msgid "Add new signature..."
msgstr ""
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr ""
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
msgid "Alwa_ys sign outgoing messages when using this account"
msgstr ""
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
msgid "Always _blind carbon-copy (Bcc) to:"
msgstr ""
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
msgid "Always _carbon-copy (Cc) to:"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
msgid "Always _trust keys in my keyring when encrypting"
msgstr ""
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
msgid "Attach original message"
msgstr ""
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr ""
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
msgid "Authentication"
msgstr ""
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
msgid "Automatically _detect links"
msgstr ""
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
msgid "Baltic (ISO-8859-4)"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
msgid "C_haracter set:"
msgstr ""
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
#, fuzzy
msgid "C_olors"
msgstr "Colours"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
msgid "Check spelling while I _type"
msgstr ""
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
msgid "Checking for New Mail"
msgstr ""
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
#, fuzzy
msgid "Color for _misspelled words:"
msgstr "Colours for display"
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
msgid "Composing Messages"
msgstr ""
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
msgid "Configuration"
msgstr ""
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -11913,136 +11953,142 @@ msgid ""
"Click \"Finish\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
msgid "Default Behavior"
msgstr ""
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
msgid "Default character _encoding:"
msgstr ""
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
msgid "Deleting Mail"
msgstr ""
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
msgid "Digital IDs..."
msgstr ""
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
msgid "Do not quote original message"
msgstr ""
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr ""
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr ""
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:47
#, fuzzy
msgid "Drafts _folder:"
msgstr "Synchronising \"%s\""
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
msgid "E_nable"
msgstr ""
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
msgid "Emacs"
msgstr ""
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
msgid "Email Accounts"
msgstr ""
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
msgid "Email _address:"
msgstr ""
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
msgid "Empty _trash folders on exit"
msgstr ""
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
msgid "Execute Command..."
msgstr ""
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
msgid "Fi_xed -width:"
msgstr ""
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
msgid "Font Properties"
msgstr ""
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
msgid "Format messages in _HTML"
msgstr ""
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
msgid "Get Digital ID..."
msgstr ""
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
msgid "Highlight _quotations with"
msgstr ""
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
msgid "IMAPv4 "
msgstr ""
-#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr ""
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
msgid "Inline"
msgstr ""
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:64
msgid "Kerberos "
msgstr ""
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:65
msgid "Labels and Colors"
msgstr ""
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
msgid "Loading Images"
msgstr ""
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
msgid "Mail Configuration"
msgstr ""
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
msgid "Mailbox location"
msgstr ""
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
#, fuzzy
msgid "Message Composer"
msgstr "Colours"
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
msgid "Message Display"
msgstr ""
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
msgid "Microsoft"
msgstr ""
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
msgid "New Mail Notification"
msgstr ""
+#: mail/mail-config.glade.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
#: mail/mail-config.glade.h:79
msgid "On Screen fonts"
msgstr ""
@@ -12142,267 +12188,243 @@ msgstr ""
msgid "Select HTML variable width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:108
-msgid "Select PGP program"
-msgstr ""
-
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr ""
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:110
#, fuzzy
msgid "Sent _messages folder:"
msgstr "Synchronising \"%s\""
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
msgid "Sent and Draft Messages"
msgstr ""
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
msgid "Ser_ver requires authentication"
msgstr ""
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
msgid "Server Configuration"
msgstr ""
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
msgid "Server _Type: "
msgstr ""
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
msgid "Shortcuts _type:"
msgstr ""
-#: mail/mail-config.glade.h:117
-msgid "Signature #1"
-msgstr ""
-
-#: mail/mail-config.glade.h:118
-msgid "Signature #2"
-msgstr ""
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
msgid "Specify _filename:"
msgstr ""
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
msgid "Spell Checking Language"
msgstr ""
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
msgid "Spell _Checking"
msgstr ""
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
msgid "Standard Unix mbox"
msgstr ""
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:120
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
"for display purposes only. "
msgstr ""
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:123
msgid ""
"This page allows you to configure spell checking behavior and language. The "
"list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:125
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
msgstr ""
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:128
msgid "V_ariable-width:"
msgstr ""
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:129
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
"Click \"Next\" to begin. "
msgstr ""
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:134
msgid "XEmacs"
msgstr ""
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:136
msgid "_Add Signature"
msgstr ""
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:137
msgid "_Always load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:138
msgid "_Always sign outgoing messages when using this account"
msgstr ""
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:139
msgid "_Authentication Type: "
msgstr ""
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:140
msgid "_Authentication type: "
msgstr ""
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:141
msgid "_Automatically check for new mail"
msgstr ""
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:142
msgid "_Automatically insert smiley images"
msgstr ""
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:143
msgid "_Beep when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:144
msgid "_Certificate ID:"
msgstr ""
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:145
msgid "_Confirm when expunging a folder"
msgstr ""
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:146
msgid "_Default signature:"
msgstr ""
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:147
msgid "_Defaults"
msgstr ""
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:149
msgid "_Do not notify me when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:151
msgid "_Enable"
msgstr ""
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:152
msgid "_Fixed-width:"
msgstr ""
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:153
msgid "_Forward style:"
msgstr ""
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:154
msgid "_Full name:"
msgstr ""
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:156
msgid "_HTML Mail"
msgstr ""
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:158
msgid "_Identity"
msgstr ""
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:159
msgid "_Load images if sender is in addressbook"
msgstr ""
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:160
msgid "_Make this my default account"
msgstr ""
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:161
msgid "_Mark messages as read after"
msgstr ""
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:162
msgid "_Name:"
msgstr ""
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:163
msgid "_Never load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:167
-msgid "_PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
msgid "_Play sound file when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr ""
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:167
msgid "_Prompt when sending messages with an empty subject line"
msgstr ""
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
msgid "_Receiving Mail"
msgstr ""
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
msgid "_Reply style:"
msgstr ""
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
msgid "_Restore defaults"
msgstr ""
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
msgid "_Script:"
msgstr ""
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr ""
-
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:172
msgid "_Sending Mail"
msgstr ""
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:173
msgid "_Show animated images"
msgstr ""
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:174
msgid "_Signatures"
msgstr ""
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:175
msgid "_Use secure connection (SSL):"
msgstr ""
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:176
msgid "_Variable-width:"
msgstr ""
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:177
msgid "_every"
msgstr ""
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:178
#, fuzzy
msgid "color"
msgstr "Colours"
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:179
msgid "description"
msgstr ""
-#: mail/mail-config.glade.h:187
-msgid "xxxxxxxxxxxxxxxxxxxx"
-msgstr ""
-
#: mail/mail-crypto.c:84
msgid "Could not create a S/MIME signature context."
msgstr ""
@@ -12462,32 +12484,32 @@ msgstr ""
msgid "Downloading images"
msgstr ""
-#: mail/mail-display.c:1494
+#: mail/mail-display.c:1496
msgid "Loading message content"
msgstr ""
-#: mail/mail-display.c:1781
+#: mail/mail-display.c:1783
msgid "Overdue:"
msgstr ""
-#: mail/mail-display.c:1785
+#: mail/mail-display.c:1787
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%a %d/%m/%Y %I:%M %p"
-#: mail/mail-display.c:2112
+#: mail/mail-display.c:2114
msgid "Open Link in Browser"
msgstr ""
-#: mail/mail-display.c:2113
+#: mail/mail-display.c:2115
msgid "Copy Link Location"
msgstr ""
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2117
msgid "Save Link as (FIXME)"
msgstr ""
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2119
msgid "Save Image as..."
msgstr ""
@@ -12496,92 +12518,93 @@ msgstr ""
msgid "Pinging %s"
msgstr "Synchronise \"%s\""
-#: mail/mail-format.c:650
+#: mail/mail-format.c:656
#, c-format
msgid "%s attachment"
msgstr ""
-#: mail/mail-format.c:696
+#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
+#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
msgid "Could not parse MIME message. Displaying as source."
msgstr ""
-#: mail/mail-format.c:780 mail/message-list.etspec.h:2
+#: mail/mail-format.c:783 mail/message-list.etspec.h:2
msgid "Date"
msgstr ""
-#: mail/mail-format.c:867
+#: mail/mail-format.c:870
msgid "Bad Address"
msgstr ""
-#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/mail-format.c:913 mail/message-list.etspec.h:7
#: mail/message-tags.glade.h:3
msgid "From"
msgstr ""
-#: mail/mail-format.c:914
+#: mail/mail-format.c:917
msgid "Reply-To"
msgstr ""
-#: mail/mail-format.c:919 mail/message-list.etspec.h:14
+#: mail/mail-format.c:922 mail/message-list.etspec.h:14
msgid "To"
msgstr ""
-#: mail/mail-format.c:924
+#: mail/mail-format.c:927
msgid "Cc"
msgstr ""
-#: mail/mail-format.c:929
+#: mail/mail-format.c:932
msgid "Bcc"
msgstr ""
-#: mail/mail-format.c:960
+#: mail/mail-format.c:963
msgid "Mailer"
msgstr ""
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1848
msgid ""
"This message is digitally signed. Click the lock icon for more information."
msgstr ""
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1875
#, fuzzy
msgid "Could not create a PGP verfication context"
msgstr "Synchronising \"%s\""
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1884
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1892
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2157
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2171
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2176
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2205
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2213
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2218
msgid "Malformed external-body part."
msgstr ""
@@ -12789,7 +12812,7 @@ msgstr ""
msgid "Reconnecting to %s"
msgstr "Synchronise \"%s\""
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
msgid "_Search"
msgstr ""
@@ -12897,11 +12920,15 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
+#: mail/mail-signature-editor.c:333
+msgid "Edit signature"
+msgstr ""
+
#: mail/mail-signature-editor.c:372
msgid "Enter a name for this signature."
msgstr ""
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
msgid "Name:"
msgstr ""
@@ -12914,7 +12941,7 @@ msgstr ""
msgid "Forwarded message"
msgstr ""
-#: mail/mail-tools.c:408
+#: mail/mail-tools.c:416
msgid "Forwarded Message"
msgstr ""
@@ -12937,7 +12964,7 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
msgid "VFolders"
msgstr ""
@@ -13125,41 +13152,41 @@ msgstr ""
msgid "_Flag:"
msgstr ""
-#: mail/subscribe-dialog.c:229
+#: mail/subscribe-dialog.c:231
#, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:233
#, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:334
+#: mail/subscribe-dialog.c:336
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:338
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr ""
-#: mail/subscribe-dialog.c:1443
+#: mail/subscribe-dialog.c:1450
#, fuzzy
msgid "Scanning folders..."
msgstr "Synchronising \"%s\""
-#: mail/subscribe-dialog.c:1550
+#: mail/subscribe-dialog.c:1557
msgid "No server has been selected"
msgstr ""
-#: mail/subscribe-dialog.c:1614
+#: mail/subscribe-dialog.c:1621
msgid "Please select a server."
msgstr ""
@@ -23093,31 +23120,31 @@ msgstr ""
msgid "Folder containing the Evolution Summary"
msgstr ""
-#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
+#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
msgid "Appointments"
msgstr ""
-#: my-evolution/e-summary-calendar.c:368
+#: my-evolution/e-summary-calendar.c:382
msgid "No appointments"
msgstr ""
-#: my-evolution/e-summary-calendar.c:404
+#: my-evolution/e-summary-calendar.c:418
msgid "%k:%M %d %B"
msgstr ""
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:420
msgid "%l:%M %d %B"
msgstr ""
-#: my-evolution/e-summary-calendar.c:424
+#: my-evolution/e-summary-calendar.c:438
msgid "No description"
msgstr ""
-#: my-evolution/e-summary-mail.c:154
+#: my-evolution/e-summary-mail.c:153
msgid "Mail summary"
msgstr ""
-#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
#: shell/e-local-storage.c:1102
msgid "Local Folders"
msgstr ""
@@ -23140,48 +23167,48 @@ msgstr ""
msgid "Quotes of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:869
+#: my-evolution/e-summary-preferences.c:840
msgid "Add a news feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:848
msgid "Enter the URL of the news feed you wish to add"
msgstr ""
-#: my-evolution/e-summary-rdf.c:304
+#: my-evolution/e-summary-rdf.c:303
msgid "Error downloading RDF"
msgstr ""
-#: my-evolution/e-summary-rdf.c:448
+#: my-evolution/e-summary-rdf.c:446
msgid "News Feed"
msgstr ""
-#: my-evolution/e-summary-shown.c:541
+#: my-evolution/e-summary-shown.c:519
msgid "All"
msgstr ""
#. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:553
+#: my-evolution/e-summary-shown.c:531
msgid "Add"
msgstr ""
-#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
msgid "Shown"
msgstr ""
-#: my-evolution/e-summary-tasks.c:312
+#: my-evolution/e-summary-tasks.c:328
msgid "No tasks"
msgstr ""
-#: my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:372
msgid "(No Description)"
msgstr ""
-#: my-evolution/e-summary-weather.c:71
+#: my-evolution/e-summary-weather.c:72
msgid "My Weather"
msgstr ""
-#: my-evolution/e-summary-weather.c:267
+#: my-evolution/e-summary-weather.c:268
msgid "There was an error downloading data for"
msgstr ""
@@ -23189,23 +23216,23 @@ msgstr ""
msgid "Weather"
msgstr ""
-#: my-evolution/e-summary.c:193
+#: my-evolution/e-summary.c:188
msgid "%A, %B %e %Y"
msgstr ""
-#: my-evolution/e-summary.c:488
+#: my-evolution/e-summary.c:504
msgid "Please wait..."
msgstr ""
-#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
msgid "Print Summary"
msgstr ""
-#: my-evolution/e-summary.c:626
+#: my-evolution/e-summary.c:640
msgid "Printing of Summary failed"
msgstr ""
-#: my-evolution/main.c:64
+#: my-evolution/main.c:68
#, fuzzy
msgid "Executive summary component could not initialize Bonobo.\n"
msgstr "Could not initialise Bonobo"
@@ -24526,7 +24553,7 @@ msgstr "Synchronising \"%s\""
msgid "Drafts"
msgstr ""
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
#: shell/e-shortcuts.c:1055
msgid "Inbox"
msgstr ""
@@ -24917,27 +24944,27 @@ msgstr "Synchronising \"%s\""
msgid "Evolution Settings"
msgstr "Cannot initialise the Evolution shell."
-#: shell/e-shell-shared-folder-picker-dialog.c:326
+#: shell/e-shell-shared-folder-picker-dialog.c:357
#, fuzzy
msgid "Opening Folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-shared-folder-picker-dialog.c:333
+#: shell/e-shell-shared-folder-picker-dialog.c:364
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "Synchronising \"%s\""
-#: shell/e-shell-shared-folder-picker-dialog.c:338
+#: shell/e-shell-shared-folder-picker-dialog.c:369
#, c-format
msgid "in \"%s\" ..."
msgstr ""
-#: shell/e-shell-shared-folder-picker-dialog.c:435
+#: shell/e-shell-shared-folder-picker-dialog.c:455
#, fuzzy, c-format
msgid "Could not open shared folder: %s."
msgstr "Synchronising \"%s\""
-#: shell/e-shell-shared-folder-picker-dialog.c:488
+#: shell/e-shell-shared-folder-picker-dialog.c:513
msgid "Cannot find the specified shared folder."
msgstr ""
@@ -24975,6 +25002,15 @@ msgstr ""
msgid "'.' and '..' are reserved folder names."
msgstr ""
+#: shell/e-shell-view-menu.c:94
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:102
+#, c-format
+msgid "Error executing %s."
+msgstr ""
+
#: shell/e-shell-view-menu.c:196
msgid "Bug buddy was not found in your $PATH."
msgstr ""
@@ -25004,15 +25040,15 @@ msgstr ""
msgid "Select the folder you want the shortcut to point to:"
msgstr ""
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:788
msgid "_Work Online"
msgstr ""
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
msgid "_Work Offline"
msgstr ""
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
msgid "Work Offline"
msgstr ""
@@ -25020,25 +25056,25 @@ msgstr ""
msgid "(No folder displayed)"
msgstr ""
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1861
#, c-format
msgid "%s (%d)"
msgstr ""
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1863
msgid "(None)"
msgstr ""
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1910
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1917
msgid "Ximian Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1923
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
@@ -25056,7 +25092,7 @@ msgstr ""
msgid "Cannot set up local storage -- %s"
msgstr ""
-#: shell/e-shell.c:1876
+#: shell/e-shell.c:1877
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -25064,19 +25100,19 @@ msgid ""
"in order to access that data again."
msgstr ""
-#: shell/e-shell.c:2177
+#: shell/e-shell.c:2178
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:2179
+#: shell/e-shell.c:2180
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:2181
+#: shell/e-shell.c:2182
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:2183 shell/e-storage.c:558
+#: shell/e-shell.c:2184 shell/e-storage.c:571
msgid "Generic error"
msgstr ""
@@ -25211,60 +25247,60 @@ msgstr ""
msgid "Checkbox"
msgstr ""
-#: shell/e-storage.c:556
+#: shell/e-storage.c:569
msgid "No error"
msgstr ""
-#: shell/e-storage.c:560
+#: shell/e-storage.c:573
msgid "A folder with the same name already exists"
msgstr ""
-#: shell/e-storage.c:562
+#: shell/e-storage.c:575
msgid "The specified folder type is not valid"
msgstr ""
-#: shell/e-storage.c:564
+#: shell/e-storage.c:577
msgid "I/O error"
msgstr ""
-#: shell/e-storage.c:566
+#: shell/e-storage.c:579
msgid "Not enough space to create the folder"
msgstr ""
-#: shell/e-storage.c:568
+#: shell/e-storage.c:581
msgid "The folder is not empty"
msgstr ""
-#: shell/e-storage.c:570
+#: shell/e-storage.c:583
msgid "The specified folder was not found"
msgstr ""
-#: shell/e-storage.c:572
+#: shell/e-storage.c:585
msgid "Function not implemented in this storage"
msgstr ""
-#: shell/e-storage.c:576
+#: shell/e-storage.c:589
msgid "Operation not supported"
msgstr ""
-#: shell/e-storage.c:578
+#: shell/e-storage.c:591
msgid "The specified type is not supported in this storage"
msgstr ""
-#: shell/e-storage.c:580
+#: shell/e-storage.c:593
msgid "The specified folder cannot be modified or removed"
msgstr ""
-#: shell/e-storage.c:582
+#: shell/e-storage.c:595
msgid "Cannot make a folder a child of one of its descendants"
msgstr ""
-#: shell/e-storage.c:584
+#: shell/e-storage.c:597
#, fuzzy
msgid "Cannot create a folder with that name"
msgstr "Synchronising \"%s\""
-#: shell/e-storage.c:586
+#: shell/e-storage.c:599
msgid "This operation cannot be performed in off-line mode"
msgstr ""
@@ -26010,7 +26046,7 @@ msgid "Change the properties of this folder"
msgstr ""
#: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
+msgid "Copy selected message(s) to the clipboard"
msgstr ""
#: ui/evolution-mail-list.xml.h:3
@@ -26018,7 +26054,7 @@ msgid "Cu_t"
msgstr ""
#: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
+msgid "Cut selected message(s) to the clipboard"
msgstr ""
#: ui/evolution-mail-list.xml.h:5
@@ -26047,7 +26083,7 @@ msgid "Mark all visible messages as read"
msgstr ""
#: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
+msgid "Paste message(s) from the clipboard"
msgstr ""
#: ui/evolution-mail-list.xml.h:12
@@ -26687,6 +26723,10 @@ msgstr ""
msgid "_Reply-To Field"
msgstr ""
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Security"
+msgstr ""
+
#: ui/evolution-signature-editor.xml.h:4
msgid "H_TML"
msgstr ""
@@ -26989,11 +27029,6 @@ msgstr ""
msgid "_Send / Receive"
msgstr ""
-#: ui/evolution.xml.h:62
-#, fuzzy
-msgid "_Settings..."
-msgstr "Cannot initialise the Evolution shell."
-
#: ui/evolution.xml.h:63
msgid "_Shortcut Bar"
msgstr ""
@@ -27268,21 +27303,21 @@ msgstr ""
msgid "Don't show this message again."
msgstr ""
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
msgid "_Find Now"
msgstr ""
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:522
#, fuzzy
msgid "_Clear"
msgstr "Colours"
-#: widgets/misc/e-search-bar.c:894
+#: widgets/misc/e-search-bar.c:895
#, fuzzy
msgid "Clear"
msgstr "Colours"
-#: widgets/misc/e-search-bar.c:896
+#: widgets/misc/e-search-bar.c:897
msgid "Find Now"
msgstr ""
@@ -27312,6 +27347,10 @@ msgid "init_bonobo(): could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
#, fuzzy
+#~ msgid "en"
+#~ msgstr "Organisation"
+
+#, fuzzy
#~ msgid "Could not create the alarm notify service"
#~ msgstr "Cannot initialise Evolution's mail component."