aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-10-08 06:50:02 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-10-08 06:50:02 +0800
commitdf86e5874705fdfa626160eb7e20f914a7334a6b (patch)
treedf21ba8a6e43f01aadf6ff3bb0f947a95f979629 /po/en_GB.po
parentacdd11bcb947d6a2074c0bbde531c44bfd44d26e (diff)
downloadgsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.gz
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.bz2
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.lz
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.xz
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.tar.zst
gsoc2013-evolution-df86e5874705fdfa626160eb7e20f914a7334a6b.zip
Sync for 1.1.2.
svn path=/trunk/; revision=18347
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po2896
1 files changed, 1532 insertions, 1364 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 08ff5403b4..09e9211f68 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-09-09 14:39-0400\n"
+"POT-Creation-Date: 2002-10-07 17:25-0400\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Robert Brady <rwb197@zepler.org>\n"
"Language-Team: \n"
@@ -320,11 +320,16 @@ msgstr ""
msgid "%x"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:2679
+#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-destination.c:706
+msgid "Unnamed List"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:2681
msgid "Multiple VCards"
msgstr ""
-#: addressbook/backend/ebook/e-card.c:2687
+#: addressbook/backend/ebook/e-card.c:2689
#, c-format
msgid "VCard for %s"
msgstr ""
@@ -335,47 +340,47 @@ msgstr ""
#: addressbook/backend/ebook/test-client.c:34
#: addressbook/conduit/address-conduit.c:1860
#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1727
+#: calendar/conduits/calendar/calendar-conduit.c:1807
#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
+#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
#: tools/evolution-addressbook-abuse.c:132
#: tools/evolution-addressbook-export.c:60
#: tools/evolution-addressbook-import.c:86
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
-#: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2968
+#: addressbook/backend/pas/pas-backend-file.c:364
+#: addressbook/backend/pas/pas-backend-ldap.c:2978
msgid "Searching..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-file.c:358
+#: addressbook/backend/pas/pas-backend-file.c:366
msgid "Loading..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:677
+#: addressbook/backend/pas/pas-backend-ldap.c:687
#, fuzzy
msgid "Reconnecting to LDAP server..."
msgstr "Synchronise \"%s\""
-#: addressbook/backend/pas/pas-backend-ldap.c:1220
+#: addressbook/backend/pas/pas-backend-ldap.c:1230
msgid "Adding card to LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:1326
+#: addressbook/backend/pas/pas-backend-ldap.c:1336
msgid "Removing card from LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:1562
-#: addressbook/backend/pas/pas-backend-ldap.c:1565
+#: addressbook/backend/pas/pas-backend-ldap.c:1572
+#: addressbook/backend/pas/pas-backend-ldap.c:1575
msgid "Modifying card from LDAP server..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:2879
+#: addressbook/backend/pas/pas-backend-ldap.c:2889
msgid "Receiving LDAP search results..."
msgstr ""
-#: addressbook/backend/pas/pas-backend-ldap.c:2988
+#: addressbook/backend/pas/pas-backend-ldap.c:2998
msgid "Error performing search"
msgstr ""
@@ -392,13 +397,13 @@ msgid "EBook not loaded\n"
msgstr ""
#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/calendar/calendar-conduit.c:1278
#: calendar/conduits/todo/todo-conduit.c:889
msgid "Could not start wombat server"
msgstr ""
#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/calendar/calendar-conduit.c:1279
#: calendar/conduits/todo/todo-conduit.c:890
msgid "Could not start wombat"
msgstr ""
@@ -468,10 +473,10 @@ msgid "Factory for the sample Addressbook control"
msgstr ""
#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:618
+#: addressbook/gui/component/addressbook-component.c:611
#: calendar/gui/dialogs/comp-editor-util.c:310
#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
#: shell/e-shortcuts.c:1067
msgid "Contacts"
msgstr ""
@@ -488,27 +493,36 @@ msgstr ""
msgid "LDAP server containing contact information"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:77
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Organisation:"
+
+#: addressbook/gui/component/addressbook-component.c:77
+msgid "Public folder containing contact information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:567
msgid "New Contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:567
msgid "_Contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:568
msgid "Create a new contact"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
msgid "New Contact List"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:571
msgid "Contact _List"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:572
msgid "Create a new contact list"
msgstr ""
@@ -545,7 +559,7 @@ msgid "LDAP was not enabled in this build of Evolution"
msgstr ""
#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
#, fuzzy
msgid "Could not initialize gnome-vfs"
msgstr "Could not initialise Bonobo"
@@ -555,24 +569,24 @@ msgstr "Could not initialise Bonobo"
msgid "Other Contacts"
msgstr "Organisation:"
-#: addressbook/gui/component/addressbook.c:471
+#: addressbook/gui/component/addressbook.c:474
msgid "Unable to open addressbook"
msgstr ""
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:480
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
msgstr ""
-#: addressbook/gui/component/addressbook.c:487
+#: addressbook/gui/component/addressbook.c:490
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
"is unreachable."
msgstr ""
-#: addressbook/gui/component/addressbook.c:492
+#: addressbook/gui/component/addressbook.c:495
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -580,43 +594,53 @@ msgid ""
"retrieving OpenLDAP from the link below.\n"
msgstr ""
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:504
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the server\n"
"is unreachable."
msgstr ""
-#: addressbook/gui/component/addressbook.c:613
-#: addressbook/gui/component/addressbook.c:616
+#. the user clicked cancel in the password dialog
+#: addressbook/gui/component/addressbook.c:582
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:625
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr "Synchronising \"%s\""
+
+#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:636
#, c-format
-msgid "Enter password for %s (user %s)"
+msgid "%sEnter password for %s (user %s)"
msgstr ""
-#: addressbook/gui/component/addressbook.c:741
+#: addressbook/gui/component/addressbook.c:782
msgid "Name begins with"
msgstr ""
-#: addressbook/gui/component/addressbook.c:742
+#: addressbook/gui/component/addressbook.c:783
msgid "Email begins with"
msgstr ""
-#: addressbook/gui/component/addressbook.c:743
+#: addressbook/gui/component/addressbook.c:784
#: calendar/gui/cal-search-bar.c:53
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:744
+#: addressbook/gui/component/addressbook.c:785
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:786
msgid "Advanced..."
msgstr ""
-#: addressbook/gui/component/addressbook.c:915
+#: addressbook/gui/component/addressbook.c:956
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -624,7 +648,7 @@ msgid ""
"the directory server preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:921
+#: addressbook/gui/component/addressbook.c:962
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -632,25 +656,25 @@ msgid ""
"preferences for this addressbook."
msgstr ""
-#: addressbook/gui/component/addressbook.c:927
+#: addressbook/gui/component/addressbook.c:968
msgid "The backend for this addressbook was unable to parse this query."
msgstr ""
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:971
msgid "The backend for this addressbook refused to perform this query."
msgstr ""
-#: addressbook/gui/component/addressbook.c:934
+#: addressbook/gui/component/addressbook.c:975
msgid "This query did not complete successfully."
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1009
+#: addressbook/gui/component/addressbook.c:1050
#: calendar/gui/cal-search-bar.c:382
msgid "Any Category"
msgstr ""
-#: addressbook/gui/component/addressbook.c:1091
+#: addressbook/gui/component/addressbook.c:1132
msgid "The URI that the Folder Browser will display"
msgstr ""
@@ -716,47 +740,47 @@ msgid " S_how Supported Bases "
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:2
-msgid "&lt;&lt; Fewer Options"
+msgid "1234"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "&lt;- _Remove"
+msgid "1:00"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
+msgid "2:30"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
+msgid "3268"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
+msgid "380"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
+msgid "389"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
+msgid "5:00"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
+msgid "636"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
+msgid "666"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
+msgid "<- _Remove"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
+msgid "<< Fewer Options"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:13
@@ -887,47 +911,53 @@ msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:45
msgid ""
-"Please select and Evolution attribute and an\n"
+"Please select an Evolution attribute and an\n"
"LDAP attribute to associate with it."
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:47
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "R_estore Defaults"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Re_store Defaults"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "S_earch scope: "
msgstr ""
#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: 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:1215
+#: calendar/gui/e-week-view.c:1242
msgid "Searching"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:53
#, fuzzy
msgid "Select"
msgstr "Synchronising \"%s\""
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:54
#, fuzzy
msgid "Selected:"
msgstr "Synchronising \"%s\""
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:55
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
"your LDAP server supports SSL or TLS."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:57
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -938,7 +968,7 @@ msgid ""
"secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:61
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -947,45 +977,45 @@ msgid ""
"exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:64
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:64
+#: addressbook/gui/component/ldap-config.glade.h:66
msgid ""
"Specifying a display name is the last required step in configuring an LDAP "
"server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:67
msgid "Step 1: Server Information"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:68
#, fuzzy
msgid "Step 2: Connecting to Server"
msgstr "Synchronise \"%s\""
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid "Step 3: Searching the Directory"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid "Step 4: Display Name"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "Sub"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:72
msgid "Supported Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:73
msgid ""
"The first step in configuring an LDAP server is to provide its name, and "
"your log in\n"
@@ -993,7 +1023,7 @@ msgid ""
"information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -1002,7 +1032,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -1010,7 +1040,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -1020,7 +1050,7 @@ msgid ""
"your base."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:83
msgid ""
"This assistant will help you to access online directory services\n"
"using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1030,34 +1060,34 @@ msgid ""
"need help finding this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
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:90
+#: addressbook/gui/component/ldap-config.glade.h:92
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:91
+#: addressbook/gui/component/ldap-config.glade.h:93
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:93
+#: addressbook/gui/component/ldap-config.glade.h:95
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -1065,11 +1095,11 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:98
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:99
msgid ""
"To add an attribute to the DN, select it from the list and click the \"Add "
"Attribute\" button.\n"
@@ -1078,24 +1108,24 @@ msgid ""
"that you add to the directory on the LDAP server. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:102
msgid "U_se SSL/TLS:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:103
msgid "Using distinguished name (DN)"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:104
msgid "Using email address"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:103
+#: addressbook/gui/component/ldap-config.glade.h:105
#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
msgid "Whenever Possible"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:106
#: 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
@@ -1103,44 +1133,44 @@ msgstr ""
msgid "_Add"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:107
+msgid "_Add ->"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:108
msgid "_Add Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:107
+#: addressbook/gui/component/ldap-config.glade.h:109
msgid "_Add to DN"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:110
msgid "_Always"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:111
msgid "_Delete Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:112
#, fuzzy
msgid "_Display name:"
msgstr "Synchronising \"%s\""
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:113
msgid "_Distinguished Name (DN):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:114
msgid "_Don't use SSL/TLS"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:115
msgid "_Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: 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
#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
#: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1150,93 +1180,93 @@ msgstr ""
msgid "_Edit"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:117
msgid "_Edit Mapping"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:118
#, fuzzy
msgid "_Evolution attribute:"
msgstr "Cannot initialise the Evolution shell."
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:119
msgid "_If necessary "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:118
+#: addressbook/gui/component/ldap-config.glade.h:120
msgid "_LDAP attribute:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:121
msgid "_LDAP attributes:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:122
msgid "_Log in method:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_More Options &gt;&gt;"
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_More Options >>"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:124
msgid "_Port number:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:125
msgid "_Restore Defaults"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:126
msgid "_Search base:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:127
msgid "_Server name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:128
msgid "_Timeout (minutes):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:129
msgid "account-druid"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:130
msgid "account-editor"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:131
msgid "cards"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:132
#, fuzzy
msgid "connecting-tab"
msgstr "Synchronise \"%s\""
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:133
msgid "dn-customization-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:134
msgid "edit_server_window_simple"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:135
msgid "general-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:136
msgid "mappings-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:137
msgid "objectclasses-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:138
msgid "searching-tab"
msgstr ""
@@ -1250,8 +1280,8 @@ msgstr ""
#. Fixme: Ditto
#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:698
-#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: 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
#: shell/e-shortcuts-view.c:178
msgid "Remove"
@@ -1282,11 +1312,11 @@ msgstr ""
msgid "Unnamed Contact"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:520
+#: addressbook/gui/component/select-names/e-select-names.c:514
msgid "Select Contacts from Addressbook"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:576
msgid "Find contact in"
msgstr ""
@@ -1357,7 +1387,7 @@ msgid "D_epartment:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:187
+#: calendar/gui/dialogs/task-editor.c:211
msgid "Details"
msgstr ""
@@ -1415,13 +1445,13 @@ msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
-#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
-#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
+#: 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
#: 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:45
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
msgid "_Delete"
msgstr ""
@@ -1449,1027 +1479,1027 @@ msgstr ""
msgid "_Web page address:"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
#: my-evolution/Locations.h:2341
msgid "United States"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
msgid "Afghanistan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
#: my-evolution/Locations.h:42
msgid "Albania"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
#: my-evolution/Locations.h:54
msgid "Algeria"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
msgid "American Samoa"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
msgid "Andorra"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
msgid "Angola"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
msgid "Anguilla"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
msgid "Antarctica"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "Antigua And Barbuda"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
#: my-evolution/Locations.h:120
#, fuzzy
msgid "Argentina"
msgstr "Organisation"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "Armenia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Aruba"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
#: my-evolution/Locations.h:154
msgid "Australia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
#: my-evolution/Locations.h:155
msgid "Austria"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
msgid "Azerbaijan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
#: my-evolution/Locations.h:161
msgid "Bahamas"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
#: my-evolution/Locations.h:164
msgid "Bahrain"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
msgid "Bangladesh"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
msgid "Barbados"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Belarus"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
#: my-evolution/Locations.h:216
msgid "Belgium"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
#: my-evolution/Locations.h:218
msgid "Belize"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Benin"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Bermuda"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Bhutan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
#: my-evolution/Locations.h:270
msgid "Bolivia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
msgid "Bosnia And Herzegowina"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Botswana"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Bouvet Island"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
#: my-evolution/Locations.h:294
msgid "Brazil"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
msgid "British Indian Ocean Territory"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "Brunei Darussalam"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
#: my-evolution/Locations.h:320
msgid "Bulgaria"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Burkina Faso"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
msgid "Burundi"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "Cambodia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Cameroon"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
#: my-evolution/Locations.h:354
msgid "Canada"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Cape Verde"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
#: my-evolution/Locations.h:389
msgid "Cayman Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Central African Republic"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Chad"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
#: my-evolution/Locations.h:438
#, fuzzy
msgid "Chile"
msgstr "Colours"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "China"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
#: my-evolution/Locations.h:451
msgid "Christmas Island"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "Cocos (Keeling) Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
#: my-evolution/Locations.h:483
msgid "Colombia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
#, fuzzy
msgid "Comoros"
msgstr "Colours"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
msgid "Congo"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "Cook Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
#: my-evolution/Locations.h:517
msgid "Costa Rica"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Cote d'Ivoire"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
#: my-evolution/Locations.h:528
msgid "Croatia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
#: my-evolution/Locations.h:532
msgid "Cuba"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
#: my-evolution/Locations.h:545
msgid "Cyprus"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
#: my-evolution/Locations.h:546
msgid "Czech Republic"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
#: my-evolution/Locations.h:580
msgid "Denmark"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
msgid "Djibouti"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
msgid "Dominica"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
#: my-evolution/Locations.h:608
msgid "Dominican Republic"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
msgid "East Timor"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
#: my-evolution/Locations.h:641
msgid "Ecuador"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
#: my-evolution/Locations.h:650
msgid "Egypt"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
#: my-evolution/Locations.h:666
msgid "El Salvador"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
msgid "Equatorial Guinea"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "Eritrea"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
#: my-evolution/Locations.h:684
msgid "Estonia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Ethiopia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "Falkland Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "Faroe Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Fiji"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
#: my-evolution/Locations.h:716
msgid "Finland"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
#: my-evolution/Locations.h:766
msgid "France"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "French Guiana"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "French Polynesia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "French Southern Territories"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "Gabon"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "Gambia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
#: my-evolution/Locations.h:811
msgid "Georgia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
#: my-evolution/Locations.h:812
msgid "Germany"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "Ghana"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
#: my-evolution/Locations.h:815
msgid "Gibraltar"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
#: my-evolution/Locations.h:846
msgid "Greece"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Greenland"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Grenada"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Guadeloupe"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Guam"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
#: my-evolution/Locations.h:867
msgid "Guatemala"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Guinea"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Guinea-bissau"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Guyana"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
#: my-evolution/Locations.h:888
msgid "Haiti"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Heard And McDonald Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Holy See"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
#: my-evolution/Locations.h:945
msgid "Honduras"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
#: my-evolution/Locations.h:946
msgid "Hong Kong"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
#: my-evolution/Locations.h:966
msgid "Hungary"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
#: my-evolution/Locations.h:978
msgid "Iceland"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
#: my-evolution/Locations.h:991
msgid "India"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
msgid "Indonesia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
#: my-evolution/Locations.h:1007
msgid "Ireland"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
msgid "Israel"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
#: my-evolution/Locations.h:1016
msgid "Italy"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
#: my-evolution/Locations.h:1031
msgid "Jamaica"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
#: my-evolution/Locations.h:1035
msgid "Japan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
#: my-evolution/Locations.h:1046
msgid "Jordan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Kazakhstan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
msgid "Kenya"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Kiribati"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
msgid "Korea, Republic Of"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
#: my-evolution/Locations.h:1146
msgid "Kuwait"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Kyrgyzstan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Laos"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Latvia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
#: my-evolution/Locations.h:1197
msgid "Lebanon"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Lesotho"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
#: my-evolution/Locations.h:1217
msgid "Liberia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Liechtenstein"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
#: my-evolution/Locations.h:1233
msgid "Lithuania"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
#: my-evolution/Locations.h:1267
msgid "Luxembourg"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Macau"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Macedonia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Madagascar"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Malawi"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Malaysia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Maldives"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Mali"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
#: my-evolution/Locations.h:1296
msgid "Malta"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Marshall Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Martinique"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Mauritania"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Mauritius"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
msgid "Mayotte"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
#: my-evolution/Locations.h:1386
msgid "Mexico"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Micronesia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Moldova, Republic Of"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Monaco"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Mongolia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Montserrat"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
#: my-evolution/Locations.h:1469
msgid "Morocco"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Mozambique"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Myanmar"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Namibia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Nauru"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Nepal"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
#: my-evolution/Locations.h:1530
msgid "Netherlands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Netherlands Antilles"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "New Caledonia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
#: my-evolution/Locations.h:1559
msgid "New Zealand"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
#: my-evolution/Locations.h:1561
msgid "Nicaragua"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Niger"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Nigeria"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Niue"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
#: my-evolution/Locations.h:1573
msgid "Norfolk Island"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "Northern Mariana Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
#: my-evolution/Locations.h:1586
msgid "Norway"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
#: my-evolution/Locations.h:1631
msgid "Oman"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
#: my-evolution/Locations.h:1672
msgid "Pakistan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Palau"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Palestinian Territory"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
#: my-evolution/Locations.h:1682
msgid "Panama"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "Papua New Guinea"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
#: my-evolution/Locations.h:1687
msgid "Paraguay"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
#: my-evolution/Locations.h:1722
msgid "Peru"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Philippines"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Pitcairn"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
#: my-evolution/Locations.h:1763
msgid "Poland"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
#: my-evolution/Locations.h:1790
msgid "Portugal"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
#: my-evolution/Locations.h:1823
msgid "Puerto Rico"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
#: my-evolution/Locations.h:1835
msgid "Qatar"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Reunion"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
#: my-evolution/Locations.h:1910
msgid "Romania"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Russian Federation"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Rwanda"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Saint Kitts And Nevis"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Saint Lucia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Saint Vincent And The Grena-dines"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Samoa"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "San Marino"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Sao Tome And Principe"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
#: my-evolution/Locations.h:2033
msgid "Saudi Arabia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Senegal"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Seychelles"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Sierra Leone"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
#: my-evolution/Locations.h:2088
msgid "Singapore"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
#: my-evolution/Locations.h:2101
msgid "Slovakia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
#: my-evolution/Locations.h:2102
msgid "Slovenia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Solomon Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Somalia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
#: my-evolution/Locations.h:2117
msgid "South Africa"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "South Georgia And The South Sandwich Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
#: my-evolution/Locations.h:2125
msgid "Spain"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Sri Lanka"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "St. Helena"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
msgid "St. Pierre And Miquelon"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Sudan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
#: my-evolution/Locations.h:2174
msgid "Suriname"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "Svalbard And Jan Mayen Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "Swaziland"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
#: my-evolution/Locations.h:2179
msgid "Sweden"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
#: my-evolution/Locations.h:2181
msgid "Switzerland"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
#: my-evolution/Locations.h:2203
msgid "Taiwan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "Tajikistan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "Tanzania, United Republic Of"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "Thailand"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Togo"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "Tokelau"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "Tonga"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "Trinidad And Tobago"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Tunisia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
#: my-evolution/Locations.h:2319
msgid "Turkey"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Turkmenistan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Turks And Caicos Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Tuvalu"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Uganda"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
#: my-evolution/Locations.h:2332
msgid "Ukraine"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "United Arab Emirates"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
#: my-evolution/Locations.h:2340
msgid "United Kingdom"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "United States Minor Outlying Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
#: my-evolution/Locations.h:2346
msgid "Uruguay"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Uzbekistan"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Vanuatu"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
#: my-evolution/Locations.h:2378
msgid "Venezuela"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
#: my-evolution/Locations.h:2390
msgid "Viet Nam"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Virgin Islands, British"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Virgin Islands, U.S."
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "Wallis And Futuna Islands"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "Western Sahara"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
#: my-evolution/Locations.h:2510
msgid "Yemen"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
#: my-evolution/Locations.h:2522
msgid "Yugoslavia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Zambia"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Zimbabwe"
msgstr ""
@@ -2504,20 +2534,20 @@ msgstr ""
msgid "Could not find widget for a field: `%s'"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
msgid "Contact Quick-Add"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
msgid "Edit Full"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
#: addressbook/gui/widgets/e-addressbook-view.c:357
msgid "Full Name"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
msgid "E-mail"
msgstr ""
@@ -2537,6 +2567,18 @@ msgid ""
"Do you want to overwrite it?"
msgstr ""
+#: addressbook/gui/contact-editor/file-exists.glade.h:1
+msgid "Confirm Overwrite"
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:2
+msgid "Don't bother translating this string. It's not used."
+msgstr ""
+
+#: addressbook/gui/contact-editor/file-exists.glade.h:3
+msgid "Overwrite"
+msgstr ""
+
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
msgid "Address _2:"
msgstr ""
@@ -2667,7 +2709,7 @@ msgstr ""
msgid "Contact List Editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
msgid "Save List as VCard"
msgstr ""
@@ -2713,7 +2755,7 @@ msgid ""
msgstr ""
#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:153
msgid "Advanced Search"
msgstr ""
@@ -2722,24 +2764,24 @@ msgstr ""
msgid "Search"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:142
msgid "No cards"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:145
msgid "1 card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:148
#, c-format
msgid "%d cards"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:402
+#: addressbook/gui/widgets/e-addressbook-model.c:404
msgid "Error getting book view"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
#: addressbook/gui/widgets/e-addressbook-util.c:91
#: addressbook/gui/widgets/e-minicard.c:475
msgid "Error modifying card"
@@ -2751,10 +2793,10 @@ msgid "Success"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-command.c:396
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
+#: 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
msgid "Unknown error"
msgstr ""
@@ -2762,7 +2804,7 @@ msgstr ""
msgid "Repository offline"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:574
#: shell/evolution-shell-component.c:1171
msgid "Permission denied"
msgstr ""
@@ -2783,8 +2825,8 @@ msgstr ""
#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
#: 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:738 camel/camel-service.c:778
-#: camel/camel-service.c:846 camel/camel-service.c:889
+#: camel/camel-service.c:739 camel/camel-service.c:779
+#: camel/camel-service.c:847 camel/camel-service.c:890
msgid "Cancelled"
msgstr ""
@@ -2832,7 +2874,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:1670
+#: addressbook/gui/widgets/e-addressbook-view.c:1672
msgid "Error removing card"
msgstr ""
@@ -2849,9 +2891,8 @@ msgstr "Synchronising \"%s\""
#: addressbook/gui/widgets/e-addressbook-util.c:213
#, c-format
msgid ""
-"You have requested that %d cards be cards. This will cause %d new windows to "
-"be\n"
-"displayed on your screen. Do you really want to display all of these cards?"
+"Opening %d cards will open %d new windows as well.\n"
+"Do you really want to display all of these cards?"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-util.c:348
@@ -2937,7 +2978,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.c:722
#: addressbook/gui/widgets/e-addressbook-view.c:911
-#: addressbook/gui/widgets/e-addressbook-view.c:1872
+#: addressbook/gui/widgets/e-addressbook-view.c:1874
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr ""
@@ -3016,7 +3057,7 @@ msgstr ""
msgid "Paste"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:10
#: 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
@@ -3024,8 +3065,8 @@ msgstr ""
msgid "Delete"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:930
-#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
msgid "Current View"
msgstr ""
@@ -3033,7 +3074,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:963
+#: addressbook/gui/widgets/e-addressbook-view.c:965
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 ""
@@ -3041,11 +3082,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:968
+#: addressbook/gui/widgets/e-addressbook-view.c:970
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:1372
+#: addressbook/gui/widgets/e-addressbook-view.c:1374
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -3169,7 +3210,7 @@ msgid "Include:"
msgstr ""
#: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:625
+#: calendar/gui/tasks-control.c:634
msgid "Landscape"
msgstr ""
@@ -3194,7 +3235,7 @@ msgid "Options"
msgstr ""
#: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:621
#, fuzzy
msgid "Orientation"
msgstr "Organisation"
@@ -3218,7 +3259,7 @@ msgstr ""
#. Portrait
#: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:627
msgid "Portrait"
msgstr ""
@@ -3280,20 +3321,20 @@ msgstr ""
#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
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/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
msgid "Normal"
msgstr ""
#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
msgid "Low"
msgstr ""
@@ -3304,13 +3345,17 @@ msgstr ""
msgid "Undefined"
msgstr ""
-#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/calendar/calendar-conduit.c:205
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:1225
#: calendar/conduits/todo/todo-conduit.c:835
msgid "Error while communicating with calendar server"
msgstr ""
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/calendar/calendar-conduit.c:1300
+#: calendar/conduits/calendar/calendar-conduit.c:1372
+#: calendar/conduits/calendar/calendar-conduit.c:1375
msgid "Could not read pilot's Calendar application block"
msgstr ""
@@ -3426,11 +3471,11 @@ msgstr ""
msgid "_Edit appointment"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:676
+#: calendar/gui/alarm-notify/alarm-queue.c:680
msgid "No description available."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:736
+#: calendar/gui/alarm-notify/alarm-queue.c:741
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3438,13 +3483,13 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
+#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2897
#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:759
+#: calendar/gui/alarm-notify/alarm-queue.c:764
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3455,16 +3500,16 @@ msgid ""
"Are you sure you want to run this program?"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:773
+#: calendar/gui/alarm-notify/alarm-queue.c:778
msgid "Do not ask me about this program again."
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
#, fuzzy
msgid "Could not initialize GNOME"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:184
msgid "Could not create the alarm notify service factory"
msgstr ""
@@ -3514,7 +3559,7 @@ msgstr "%m/%d/%Y"
msgid "%d %B"
msgstr ""
-#: calendar/gui/calendar-commands.c:797
+#: calendar/gui/calendar-commands.c:799
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
@@ -3588,9 +3633,9 @@ msgstr ""
#. An empty string is the same as 'None'.
#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
-#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: 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/mail-account-gui.c:1650 mail/mail-accounts.c:453
#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
@@ -3607,13 +3652,13 @@ msgid "Assigned"
msgstr ""
#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
-#: calendar/gui/e-meeting-model.c:859
+#: 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/e-meeting-model.c:860
+#: calendar/gui/e-meeting-model.c:863
msgid "No"
msgstr ""
@@ -3633,74 +3678,91 @@ msgstr ""
msgid "Month View"
msgstr ""
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
-#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1365
+#: 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"
msgstr ""
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:72
msgid "Folder containing appointments and events"
msgstr ""
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
-#: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: calendar/gui/component-factory.c:76
+#, fuzzy
+msgid "Public Calendar"
+msgstr "Colours"
+
+#: calendar/gui/component-factory.c:77
+msgid "Public folder containing appointments and events"
+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
#: shell/e-shortcuts.c:1063
msgid "Tasks"
msgstr ""
-#: calendar/gui/component-factory.c:75
+#: calendar/gui/component-factory.c:82
msgid "Folder containing to-do items"
msgstr ""
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:86
+msgid "Public Tasks"
+msgstr ""
+
+#: calendar/gui/component-factory.c:87
+msgid "Public folder containing to-do items"
+msgstr ""
+
+#: calendar/gui/component-factory.c:735
msgid "New appointment"
msgstr ""
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:735
msgid "_Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:710
+#: calendar/gui/component-factory.c:736
msgid "Create a new appointment"
msgstr ""
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
msgid "New meeting"
msgstr ""
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:740
msgid "_Meeting"
msgstr ""
-#: calendar/gui/component-factory.c:715
+#: calendar/gui/component-factory.c:741
msgid "Create a new meeting request"
msgstr ""
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
msgid "New task"
msgstr ""
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:745
msgid "_Task"
msgstr ""
-#: calendar/gui/component-factory.c:720
+#: calendar/gui/component-factory.c:746
msgid "Create a new task"
msgstr ""
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
msgid "New All Day Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:750
msgid "All _Day Appointment"
msgstr ""
-#: calendar/gui/component-factory.c:725
+#: calendar/gui/component-factory.c:751
msgid "Create a new all-day appointment"
msgstr ""
@@ -3742,25 +3804,25 @@ msgid "Alarm Repeat"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Message to Display"
+msgid ""
+"Evolution does not yet support email notification for reminders. You will "
+"not be able to edit the options for this reminder."
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Play sound:"
+msgid "Message to Display"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Repeat the alarm"
+msgid "Play sound:"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Run program:"
+msgid "Repeat the alarm"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid ""
-"This is an email reminder, but Evolution does not yet support this kind of "
-"reminders. You will not be able to edit the options for this reminder."
+msgid "Run program:"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:7
@@ -3786,110 +3848,110 @@ msgstr ""
msgid "minutes"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:319
#, c-format
msgid "%d days"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:312
+#: calendar/gui/dialogs/alarm-page.c:322
msgid "1 day"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/dialogs/alarm-page.c:327
#, c-format
msgid "%d weeks"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:330
msgid "1 week"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:335
#, c-format
msgid "%d hours"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:328
+#: calendar/gui/dialogs/alarm-page.c:338
msgid "1 hour"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:333
+#: calendar/gui/dialogs/alarm-page.c:343
#, c-format
msgid "%d minutes"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:336
+#: calendar/gui/dialogs/alarm-page.c:346
msgid "1 minute"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:341
+#: calendar/gui/dialogs/alarm-page.c:351
#, c-format
msgid "%d seconds"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:354
msgid "1 second"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:383
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:387
#: calendar/gui/dialogs/alarm-page.glade.h:3
msgid "Display a message"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:391
msgid "Send an email"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:395
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:401
msgid "Unknown action to be performed"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/dialogs/alarm-page.c:413
#, c-format
msgid "%s %s before the start of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/dialogs/alarm-page.c:416
#, c-format
msgid "%s %s after the start of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/dialogs/alarm-page.c:421
#, c-format
msgid "%s at the start of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/dialogs/alarm-page.c:430
#, c-format
msgid "%s %s before the end of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/dialogs/alarm-page.c:433
#, c-format
msgid "%s %s after the end of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/dialogs/alarm-page.c:438
#, c-format
msgid "%s at the end of the appointment"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:462
#, c-format
msgid "%s at %s"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:458
+#: calendar/gui/dialogs/alarm-page.c:468
#, c-format
msgid "%s for an unknown trigger type"
msgstr ""
@@ -3910,7 +3972,7 @@ msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr ""
@@ -3993,7 +4055,7 @@ msgid "Days"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1125
+#: calendar/gui/dialogs/recurrence-page.c:1127
msgid "Friday"
msgstr ""
@@ -4006,7 +4068,7 @@ msgid "Minutes"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1121
+#: calendar/gui/dialogs/recurrence-page.c:1123
msgid "Monday"
msgstr ""
@@ -4015,7 +4077,7 @@ msgid "S_un"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1126
+#: calendar/gui/dialogs/recurrence-page.c:1128
msgid "Saturday"
msgstr ""
@@ -4028,7 +4090,7 @@ msgid "Show week _numbers in date navigator"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1127
+#: calendar/gui/dialogs/recurrence-page.c:1129
msgid "Sunday"
msgstr ""
@@ -4046,7 +4108,7 @@ msgid "Task List"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1124
+#: calendar/gui/dialogs/recurrence-page.c:1126
msgid "Thursday"
msgstr ""
@@ -4063,7 +4125,7 @@ msgid "Time format:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1122
+#: calendar/gui/dialogs/recurrence-page.c:1124
msgid "Tuesday"
msgstr ""
@@ -4072,7 +4134,7 @@ msgid "W_eek starts:"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1123
+#: calendar/gui/dialogs/recurrence-page.c:1125
msgid "Wednesday"
msgstr ""
@@ -4290,8 +4352,8 @@ msgid "No summary"
msgstr ""
#: calendar/gui/dialogs/comp-editor.c:1220
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
-#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
+#: 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
msgid "Save as..."
msgstr ""
@@ -4360,27 +4422,27 @@ msgstr ""
msgid "Enter Delegate"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
msgid "Appointment"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:199
+#: calendar/gui/dialogs/event-editor.c:222
msgid "Reminder"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:204
+#: calendar/gui/dialogs/event-editor.c:227
msgid "Recurrence"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:211
-#: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:407
+#: calendar/gui/dialogs/event-editor.c:232
+#: calendar/gui/dialogs/event-editor.c:299
+#: calendar/gui/dialogs/event-editor.c:433
msgid "Scheduling"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:216
-#: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:237
+#: calendar/gui/dialogs/event-editor.c:302
+#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr ""
@@ -4449,19 +4511,19 @@ msgstr ""
msgid "_Start time:"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:413
+#: calendar/gui/dialogs/meeting-page.c:414
msgid "An organizer is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:438
msgid "At least one attendee is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:593
+#: calendar/gui/dialogs/meeting-page.c:594
msgid "That person is already attending the meeting!"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:668
+#: calendar/gui/dialogs/meeting-page.c:669
msgid "_Delegate To..."
msgstr ""
@@ -4501,7 +4563,7 @@ msgid "Member"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:905
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr ""
@@ -4513,7 +4575,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:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
#: mail/message-list.etspec.h:12
msgid "Status"
msgstr ""
@@ -4588,44 +4650,44 @@ msgstr ""
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:997
+#: calendar/gui/dialogs/recurrence-page.c:999
msgid "on"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1062
+#: calendar/gui/dialogs/recurrence-page.c:1064
msgid "first"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:1065 filter/filter-datespec.c:70
msgid "second"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1064
+#: calendar/gui/dialogs/recurrence-page.c:1066
msgid "third"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1065
+#: calendar/gui/dialogs/recurrence-page.c:1067
msgid "fourth"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1066
+#: calendar/gui/dialogs/recurrence-page.c:1068
msgid "last"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1092
+#: calendar/gui/dialogs/recurrence-page.c:1094
#, fuzzy
msgid "Other Date"
msgstr "Organisation:"
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1122 filter/filter-datespec.c:73
msgid "day"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1260
+#: calendar/gui/dialogs/recurrence-page.c:1262
msgid "on the"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1445
+#: calendar/gui/dialogs/recurrence-page.c:1447
msgid "occurrences"
msgstr ""
@@ -4717,7 +4779,7 @@ msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:572 calendar/gui/e-meeting-model.c:872
+#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
msgid "Needs Action"
msgstr ""
@@ -4726,7 +4788,7 @@ msgid "Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:889
msgid "URL:"
msgstr ""
@@ -4738,17 +4800,17 @@ msgstr ""
msgid "_Status:"
msgstr ""
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:206
msgid "Basic"
msgstr ""
-#: calendar/gui/dialogs/task-editor.c:194
-#: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:359
+#: calendar/gui/dialogs/task-editor.c:216
+#: calendar/gui/dialogs/task-editor.c:261
+#: calendar/gui/dialogs/task-editor.c:386
msgid "Assignment"
msgstr ""
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:835
#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
msgid "Description:"
@@ -4818,12 +4880,12 @@ msgid "100%"
msgstr ""
#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1892
+#: calendar/gui/e-week-view.c:1919
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
+#: 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
#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
msgid "_Open"
msgstr ""
@@ -4832,30 +4894,30 @@ msgstr ""
msgid "_Save as..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
-#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
+#: 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
#: 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:3752
-#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
+#: 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
#: 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:3753
-#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
+#: 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
#: 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:3716
-#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
-#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
+#: 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
#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
#: ui/evolution-tasks.xml.h:19
msgid "_Paste"
@@ -4881,12 +4943,12 @@ msgstr ""
msgid "_Delete Selected Tasks"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
-#: calendar/gui/e-week-view.c:4303
+#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7612
+#: calendar/gui/e-week-view.c:4266
msgid "Updating objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1357
+#: calendar/gui/e-calendar-table.c:1360
#: calendar/gui/e-calendar-table.etspec.h:6
msgid "Click to add a task"
msgstr ""
@@ -4895,8 +4957,8 @@ msgstr ""
msgid "Alarms"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
-#: camel/camel-filter-driver.c:1100
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
+#: camel/camel-filter-driver.c:1109
msgid "Complete"
msgstr ""
@@ -4925,7 +4987,7 @@ msgid "Start Date"
msgstr ""
#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: my-evolution/component-factory.c:51 shell/e-shell.c:748
#: shell/e-shortcuts.c:1051
msgid "Summary"
msgstr ""
@@ -4989,437 +5051,443 @@ msgstr ""
msgid "pm"
msgstr ""
-#: calendar/gui/e-day-view.c:3700
+#: calendar/gui/e-day-view.c:3707
msgid "New _Appointment"
msgstr ""
-#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3516
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3517
msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
+#: calendar/gui/e-day-view.c:3713 calendar/gui/e-week-view.c:3518
msgid "New Task"
msgstr ""
-#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3718 ui/evolution-comp-editor.xml.h:11
msgid "Print..."
msgstr ""
-#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3532
#: ui/evolution-calendar.xml.h:10
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
+#: calendar/gui/e-day-view.c:3732 calendar/gui/e-week-view.c:3533
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3537
#: ui/evolution-calendar.xml.h:31
msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
+#: calendar/gui/e-day-view.c:3742 calendar/gui/e-week-view.c:3541
msgid "_Configure..."
msgstr ""
-#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
+#: calendar/gui/e-day-view.c:3744 calendar/gui/e-week-view.c:3542
msgid "_Configure Pilot..."
msgstr ""
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
-#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
+#: 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
msgid "_Save As..."
msgstr ""
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3561
msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3562
msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
+#: calendar/gui/e-day-view.c:3771 calendar/gui/e-week-view.c:3567
msgid "Make this Occurrence _Movable"
msgstr ""
-#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
+#: calendar/gui/e-day-view.c:3772 calendar/gui/e-week-view.c:3568
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
+#: calendar/gui/e-day-view.c:3773 calendar/gui/e-week-view.c:3569
msgid "Delete _All Occurrences"
msgstr ""
-#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
-#: shell/e-shell-view-menu.c:639
+#: 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:4134 calendar/gui/e-week-view.c:3936
-#: shell/e-shell-view-menu.c:647
+#: 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:583
+#: calendar/gui/e-itip-control.c:590
msgid "<b>Starts:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:600
msgid "<b>Ends:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:613
msgid "<b>Completed:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:623
msgid "<b>Due:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:660 calendar/gui/e-itip-control.c:710
msgid "iCalendar Information"
msgstr ""
#. Title
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:675
msgid "iCalendar Error"
msgstr ""
-#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
+#: calendar/gui/e-itip-control.c:741 calendar/gui/e-itip-control.c:757
msgid "An unknown person"
msgstr ""
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:757
+#: calendar/gui/e-itip-control.c:764
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:779
msgid "<i>None</i>"
msgstr ""
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:789
#, fuzzy
msgid "Location:"
msgstr "Organisation"
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:803
msgid "Status:"
msgstr ""
-#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
-#: calendar/gui/itip-utils.c:463
+#: calendar/gui/e-itip-control.c:808 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
msgid "Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
+#: calendar/gui/e-itip-control.c:812 calendar/gui/itip-utils.c:503
msgid "Tentatively Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
-#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
+#: calendar/gui/e-itip-control.c:816 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
msgid "Declined"
msgstr ""
-#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:820 calendar/gui/e-itip-control.c:1026
#: 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:831
-#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
+#: 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
#: camel/providers/smtp/camel-smtp-transport.c:172
#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
#: widgets/misc/e-charset-picker.c:444
msgid "Unknown"
msgstr ""
-#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
+#: 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
msgid "Choose an action:"
msgstr ""
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:874
msgid "Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
-#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
-#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
+#: 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
msgid "OK"
msgstr ""
-#: calendar/gui/e-itip-control.c:895
+#: calendar/gui/e-itip-control.c:902
msgid "Accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:903
msgid "Tentatively accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:904
msgid "Decline"
msgstr ""
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:928
msgid "Send Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:934
+#: calendar/gui/e-itip-control.c:941
msgid "Update respondent status"
msgstr ""
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:954
msgid "Send Latest Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: calendar/gui/e-itip-control.c:967 calendar/gui/itip-utils.c:520
#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr ""
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1045
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
msgid "Meeting Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1050
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1051
msgid "Meeting Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1055
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1056
msgid "Meeting Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1060
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1061
msgid "Meeting Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1068
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1069
msgid "Meeting Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1076
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1077
msgid "Meeting Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1180
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:1078
+#: calendar/gui/e-itip-control.c:1085
msgid "Bad Meeting Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1106
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1100
+#: calendar/gui/e-itip-control.c:1107
msgid "Task Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1111
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1112
msgid "Task Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1116
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1117
msgid "Task Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1121
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1122
msgid "Task Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1129
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr ""
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1130
msgid "Task Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1137
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:1138
msgid "Task Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1146
msgid "Bad Task Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1165
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1166
msgid "Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1170
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1171
msgid "Free/Busy Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1175
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1176
msgid "Free/Busy Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1181
msgid "Bad Free/Busy Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1236
msgid "The message does not appear to be properly formed"
msgstr ""
-#: calendar/gui/e-itip-control.c:1248
+#: calendar/gui/e-itip-control.c:1298
msgid "The message contains only unsupported requests."
msgstr ""
-#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1326 calendar/gui/e-itip-control.c:1332
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1307
+#: calendar/gui/e-itip-control.c:1357
msgid "The attachment has no viewable calendar items"
msgstr ""
-#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1508 calendar/gui/e-itip-control.c:1600
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1511 calendar/gui/e-itip-control.c:1603
msgid "There was an error on the CORBA system\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
+#: calendar/gui/e-itip-control.c:1514 calendar/gui/e-itip-control.c:1606
msgid "Object could not be found\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
-msgid "You don't have permissions to update the calendar\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1517
+#, fuzzy
+msgid "You do not have the right permissions to update the calendar\n"
+msgstr "Synchronising \"%s\""
-#: calendar/gui/e-itip-control.c:1470
+#: calendar/gui/e-itip-control.c:1520
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1523
msgid "Calendar file could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
+#: calendar/gui/e-itip-control.c:1552 calendar/gui/e-itip-control.c:1618
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1523
+#: calendar/gui/e-itip-control.c:1573
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1585
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1562
+#: calendar/gui/e-itip-control.c:1609
+#, fuzzy
+msgid "You don't have the right permissions to update the calendar\n"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/e-itip-control.c:1612
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1565
+#: calendar/gui/e-itip-control.c:1615
msgid "Attendee status could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1600
+#: calendar/gui/e-itip-control.c:1650
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1680 calendar/gui/e-itip-control.c:1730
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1682 calendar/gui/e-itip-control.c:1734
msgid "The item could not be sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1807
#, fuzzy
msgid "Select Calendar Folder"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1814
#, fuzzy
msgid "Select Tasks Folder"
msgstr "Synchronising \"%s\""
@@ -5465,7 +5533,7 @@ msgstr ""
msgid "Chair Persons"
msgstr ""
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
msgid "Required Participants"
msgstr ""
@@ -5478,52 +5546,52 @@ msgid "Resources"
msgstr ""
#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
msgid "Individual"
msgstr ""
#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:828
+#: calendar/gui/e-meeting-model.c:831
msgid "Group"
msgstr ""
#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:829
+#: calendar/gui/e-meeting-model.c:832
msgid "Resource"
msgstr ""
#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:833
msgid "Room"
msgstr ""
#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:843
+#: calendar/gui/e-meeting-model.c:846
msgid "Chair"
msgstr ""
#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
msgid "Required Participant"
msgstr ""
#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:845
+#: calendar/gui/e-meeting-model.c:848
msgid "Optional Participant"
msgstr ""
#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:849
msgid "Non-Participant"
msgstr ""
#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
msgid "Tentative"
msgstr ""
#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:876
+#: calendar/gui/e-meeting-model.c:879
msgid "Delegated"
msgstr ""
@@ -5613,40 +5681,47 @@ msgstr ""
msgid "Meeting _end time:"
msgstr ""
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
-#: calendar/gui/gnome-cal.c:1987
+#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2018
#, c-format
msgid "Opening tasks at %s"
msgstr ""
-#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr ""
-#: calendar/gui/e-tasks.c:390
+#: calendar/gui/e-tasks.c:393
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr ""
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
+#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1546
#, fuzzy, c-format
msgid "You don't have permission to open the folder in `%s'"
msgstr "Synchronising \"%s\""
-#: calendar/gui/e-tasks.c:522
+#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1744
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:540
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:545
+#: calendar/gui/e-tasks.c:563
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:638
+#: calendar/gui/e-tasks.c:656
msgid "Expunging"
msgstr ""
-#: calendar/gui/e-week-view.c:3519
+#: calendar/gui/e-week-view.c:3515
msgid "New _Appointment..."
msgstr ""
@@ -5660,7 +5735,13 @@ msgstr ""
msgid "The method required to open `%s' is not supported"
msgstr ""
-#: calendar/gui/gnome-cal.c:1734
+#. add the alarms for this client
+#: calendar/gui/gnome-cal.c:1575
+#, fuzzy, c-format
+msgid "Adding alarms for %s"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/gnome-cal.c:1761
#, c-format
msgid ""
"The calendar backend for\n"
@@ -5668,7 +5749,7 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1739
+#: calendar/gui/gnome-cal.c:1766
#, c-format
msgid ""
"The task backend for\n"
@@ -5676,12 +5757,12 @@ msgid ""
" has crashed. You will have to restart Evolution in order to use it again"
msgstr ""
-#: calendar/gui/gnome-cal.c:1959
+#: calendar/gui/gnome-cal.c:1990
#, c-format
msgid "Opening calendar at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:2029
#, fuzzy
msgid "Opening default tasks folder"
msgstr "Synchronising \"%s\""
@@ -5742,47 +5823,56 @@ msgstr ""
msgid "September"
msgstr ""
-#: calendar/gui/itip-utils.c:356
-msgid "At least one attendee is necessary"
+#: calendar/gui/itip-utils.c:366 calendar/gui/itip-utils.c:429
+msgid "An organizer must be set."
msgstr ""
-#: calendar/gui/itip-utils.c:392
-msgid "An organizer must be set."
+#: calendar/gui/itip-utils.c:393
+msgid "At least one attendee is necessary"
msgstr ""
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:472 calendar/gui/itip-utils.c:581
msgid "Event information"
msgstr ""
-#: calendar/gui/itip-utils.c:437
+#: calendar/gui/itip-utils.c:474 calendar/gui/itip-utils.c:583
msgid "Task information"
msgstr ""
-#: calendar/gui/itip-utils.c:439
+#: calendar/gui/itip-utils.c:476 calendar/gui/itip-utils.c:585
msgid "Journal information"
msgstr ""
-#: calendar/gui/itip-utils.c:441
+#: calendar/gui/itip-utils.c:478 calendar/gui/itip-utils.c:602
msgid "Free/Busy information"
msgstr ""
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:480
msgid "Calendar information"
msgstr ""
-#: calendar/gui/itip-utils.c:479
+#: calendar/gui/itip-utils.c:516
msgid "Updated"
msgstr ""
-#: calendar/gui/itip-utils.c:487
+#: calendar/gui/itip-utils.c:524
msgid "Refresh"
msgstr ""
-#: calendar/gui/itip-utils.c:491
+#: calendar/gui/itip-utils.c:528
msgid "Counter-proposal"
msgstr ""
-#: calendar/gui/itip-utils.c:678
+#: calendar/gui/itip-utils.c:596
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:608
+msgid "iCalendar information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:766
msgid "You must be an attendee of the event."
msgstr ""
@@ -6019,7 +6109,7 @@ msgid "Print Calendar"
msgstr ""
#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
+#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3189
#: my-evolution/e-summary.c:619
msgid "Print Preview"
msgstr ""
@@ -6041,7 +6131,7 @@ msgstr ""
msgid "The URI of the tasks folder to display"
msgstr ""
-#: calendar/gui/tasks-control.c:453
+#: calendar/gui/tasks-control.c:462
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -6049,12 +6139,12 @@ msgid ""
"Really erase these tasks?"
msgstr ""
-#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
-#: mail/mail-callbacks.c:2884
+#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2669
+#: mail/mail-callbacks.c:2911
msgid "Do not ask me again."
msgstr ""
-#: calendar/gui/tasks-control.c:609
+#: calendar/gui/tasks-control.c:618
msgid "Print Tasks"
msgstr ""
@@ -6115,128 +6205,132 @@ msgstr ""
msgid "Can't call getFolderAtPath on storage: %s"
msgstr ""
-#: calendar/importers/icalendar-importer.c:482
+#: calendar/importers/icalendar-importer.c:483
msgid "Reminder!!"
msgstr ""
-#: calendar/importers/icalendar-importer.c:696
+#: calendar/importers/icalendar-importer.c:697
msgid "Calendar Events"
msgstr ""
-#: calendar/importers/icalendar-importer.c:721
+#: calendar/importers/icalendar-importer.c:722
msgid ""
"Evolution has found Gnome Calendar files.\n"
"Would you like to import them into Evolution?"
msgstr ""
-#: calendar/importers/icalendar-importer.c:728
+#: calendar/importers/icalendar-importer.c:729
msgid "Gnome Calendar"
msgstr ""
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:289
msgid "time-now expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:279
+#: calendar/pcs/query.c:313
msgid "make-time expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:318
msgid "make-time expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:292
+#: calendar/pcs/query.c:326
msgid "make-time argument 1 must be an ISO 8601 date/time string"
msgstr ""
-#: calendar/pcs/query.c:321
+#: calendar/pcs/query.c:355
msgid "time-add-day expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:360
msgid "time-add-day expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:333
+#: calendar/pcs/query.c:367
msgid "time-add-day expects argument 2 to be an integer"
msgstr ""
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:394
msgid "time-day-begin expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:365
+#: calendar/pcs/query.c:399
msgid "time-day-begin expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:392
+#: calendar/pcs/query.c:426
msgid "time-day-end expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:397
+#: calendar/pcs/query.c:431
msgid "time-day-end expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:433
+#: calendar/pcs/query.c:467
msgid "get-vtype expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:529
+#: calendar/pcs/query.c:563
msgid "occur-in-time-range? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:568
msgid "occur-in-time-range? expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:541
+#: calendar/pcs/query.c:575
msgid "occur-in-time-range? expects argument 2 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:671
+#: calendar/pcs/query.c:705
msgid "contains? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:710
msgid "contains? expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:683
+#: calendar/pcs/query.c:717
msgid "contains? expects argument 2 to be a string"
msgstr ""
-#: calendar/pcs/query.c:700
+#: calendar/pcs/query.c:734
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
"\""
msgstr ""
-#: calendar/pcs/query.c:742
+#: calendar/pcs/query.c:776
msgid "has-categories? expects at least 1 argument"
msgstr ""
-#: calendar/pcs/query.c:754
+#: calendar/pcs/query.c:788
msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
msgstr ""
-#: calendar/pcs/query.c:842
+#: calendar/pcs/query.c:876
msgid "is-completed? expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:887
+#: calendar/pcs/query.c:921
msgid "completed-before? expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:892
+#: calendar/pcs/query.c:926
msgid "completed-before? expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:1167
+#: calendar/pcs/query.c:1229
msgid "Evaluation of the search expression did not yield a boolean value"
msgstr ""
+#: calendar/pcs/query.c:1483
+msgid "Parse error"
+msgstr ""
+
#.
#. * These are the timezone names from the Olson timezone data.
#. * We only place them here so gettext picks them up for translation.
@@ -7821,81 +7915,81 @@ msgstr "Synchronising \"%s\""
msgid "You must be working online to complete this operation"
msgstr ""
-#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
+#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
#, fuzzy
msgid "Syncing folders"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1252
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
+#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1258
#, c-format
msgid "Error executing filter: %s: %s"
msgstr ""
-#: camel/camel-filter-driver.c:933
+#: camel/camel-filter-driver.c:942
msgid "Unable to open spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:951
msgid "Unable to process spool folder"
msgstr ""
-#: camel/camel-filter-driver.c:957
+#: camel/camel-filter-driver.c:966
#, c-format
msgid "Getting message %d (%d%%)"
msgstr ""
-#: camel/camel-filter-driver.c:961
+#: camel/camel-filter-driver.c:970
msgid "Cannot open message"
msgstr ""
-#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
+#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
#, c-format
msgid "Failed on message %d"
msgstr ""
-#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
+#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1104
#, fuzzy
msgid "Syncing folder"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-driver.c:1062
+#: camel/camel-filter-driver.c:1071
#, c-format
msgid "Getting message %d of %d"
msgstr ""
-#: camel/camel-filter-driver.c:1077
+#: camel/camel-filter-driver.c:1086
#, c-format
msgid "Failed at message %d of %d"
msgstr ""
-#: camel/camel-filter-search.c:136
+#: camel/camel-filter-search.c:139
msgid "Failed to retrieve message"
msgstr ""
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:387
msgid "Invalid arguments to (system-flag)"
msgstr ""
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:402
msgid "Invalid arguments to (user-tag)"
msgstr ""
-#: camel/camel-filter-search.c:511
+#: camel/camel-filter-search.c:514
#, fuzzy, c-format
msgid "Failed to create pipe to '%s': %s"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-search.c:547
+#: camel/camel-filter-search.c:550
#, fuzzy, c-format
msgid "Failed to create create child process '%s': %s"
msgstr "Synchronising \"%s\""
-#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
+#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr ""
@@ -7938,11 +8032,11 @@ msgstr ""
msgid "Unsupported operation: search by uids: for %s"
msgstr ""
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
msgid "Moving messages"
msgstr ""
-#: camel/camel-folder.c:1317
+#: camel/camel-folder.c:1319
msgid "Copying messages"
msgstr ""
@@ -8244,7 +8338,7 @@ msgid ""
msgstr ""
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:1064
msgid "Bad authentication response from server."
msgstr ""
@@ -8299,51 +8393,51 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr ""
-#: camel/camel-service.c:281
+#: camel/camel-service.c:282
#, c-format
msgid "URL '%s' needs a username component"
msgstr ""
-#: camel/camel-service.c:289
+#: camel/camel-service.c:290
#, c-format
msgid "URL '%s' needs a host component"
msgstr ""
-#: camel/camel-service.c:297
+#: camel/camel-service.c:298
#, c-format
msgid "URL '%s' needs a path component"
msgstr ""
-#: camel/camel-service.c:742
+#: camel/camel-service.c:743
#, c-format
msgid "Resolving: %s"
msgstr ""
-#: camel/camel-service.c:773 camel/camel-service.c:884
+#: camel/camel-service.c:774 camel/camel-service.c:885
#, c-format
msgid "Failure in name lookup: %s"
msgstr ""
-#: camel/camel-service.c:798
+#: camel/camel-service.c:799
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr ""
-#: camel/camel-service.c:800
+#: camel/camel-service.c:801
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr ""
-#: camel/camel-service.c:850
+#: camel/camel-service.c:851
#, fuzzy
msgid "Resolving address"
msgstr "Synchronising \"%s\""
-#: camel/camel-service.c:912
+#: camel/camel-service.c:913
msgid "Host lookup failed: host not found"
msgstr ""
-#: camel/camel-service.c:915
+#: camel/camel-service.c:916
msgid "Host lookup failed: unknown reason"
msgstr ""
@@ -8529,7 +8623,7 @@ msgstr ""
msgid "Error in application verification"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:526
#, c-format
msgid ""
"Issuer: %s\n"
@@ -8538,11 +8632,11 @@ msgid ""
"Signature: %s"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
msgid "GOOD"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:532
msgid "BAD"
msgstr ""
@@ -8559,7 +8653,7 @@ msgid ""
msgstr ""
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:533
+#: camel/camel-tcp-stream-ssl.c:535
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -8608,68 +8702,76 @@ msgstr "Synchronising \"%s\""
msgid "Cannot rename folder: %s: No such folder"
msgstr "Synchronising \"%s\""
-#: camel/providers/imap/camel-imap-command.c:223
-#: camel/providers/imap/camel-imap-command.c:262
-#: camel/providers/imap/camel-imap-command.c:441
-#: camel/providers/imap/camel-imap-store.c:2578
+#: 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
msgid "Operation cancelled"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:307
-#: camel/providers/imap/camel-imap-store.c:2581
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-store.c:2644
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:385
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:326
#, c-format
-msgid "Unexpected response from IMAP server: %s"
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
msgstr ""
#: camel/providers/imap/camel-imap-command.c:395
#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:405
+#, c-format
msgid "IMAP command failed: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:450
+#: camel/providers/imap/camel-imap-command.c:460
msgid "Server response ended too soon."
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:642
+#: camel/providers/imap/camel-imap-command.c:652
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:678
+#: camel/providers/imap/camel-imap-command.c:688
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:221
#, c-format
msgid "Could not create directory %s: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:239
+#: camel/providers/imap/camel-imap-folder.c:240
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:305
+#: camel/providers/imap/camel-imap-folder.c:306
msgid "Folder was destroyed and recreated on server."
msgstr ""
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:547
+#: camel/providers/imap/camel-imap-folder.c:548
msgid "Scanning for changed messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1868
+#: camel/providers/imap/camel-imap-folder.c:1872
#, fuzzy, c-format
msgid "Unable to retrieve message: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
#: camel/providers/local/camel-maildir-folder.c:212
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -8683,28 +8785,24 @@ msgid ""
" %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/imap/camel-imap-folder.c:1908
#: camel/providers/local/camel-maildir-folder.c:212
#: camel/providers/local/camel-mbox-folder.c:347
#: camel/providers/local/camel-mh-folder.c:201
msgid "No such message"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1927
-#: camel/providers/imap/camel-imap-folder.c:2424
+#: camel/providers/imap/camel-imap-folder.c:1931
+#: camel/providers/imap/camel-imap-folder.c:2527
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2084
-#: camel/providers/imap/camel-imap-folder.c:2161
+#: camel/providers/imap/camel-imap-folder.c:2191
+#: camel/providers/imap/camel-imap-folder.c:2261
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2090
-msgid "Scanning for new messages"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:2461
+#: camel/providers/imap/camel-imap-folder.c:2565
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -8721,6 +8819,11 @@ msgstr ""
msgid "Failed to cache message %s: %s"
msgstr ""
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, fuzzy, c-format
+msgid "Failed to cache %s: %s"
+msgstr "Synchronising \"%s\""
+
#: camel/providers/imap/camel-imap-provider.c:43
msgid "Checking for new mail"
msgstr ""
@@ -8767,73 +8870,68 @@ msgstr ""
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:457
#, c-format
msgid "IMAP server %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:458
+#: camel/providers/imap/camel-imap-store.c:459
#, c-format
msgid "IMAP service for %s on %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:584
#: camel/providers/nntp/camel-nntp-store.c:130
#: camel/providers/nntp/camel-nntp-store.c:148
#: camel/providers/pop3/camel-pop3-store.c:180
msgid "Connection cancelled"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:586
+#: camel/providers/imap/camel-imap-store.c:587
#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/smtp/camel-smtp-transport.c:272
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:645
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:677
#, fuzzy, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/imap/camel-imap-store.c:646
+#: camel/providers/imap/camel-imap-store.c:647
#: camel/providers/pop3/camel-pop3-store.c:213
msgid "SSL/TLS extension not supported."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:678
#: camel/providers/pop3/camel-pop3-store.c:254
msgid "SSL negotiations failed"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:940
-#, c-format
-msgid "The folder %s no longer exists"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/imap/camel-imap-store.c:1087
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1084
-#: camel/providers/smtp/camel-smtp-transport.c:479
+#: camel/providers/imap/camel-imap-store.c:1097
+#: 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:1108
+#: camel/providers/imap/camel-imap-store.c:1121
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1123
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/imap/camel-imap-store.c:1136
+#: camel/providers/smtp/camel-smtp-transport.c:523
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1152
+#: camel/providers/imap/camel-imap-store.c:1165
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -8841,24 +8939,24 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1450
-#: camel/providers/imap/camel-imap-store.c:1592
+#: camel/providers/imap/camel-imap-store.c:1471
+#: camel/providers/imap/camel-imap-store.c:1613
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1793
+#: camel/providers/imap/camel-imap-store.c:1814
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it containes the character \"%c\""
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1826
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1862
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
@@ -8931,8 +9029,8 @@ msgid ""
msgstr ""
#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:229
-#: camel/providers/local/camel-spool-store.c:110
+#: camel/providers/local/camel-local-store.c:227
+#: camel/providers/local/camel-spool-store.c:112
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
@@ -8944,7 +9042,7 @@ msgstr ""
#: camel/providers/local/camel-local-store.c:155
#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:238
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr ""
@@ -8958,32 +9056,32 @@ msgstr ""
msgid "Local mail file %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
+#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:359
+#: camel/providers/local/camel-local-store.c:363
#, fuzzy, c-format
msgid "Could not rename '%s': %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/local/camel-local-store.c:380
+#: camel/providers/local/camel-local-store.c:384
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:390
+#: camel/providers/local/camel-local-store.c:394
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-summary.c:406
+#: camel/providers/local/camel-local-summary.c:398
#, c-format
msgid "Could not save summary: %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-summary.c:462
+#: camel/providers/local/camel-local-summary.c:454
msgid "Unable to add message to summary: unknown reason"
msgstr ""
@@ -9003,6 +9101,7 @@ msgstr ""
#: camel/providers/local/camel-maildir-store.c:106
#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-spool-store.c:160
#, c-format
msgid ""
"Could not open folder `%s':\n"
@@ -9012,12 +9111,14 @@ msgstr ""
#: camel/providers/local/camel-maildir-store.c:110
#: camel/providers/local/camel-mbox-store.c:101
#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-spool-store.c:164
#, c-format
msgid "Folder `%s' does not exist."
msgstr ""
#: camel/providers/local/camel-maildir-store.c:117
#: camel/providers/local/camel-mh-store.c:216
+#: camel/providers/local/camel-spool-store.c:168
#, c-format
msgid ""
"Could not create folder `%s':\n"
@@ -9041,7 +9142,8 @@ msgid "not a maildir directory"
msgstr ""
#: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:252
+#: camel/providers/local/camel-spool-store.c:282
+#: camel/providers/local/camel-spool-store.c:312
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr ""
@@ -9070,7 +9172,7 @@ msgid "Storing folder"
msgstr "Synchronising \"%s\""
#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr ""
@@ -9231,40 +9333,45 @@ msgstr ""
msgid "Cannot open MH directory path: %s: %s"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-spool-store.c:118
#, c-format
msgid "Spool `%s' cannot be opened: %s"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:128
+#: camel/providers/local/camel-spool-store.c:130
#, c-format
msgid "Spool `%s' is not a regular file or directory"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:145
+#: camel/providers/local/camel-spool-store.c:150
#, c-format
msgid "Folder `%s/%s' does not exist."
msgstr ""
-#: camel/providers/local/camel-spool-store.c:162
+#: camel/providers/local/camel-spool-store.c:176
+#, c-format
+msgid "`%s' is not a mailbox file."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:193
msgid "Store does not support an INBOX"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
#, c-format
msgid "Spool mail file %s"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:174
+#: camel/providers/local/camel-spool-store.c:205
#, fuzzy, c-format
msgid "Spool folder tree %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/local/camel-spool-store.c:182
+#: camel/providers/local/camel-spool-store.c:213
msgid "Spool folders cannot be renamed"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:190
+#: camel/providers/local/camel-spool-store.c:221
msgid "Spool folders cannot be deleted"
msgstr ""
@@ -9353,47 +9460,47 @@ msgstr ""
msgid "Operation failed: %s"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:245
+#: camel/providers/pop3/camel-pop3-folder.c:246
msgid "Retrieving POP summary"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:261
-#: camel/providers/pop3/camel-pop3-folder.c:426
-#: camel/providers/pop3/camel-pop3-folder.c:485
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:486
+#: camel/providers/pop3/camel-pop3-folder.c:503
msgid "User cancelled"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:264
#, fuzzy, c-format
msgid "Cannot get POP summary: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/pop3/camel-pop3-folder.c:305
+#: camel/providers/pop3/camel-pop3-folder.c:306
msgid "Expunging deleted messages"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:400
+#: camel/providers/pop3/camel-pop3-folder.c:401
#, c-format
msgid "No message with uid %s"
msgstr ""
#. Sigh, most of the crap in this function is so that the cancel button
#. returns the proper exception code. Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:407
+#: camel/providers/pop3/camel-pop3-folder.c:408
#, c-format
msgid "Retrieving POP message %d"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:428
-#: camel/providers/pop3/camel-pop3-folder.c:487
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:504
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:488
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:505
#, fuzzy, c-format
msgid "Cannot get message %s: %s"
msgstr "Synchronising \"%s\""
-#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:495
msgid "Unknown reason"
msgstr ""
@@ -9650,40 +9757,40 @@ msgstr ""
msgid "Authentication required"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:295
msgid "Welcome response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:385
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:378
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:340
msgid "server does not appear to support SSL"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:354
#, c-format
msgid "STARTTLS request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:369
msgid "STARTTLS response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:472
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:507
+#: camel/providers/smtp/camel-smtp-transport.c:510
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:531
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -9691,87 +9798,87 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:661
+#: camel/providers/smtp/camel-smtp-transport.c:664
#, c-format
msgid "SMTP server %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:666
#, c-format
msgid "SMTP mail delivery via %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:684
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
msgid "Sending message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:700
+#: camel/providers/smtp/camel-smtp-transport.c:703
msgid "Cannot send message: no recipients defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:710
+#: camel/providers/smtp/camel-smtp-transport.c:713
msgid "Cannot send message: one or more invalid recipients"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:866
+#: camel/providers/smtp/camel-smtp-transport.c:881
msgid "SMTP Greeting"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:912
+#: camel/providers/smtp/camel-smtp-transport.c:927
#, c-format
msgid "HELO request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:949
msgid "HELO response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1015
msgid "SMTP Authentication"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: camel/providers/smtp/camel-smtp-transport.c:1021
msgid "Error creating SASL authentication object."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1023
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
#, c-format
msgid "AUTH request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1059
msgid "AUTH request failed."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1120
msgid "Bad authentication response from server.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1145
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: camel/providers/smtp/camel-smtp-transport.c:1165
msgid "MAIL FROM response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1189
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1211
#, c-format
msgid "RCPT TO <%s> failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1238
+#: camel/providers/smtp/camel-smtp-transport.c:1253
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr ""
@@ -9779,76 +9886,67 @@ msgstr ""
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1258
+#: camel/providers/smtp/camel-smtp-transport.c:1273
msgid "DATA response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1298
-#: camel/providers/smtp/camel-smtp-transport.c:1321
+#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1336
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1356
msgid "DATA termination response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: camel/providers/smtp/camel-smtp-transport.c:1379
#, c-format
msgid "RSET request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1399
msgid "RSET response error"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1422
#, c-format
msgid "QUIT request timed out: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1442
msgid "QUIT response error"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:102
-msgid "1 byte"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:104
-#, c-format
-msgid "%u bytes"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:111
+#: composer/e-msg-composer-attachment-bar.c:107
#, c-format
-msgid "%.1fK"
+msgid "%.0fK"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:115
+#: composer/e-msg-composer-attachment-bar.c:110
#, c-format
-msgid "%.1fM"
+msgid "%.0fM"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:119
+#: composer/e-msg-composer-attachment-bar.c:113
#, c-format
-msgid "%.1fG"
+msgid "%.0fG"
msgstr ""
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
+#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
msgid "attachment"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:523
+#: composer/e-msg-composer-attachment-bar.c:516
msgid "Remove selected items from the attachment list"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:547
msgid "Add attachment..."
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:555
+#: composer/e-msg-composer-attachment-bar.c:548
msgid "Attach a file to the message"
msgstr ""
@@ -9880,7 +9978,7 @@ msgstr ""
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:347
+#: composer/e-msg-composer-hdrs.c:364
msgid "Click here for the address book"
msgstr ""
@@ -9891,45 +9989,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:382
+#: composer/e-msg-composer-hdrs.c:399
msgid "Reply-To:"
msgstr ""
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:410
msgid "From:"
msgstr ""
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:416
msgid "Subject:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:430
msgid "To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:431
msgid "Enter the recipients of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:434
msgid "Cc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:435
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:421
+#: composer/e-msg-composer-hdrs.c:438
msgid "Bcc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:422
+#: composer/e-msg-composer-hdrs.c:439
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -9938,11 +10036,11 @@ msgstr ""
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:429
+#: composer/e-msg-composer-hdrs.c:446
msgid "Post To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:448
msgid "Posting destination"
msgstr ""
@@ -9956,114 +10054,130 @@ msgstr ""
msgid "Could not create a PGP signature context"
msgstr "Synchronising \"%s\""
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:787
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1155
+#: composer/e-msg-composer.c:1160
msgid "Warning!"
msgstr ""
-#: composer/e-msg-composer.c:1159
+#: composer/e-msg-composer.c:1164
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:1181
+#: composer/e-msg-composer.c:1187
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1201
+#: composer/e-msg-composer.c:1207
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1240
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1248
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1255
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1262
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1271
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1371
msgid ""
"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1530
+#: composer/e-msg-composer.c:1525
+#, c-format
+msgid ""
+"The message \"%s\" has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1536
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1563
+#: composer/e-msg-composer.c:1569
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:1921
+#: composer/e-msg-composer.c:1927
msgid "Signature:"
msgstr ""
-#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
msgid "Autogenerated"
msgstr ""
-#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
+#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:2790
+#: composer/e-msg-composer.c:2796
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
+#: composer/e-msg-composer.c:2822
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+
+#: composer/e-msg-composer.c:2879
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
msgstr ""
-#: composer/e-msg-composer.c:3838
+#: composer/e-msg-composer.c:3858
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
msgstr ""
-#: composer/evolution-composer.c:376
+#: composer/evolution-composer.c:393
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
msgstr ""
-#: composer/evolution-composer.c:391
+#: composer/evolution-composer.c:408
#, fuzzy
-msgid "Cannot initialize Evolution's composer."
+msgid "Cannot initialize the Evolution composer."
msgstr "Cannot initialise Evolution's mail component."
#: data/evolution.desktop.in.h:1
@@ -10115,8 +10229,8 @@ msgstr ""
msgid "Subject does not contain"
msgstr ""
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
-#: mail/mail-display.c:190
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2536
+#: mail/mail-display.c:192
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -10270,8 +10384,9 @@ msgid "years"
msgstr ""
#: filter/filter-datespec.c:174
-msgid "You have forgotten to choose a date."
-msgstr ""
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Synchronising \"%s\""
#: filter/filter-datespec.c:269
msgid "<click here to select a date>"
@@ -10324,13 +10439,12 @@ msgid "Add action"
msgstr ""
#: filter/filter-folder.c:149
-msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
-msgstr ""
+#, fuzzy
+msgid "You must specify a folder.\n"
+msgstr "Synchronising \"%s\""
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
+#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
msgid "Select Folder"
msgstr ""
@@ -10341,7 +10455,7 @@ msgid ""
"%s"
msgstr ""
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:17 mail/mail-config.c:76
#: mail/mail-config.glade.h:63
msgid "Important"
msgstr ""
@@ -10512,214 +10626,218 @@ msgid "Beep"
msgstr ""
#: filter/libfilter-i18n.h:7
-msgid "contains"
+msgid "Copy to Folder"
msgstr ""
#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+msgid "Date received"
msgstr ""
#: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Date sent"
msgstr ""
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
+#: filter/libfilter-i18n.h:11
+msgid "Deleted"
msgstr ""
#: filter/libfilter-i18n.h:12
-msgid "Deleted"
+msgid "Do Not Exist"
msgstr ""
#: filter/libfilter-i18n.h:13
-msgid "does not contain"
+msgid "Draft"
msgstr ""
#: filter/libfilter-i18n.h:14
-msgid "does not end with"
+msgid "Exist"
msgstr ""
#: filter/libfilter-i18n.h:15
-msgid "does not exist"
+msgid "Expression"
msgstr ""
#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
+msgid "Follow Up"
msgstr ""
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1757
+msgid "Label"
msgstr ""
#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
+msgid "Mailing list"
msgstr ""
#: filter/libfilter-i18n.h:20
-msgid "Draft"
+msgid "Message Body"
msgstr ""
#: filter/libfilter-i18n.h:21
-msgid "ends with"
+msgid "Message Header"
msgstr ""
#: filter/libfilter-i18n.h:22
-msgid "Exist"
+msgid "Move to Folder"
msgstr ""
#: filter/libfilter-i18n.h:23
-msgid "exists"
+msgid "Pipe Message to Shell Command"
msgstr ""
#: filter/libfilter-i18n.h:24
-msgid "Expression"
+msgid "Play Sound"
msgstr ""
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:60
+msgid "Read"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
msgstr ""
#: filter/libfilter-i18n.h:27
-msgid "is"
+msgid "Regex Match"
msgstr ""
#: filter/libfilter-i18n.h:28
-msgid "is after"
+msgid "Replied to"
msgstr ""
#: filter/libfilter-i18n.h:29
-msgid "is before"
+msgid "Run Once"
msgstr ""
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
+#: filter/libfilter-i18n.h:30 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
msgstr ""
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
+#: filter/libfilter-i18n.h:31 mail/mail-callbacks.c:1830
+msgid "Sender"
msgstr ""
#: filter/libfilter-i18n.h:32
-msgid "is less than"
+msgid "Set Status"
msgstr ""
#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Shell Command"
+msgstr "Colours"
#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
+msgid "Size (kB)"
msgstr ""
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
-msgid "Label"
+#: filter/libfilter-i18n.h:35
+msgid "Source Account"
msgstr ""
#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "Message Body"
+msgid "Specific header"
msgstr ""
#: filter/libfilter-i18n.h:38
-msgid "Message Header"
+msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
+#: filter/libfilter-i18n.h:39 mail/mail-format.c:932
+#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
+msgid "Subject"
msgstr ""
#: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
+msgid "Unset Status"
msgstr ""
#: filter/libfilter-i18n.h:41
-msgid "Play Sound"
+msgid "contains"
msgstr ""
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-msgid "Read"
+#: filter/libfilter-i18n.h:42
+msgid "does not contain"
msgstr ""
#: filter/libfilter-i18n.h:43
-msgid "Recipients"
+msgid "does not end with"
msgstr ""
#: filter/libfilter-i18n.h:44
-msgid "Regex Match"
+msgid "does not exist"
msgstr ""
#: filter/libfilter-i18n.h:45
-msgid "Replied to"
+msgid "does not return"
msgstr ""
#: filter/libfilter-i18n.h:46
-msgid "returns"
+msgid "does not sound like"
msgstr ""
#: filter/libfilter-i18n.h:47
-msgid "returns greater than"
+msgid "does not start with"
msgstr ""
#: filter/libfilter-i18n.h:48
-msgid "returns less than"
+msgid "ends with"
msgstr ""
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:49
+msgid "exists"
msgstr ""
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
-msgid "Sender"
+#: filter/libfilter-i18n.h:50
+msgid "is Flagged"
msgstr ""
#: filter/libfilter-i18n.h:51
-msgid "Set Status"
+msgid "is after"
msgstr ""
#: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "Shell Command"
-msgstr "Colours"
+msgid "is before"
+msgstr ""
#: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
+msgid "is greater than"
msgstr ""
#: filter/libfilter-i18n.h:54
-msgid "sounds like"
+msgid "is less than"
msgstr ""
#: filter/libfilter-i18n.h:55
-msgid "Source Account"
+msgid "is not Flagged"
msgstr ""
#: filter/libfilter-i18n.h:56
-msgid "Specific header"
+msgid "is not"
msgstr ""
#: filter/libfilter-i18n.h:57
-msgid "starts with"
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:58
+msgid "returns greater than"
msgstr ""
#: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
+msgid "returns less than"
msgstr ""
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
-#: mail/message-list.etspec.h:13
-msgid "Subject"
+#: filter/libfilter-i18n.h:60
+msgid "returns"
msgstr ""
#: filter/libfilter-i18n.h:61
-msgid "Unset Status"
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:62
+msgid "starts with"
msgstr ""
#: filter/rule-editor.c:180
@@ -10756,31 +10874,31 @@ msgstr ""
msgid "Evolution is importing your old Elm mail"
msgstr ""
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
#: importers/pine-importer.c:101
msgid "Importing..."
msgstr ""
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
#: importers/pine-importer.c:103
msgid "Please wait"
msgstr ""
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
#: importers/pine-importer.c:365
#, c-format
msgid "Importing %s as %s"
msgstr ""
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
#: importers/pine-importer.c:471
#, fuzzy, c-format
msgid "Scanning %s"
msgstr "Synchronise \"%s\""
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:339
+#: mail/folder-browser-ui.c:353
msgid "Mail"
msgstr ""
@@ -10837,39 +10955,39 @@ msgid ""
"contained in the message body."
msgstr ""
-#: importers/netscape-importer.c:1226
+#: importers/netscape-importer.c:1227
msgid "Evolution is importing your old Netscape data"
msgstr ""
#. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
+#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
#: shell/e-local-storage.c:183
msgid "Trash"
msgstr ""
-#: importers/netscape-importer.c:2027
+#: importers/netscape-importer.c:2028
#, fuzzy
msgid "Scanning mail filters"
msgstr "Synchronise \"%s\""
-#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
#, fuzzy
msgid "Scanning directory"
msgstr "Synchronising \"%s\""
-#: importers/netscape-importer.c:2046
+#: importers/netscape-importer.c:2047
msgid "Starting import"
msgstr ""
-#: importers/netscape-importer.c:2132
+#: importers/netscape-importer.c:2133
msgid "Settings"
msgstr ""
-#: importers/netscape-importer.c:2137
+#: importers/netscape-importer.c:2138
msgid "Mail Filters"
msgstr ""
-#: importers/netscape-importer.c:2160
+#: importers/netscape-importer.c:2161
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -10986,100 +11104,109 @@ msgid "Folder containing mail"
msgstr ""
#: mail/component-factory.c:103
-msgid "Virtual Trash"
+msgid "Public Mail"
msgstr ""
#: mail/component-factory.c:103
+msgid "Public folder containing mail"
+msgstr ""
+
+#: mail/component-factory.c:104
+msgid "Virtual Trash"
+msgstr ""
+
+#: mail/component-factory.c:104
msgid "Virtual Trash folder"
msgstr ""
-#: mail/component-factory.c:119
+#: mail/component-factory.c:132
msgid "This folder cannot contain messages."
msgstr ""
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
msgid "Properties..."
msgstr ""
-#: mail/component-factory.c:404
+#: mail/component-factory.c:427
msgid "Change this folder's properties"
msgstr ""
-#: mail/component-factory.c:785
+#: mail/component-factory.c:805
msgid ""
"Some of your mail settings seem corrupt, please check that everything is in "
"order."
msgstr ""
-#: mail/component-factory.c:950
+#: mail/component-factory.c:970
msgid "You have not set a mail transport method"
msgstr ""
-#: mail/component-factory.c:972
+#: mail/component-factory.c:992
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
-#: mail/component-factory.c:978
+#: mail/component-factory.c:998
msgid "Warning: Unsent Messages"
msgstr ""
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
msgid "New Mail Message"
msgstr ""
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1040
msgid "_Mail Message"
msgstr ""
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1041
msgid "Compose a new mail message"
msgstr ""
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
#, fuzzy
msgid "New Message Post"
msgstr "Colours"
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1049
msgid "_Post Message"
msgstr ""
-#: mail/component-factory.c:1030
+#: mail/component-factory.c:1050
msgid "Post a new mail message"
msgstr ""
-#: mail/component-factory.c:1058
-msgid "Cannot initialize Evolution's mail component."
+#: mail/component-factory.c:1078
+#, fuzzy
+msgid "Cannot initialize the Evolution mail component."
msgstr "Cannot initialise Evolution's mail component."
-#: mail/component-factory.c:1067
+#: mail/component-factory.c:1087
#, fuzzy
msgid "Cannot initialize Evolution's mail config component."
msgstr "Cannot initialise Evolution's mail component."
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1093
#, fuzzy
msgid "Cannot initialize Evolution's folder info component."
msgstr "Cannot initialise Evolution's mail component."
-#: mail/component-factory.c:1286 mail/component-factory.c:1316
+#: mail/component-factory.c:1325 mail/component-factory.c:1355
msgid "Connecting..."
msgstr ""
-#: mail/component-factory.c:1327
+#: mail/component-factory.c:1366
msgid "Cannot register storage with shell"
msgstr ""
-#: mail/folder-browser-ui.c:457
+#: mail/folder-browser-ui.c:471
#, c-format
msgid "Properties for \"%s\""
msgstr ""
-#: mail/folder-browser-ui.c:459
+#: mail/folder-browser-ui.c:473
msgid "Properties"
msgstr ""
-#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
@@ -11124,130 +11251,130 @@ msgstr ""
msgid "%d total"
msgstr ""
-#: mail/folder-browser.c:1107
+#: mail/folder-browser.c:1113
msgid "Create _Virtual Folder From Search..."
msgstr ""
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1693
msgid "VFolder on _Subject"
msgstr ""
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1694
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1695
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1696
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1700
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1701
msgid "Filter on Sen_der"
msgstr ""
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1702
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
+#: mail/folder-browser.c:1703 mail/folder-browser.c:2026
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1721
msgid "_Edit as New Message..."
msgstr ""
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1723
msgid "_Print"
msgstr ""
-#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1727 ui/evolution-mail-message.xml.h:110
msgid "_Reply to Sender"
msgstr ""
-#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1728 ui/evolution-mail-message.xml.h:75
msgid "Reply to _List"
msgstr ""
-#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1729 ui/evolution-mail-message.xml.h:74
msgid "Reply to _All"
msgstr ""
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1730
msgid "_Forward"
msgstr ""
-#: mail/folder-browser.c:1731
+#: mail/folder-browser.c:1734
msgid "Follo_w Up..."
msgstr ""
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1735
msgid "Fla_g Completed"
msgstr ""
-#: mail/folder-browser.c:1733
+#: mail/folder-browser.c:1736
#, fuzzy
msgid "Cl_ear Flag"
msgstr "Colours"
#. separator here?
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1740 ui/evolution-mail-message.xml.h:43
msgid "Mar_k as Read"
msgstr ""
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1741
msgid "Mark as _Unread"
msgstr ""
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1742
msgid "Mark as _Important"
msgstr ""
-#: mail/folder-browser.c:1740
+#: mail/folder-browser.c:1743
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1748
msgid "U_ndelete"
msgstr ""
-#: mail/folder-browser.c:1749
+#: mail/folder-browser.c:1752
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1753 ui/evolution-addressbook.xml.h:31
msgid "_Copy to Folder..."
msgstr ""
-#: mail/folder-browser.c:1758
+#: mail/folder-browser.c:1761
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/folder-browser.c:1762
+#: mail/folder-browser.c:1765
msgid "Appl_y Filters"
msgstr ""
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1769
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/folder-browser.c:2024
+#: mail/folder-browser.c:2027
msgid "VFolder on M_ailing List"
msgstr ""
-#: mail/folder-browser.c:2026
+#: mail/folder-browser.c:2029
#, c-format
msgid "Filter on _Mailing List (%s)"
msgstr ""
-#: mail/folder-browser.c:2027
+#: mail/folder-browser.c:2030
#, c-format
msgid "VFolder on M_ailing List (%s)"
msgstr ""
@@ -11318,19 +11445,19 @@ msgstr ""
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
+#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:160
msgid "_Host:"
msgstr ""
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
+#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:130
msgid "User_name:"
msgstr ""
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:168
msgid "_Path:"
msgstr ""
-#: mail/mail-account-gui.c:1846
+#: mail/mail-account-gui.c:1847
msgid "You may not create two accounts with the same name."
msgstr ""
@@ -11347,14 +11474,14 @@ msgid "Really delete account?"
msgstr ""
#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:645 mail/mail-composer-prefs.c:674
+#: mail/mail-composer-prefs.c:704
msgid "Disable"
msgstr ""
#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
-#: mail/mail-composer-prefs.c:697
+#: mail/mail-composer-prefs.c:647 mail/mail-composer-prefs.c:672
+#: mail/mail-composer-prefs.c:704
msgid "Enable"
msgstr ""
@@ -11430,8 +11557,8 @@ msgstr ""
#. FIXME: this wording sucks
#: mail/mail-callbacks.c:255
msgid ""
-"You are sending an HTML-formatted message, but the following recipients do "
-"not want HTML-formatted mail:\n"
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
msgstr ""
#: mail/mail-callbacks.c:270
@@ -11465,77 +11592,77 @@ msgstr ""
msgid "You must specify recipients in order to send this message."
msgstr ""
-#: mail/mail-callbacks.c:776
+#: mail/mail-callbacks.c:777
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
msgstr ""
-#: mail/mail-callbacks.c:1181
+#: mail/mail-callbacks.c:1206
msgid "an unknown sender"
msgstr ""
-#: mail/mail-callbacks.c:1185
+#: mail/mail-callbacks.c:1210
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1711 mail/message-browser.c:132
msgid "Move message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1713 mail/message-browser.c:134
msgid "Copy message(s) to"
msgstr ""
-#: mail/mail-callbacks.c:2353
+#: mail/mail-callbacks.c:2380
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2378
+#: mail/mail-callbacks.c:2405
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
msgstr ""
-#: mail/mail-callbacks.c:2417
+#: mail/mail-callbacks.c:2444
msgid ""
"You may only resend messages\n"
"in the Sent folder."
msgstr ""
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2458
#, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr ""
-#: mail/mail-callbacks.c:2457
+#: mail/mail-callbacks.c:2484
msgid "No Message Selected"
msgstr ""
-#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2529 mail/mail-display.c:188
msgid "Overwrite file?"
msgstr ""
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2583
msgid "Save Message As..."
msgstr ""
-#: mail/mail-callbacks.c:2558
+#: mail/mail-callbacks.c:2585
msgid "Save Messages As..."
msgstr ""
-#: mail/mail-callbacks.c:2627
+#: mail/mail-callbacks.c:2654
msgid "Go to next folder with unread messages?"
msgstr ""
-#: mail/mail-callbacks.c:2634
+#: mail/mail-callbacks.c:2661
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:2877
+#: mail/mail-callbacks.c:2904
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -11543,68 +11670,68 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:2990
+#: mail/mail-callbacks.c:3017
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/mail-callbacks.c:3002
+#: mail/mail-callbacks.c:3029
msgid "Filters"
msgstr ""
-#: mail/mail-callbacks.c:3046
+#: mail/mail-callbacks.c:3073
#, c-format
msgid "Page %d of %d"
msgstr ""
-#: mail/mail-callbacks.c:3101
+#: mail/mail-callbacks.c:3128
msgid "Print Message"
msgstr ""
-#: mail/mail-callbacks.c:3128
+#: mail/mail-callbacks.c:3155
msgid "US-Letter"
msgstr ""
-#: mail/mail-callbacks.c:3169
+#: mail/mail-callbacks.c:3196
msgid "Printing of message failed"
msgstr ""
-#: mail/mail-callbacks.c:3338
+#: mail/mail-callbacks.c:3386
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr ""
-#: mail/mail-composer-prefs.c:220
+#: mail/mail-composer-prefs.c:223
msgid ""
"Please specify signature filename\n"
"in Andvanced section of signature settings."
msgstr ""
-#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
-#: mail/mail-composer-prefs.c:408
+#: mail/mail-composer-prefs.c:241 mail/mail-composer-prefs.c:365
+#: mail/mail-composer-prefs.c:413
msgid " [script]"
msgstr ""
-#: mail/mail-composer-prefs.c:301
+#: mail/mail-composer-prefs.c:306
msgid "Please specify a valid script name"
msgstr ""
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
+#: mail/mail-composer-prefs.c:322 mail/mail-config.c:2973
msgid "Unnamed"
msgstr ""
-#: mail/mail-composer-prefs.c:555
+#: mail/mail-composer-prefs.c:562
#, fuzzy
msgid "en"
msgstr "Organisation"
-#: mail/mail-composer-prefs.c:861
+#: mail/mail-composer-prefs.c:872
msgid "Add script signature"
msgstr ""
-#: mail/mail-composer-prefs.c:862
+#: mail/mail-composer-prefs.c:873
msgid "Add Signature"
msgstr ""
@@ -11645,16 +11772,16 @@ msgstr ""
msgid "Evolution Account Assistant"
msgstr ""
-#: mail/mail-config.c:635
+#: mail/mail-config.c:636
#, c-format
msgid "Account %d"
msgstr ""
-#: mail/mail-config.c:2653
+#: mail/mail-config.c:2660
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:2731 mail/mail-config.c:2735
+#: mail/mail-config.c:2738 mail/mail-config.c:2742
msgid "Connecting to server..."
msgstr ""
@@ -12296,75 +12423,71 @@ msgstr ""
msgid "Could not create a S/MIME decode context."
msgstr ""
-#: mail/mail-display.c:319
+#: mail/mail-display.c:321
msgid "Save Attachment"
msgstr ""
-#: mail/mail-display.c:384
+#: mail/mail-display.c:386
#, fuzzy, c-format
msgid "Could not create temporary file '%s': %s"
msgstr "Synchronising \"%s\""
-#: mail/mail-display.c:430
+#: mail/mail-display.c:432
msgid "Save Attachment..."
msgstr ""
-#: mail/mail-display.c:431
+#: mail/mail-display.c:433
msgid "View Inline"
msgstr ""
-#: mail/mail-display.c:432
+#: mail/mail-display.c:434
#, c-format
msgid "Open in %s..."
msgstr ""
-#: mail/mail-display.c:492
+#: mail/mail-display.c:494
#, c-format
msgid "View Inline (via %s)"
msgstr ""
-#: mail/mail-display.c:496
+#: mail/mail-display.c:498
msgid "Hide"
msgstr ""
-#: mail/mail-display.c:517
+#: mail/mail-display.c:519
msgid "External Viewer"
msgstr ""
-#: mail/mail-display.c:1279
+#: mail/mail-display.c:1319
msgid "Downloading images"
msgstr ""
-#: mail/mail-display.c:1454
+#: mail/mail-display.c:1494
msgid "Loading message content"
msgstr ""
-#: mail/mail-display.c:1756
+#: mail/mail-display.c:1781
msgid "Overdue:"
msgstr ""
-#: mail/mail-display.c:1760
+#: mail/mail-display.c:1785
#, fuzzy
msgid "by %B %d, %Y, %l:%M %P"
msgstr "%a %d/%m/%Y %I:%M %p"
-#: mail/mail-display.c:1762
-msgid "at your earliest convenience"
-msgstr ""
-
-#: mail/mail-display.c:2084
+#: mail/mail-display.c:2112
msgid "Open Link in Browser"
msgstr ""
-#: mail/mail-display.c:2085
+#: mail/mail-display.c:2113
msgid "Copy Link Location"
msgstr ""
-#: mail/mail-display.c:2087
+#: mail/mail-display.c:2115
msgid "Save Link as (FIXME)"
msgstr ""
-#: mail/mail-display.c:2089
+#: mail/mail-display.c:2117
msgid "Save Image as..."
msgstr ""
@@ -12373,146 +12496,142 @@ msgstr ""
msgid "Pinging %s"
msgstr "Synchronise \"%s\""
-#: mail/mail-format.c:646
+#: mail/mail-format.c:650
#, c-format
msgid "%s attachment"
msgstr ""
-#: mail/mail-format.c:692
+#: mail/mail-format.c:696
msgid "Could not parse MIME message. Displaying as source."
msgstr ""
-#: mail/mail-format.c:776 mail/message-list.etspec.h:2
+#: mail/mail-format.c:780 mail/message-list.etspec.h:2
msgid "Date"
msgstr ""
-#: mail/mail-format.c:863
+#: mail/mail-format.c:867
msgid "Bad Address"
msgstr ""
-#: mail/mail-format.c:906 mail/message-list.etspec.h:7
+#: mail/mail-format.c:910 mail/message-list.etspec.h:7
+#: mail/message-tags.glade.h:3
msgid "From"
msgstr ""
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
msgid "Reply-To"
msgstr ""
-#: mail/mail-format.c:915 mail/message-list.etspec.h:14
+#: mail/mail-format.c:919 mail/message-list.etspec.h:14
msgid "To"
msgstr ""
-#: mail/mail-format.c:920
+#: mail/mail-format.c:924
msgid "Cc"
msgstr ""
-#: mail/mail-format.c:925
+#: mail/mail-format.c:929
msgid "Bcc"
msgstr ""
-#: mail/mail-format.c:956
+#: mail/mail-format.c:960
msgid "Mailer"
msgstr ""
-#: mail/mail-format.c:1840
+#: mail/mail-format.c:1834
msgid ""
"This message is digitally signed. Click the lock icon for more information."
msgstr ""
-#: mail/mail-format.c:1867
+#: mail/mail-format.c:1861
#, fuzzy
msgid "Could not create a PGP verfication context"
msgstr "Synchronising \"%s\""
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1870
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1878
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
-#: mail/mail-format.c:2134
+#: mail/mail-format.c:2128
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/mail-format.c:2148
+#: mail/mail-format.c:2142
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2153
+#: mail/mail-format.c:2147
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2176
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/mail-format.c:2190
+#: mail/mail-format.c:2184
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/mail-format.c:2195
+#: mail/mail-format.c:2189
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:540 mail/mail-local.c:542
+#: mail/mail-local.c:539 mail/mail-local.c:541
#, fuzzy, c-format
msgid "Local folders/%s"
msgstr "Synchronising \"%s\""
-#: mail/mail-local.c:672
+#: mail/mail-local.c:671
#, fuzzy
msgid "Reconfiguring folder"
msgstr "Synchronising \"%s\""
-#: mail/mail-local.c:753
+#: mail/mail-local.c:752
#, c-format
msgid ""
"Cannot save folder metainfo; you may find you can't\n"
"open this folder anymore: %s: %s"
msgstr ""
-#: mail/mail-local.c:809
+#: mail/mail-local.c:808
#, c-format
msgid "Cannot save folder metainfo to %s: %s"
msgstr ""
-#: mail/mail-local.c:861
+#: mail/mail-local.c:860
#, c-format
msgid "Cannot delete folder metadata %s: %s"
msgstr ""
-#: mail/mail-local.c:1326
+#: mail/mail-local.c:1329
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr ""
-#: mail/mail-local.c:1341
-#, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr ""
-
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1351
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1452
-msgid "You cannot change the format of a non-local folder."
-msgstr ""
-
-#: mail/mail-local.c:1461
+#: mail/mail-local.c:1446
#, fuzzy, c-format
msgid "Reconfigure /%s"
msgstr "Synchronising \"%s\""
+#: mail/mail-local.c:1510
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
#: mail/mail-mt.c:257
#, c-format
msgid ""
@@ -12745,20 +12864,20 @@ msgstr ""
msgid "User canceled operation."
msgstr ""
-#: mail/mail-session.c:274
+#: mail/mail-session.c:272
msgid "_Remember this password"
msgstr ""
-#: mail/mail-session.c:275
+#: mail/mail-session.c:273
msgid "_Remember this password for the remainder of this session"
msgstr ""
-#: mail/mail-session.c:332
+#: mail/mail-session.c:330
#, c-format
msgid "Enter Password for %s"
msgstr ""
-#: mail/mail-session.c:335
+#: mail/mail-session.c:333
msgid "Enter Password"
msgstr ""
@@ -12767,22 +12886,22 @@ msgstr ""
msgid "Could not save signature file: %s"
msgstr ""
-#: mail/mail-signature-editor.c:174
+#: mail/mail-signature-editor.c:175
msgid "Save signature"
msgstr ""
-#: mail/mail-signature-editor.c:180
+#: mail/mail-signature-editor.c:181
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: mail/mail-signature-editor.c:371
-msgid "Type the name by which you would like to refer to this signature."
+#: mail/mail-signature-editor.c:372
+msgid "Enter a name for this signature."
msgstr ""
-#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:881
msgid "Name:"
msgstr ""
@@ -12818,7 +12937,7 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:737
msgid "VFolders"
msgstr ""
@@ -12850,67 +12969,67 @@ msgstr ""
msgid "%s - Message"
msgstr ""
-#: mail/message-list.c:737
+#: mail/message-list.c:736
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:738
+#: mail/message-list.c:737
msgid "Seen"
msgstr ""
-#: mail/message-list.c:739
+#: mail/message-list.c:738
msgid "Answered"
msgstr ""
-#: mail/message-list.c:740
+#: mail/message-list.c:739
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:741
+#: mail/message-list.c:740
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:745
+#: mail/message-list.c:744
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:746
+#: mail/message-list.c:745
msgid "Lower"
msgstr ""
-#: mail/message-list.c:750
+#: mail/message-list.c:749
msgid "Higher"
msgstr ""
-#: mail/message-list.c:751
+#: mail/message-list.c:750
msgid "Highest"
msgstr ""
-#: mail/message-list.c:1067
+#: mail/message-list.c:1066
msgid "?"
msgstr ""
-#: mail/message-list.c:1074
+#: mail/message-list.c:1073
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:1083
+#: mail/message-list.c:1082
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:1095
+#: mail/message-list.c:1094
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:1103
+#: mail/message-list.c:1102
msgid "%b %d %l:%M %p"
msgstr ""
-#: mail/message-list.c:1105
+#: mail/message-list.c:1104
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:2559
+#: mail/message-list.c:2568
msgid "Generating message list"
msgstr ""
@@ -12979,45 +13098,68 @@ msgstr ""
msgid "Review"
msgstr ""
-#: mail/message-tag-followup.c:246
+#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
msgid "Flag to Follow Up"
msgstr ""
-#: mail/subscribe-dialog.c:228
+#: mail/message-tags.glade.h:1
+msgid "C_ompleted"
+msgstr ""
+
+#: mail/message-tags.glade.h:5
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "Colours"
+
+#: mail/message-tags.glade.h:8
+msgid "_Due by:"
+msgstr ""
+
+#: mail/message-tags.glade.h:9
+msgid "_Flag:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:229
#, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:230
+#: mail/subscribe-dialog.c:231
#, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:333
+#: mail/subscribe-dialog.c:334
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:335
+#: mail/subscribe-dialog.c:336
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1264 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr ""
-#: mail/subscribe-dialog.c:1483
+#: mail/subscribe-dialog.c:1443
#, fuzzy
msgid "Scanning folders..."
msgstr "Synchronising \"%s\""
-#: mail/subscribe-dialog.c:1590
+#: mail/subscribe-dialog.c:1550
msgid "No server has been selected"
msgstr ""
-#: mail/subscribe-dialog.c:1654
+#: mail/subscribe-dialog.c:1614
msgid "Please select a server."
msgstr ""
@@ -22971,12 +23113,12 @@ msgstr ""
msgid "No description"
msgstr ""
-#: my-evolution/e-summary-mail.c:152
+#: my-evolution/e-summary-mail.c:154
msgid "Mail summary"
msgstr ""
-#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
-#: shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:412 my-evolution/e-summary-mail.c:740
+#: shell/e-local-storage.c:1102
msgid "Local Folders"
msgstr ""
@@ -22986,23 +23128,23 @@ msgstr ""
#. (evolution/my-evolution/Locations)
#. Codes are seperated with : eg. "KBOS:EGAA"
#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:591
msgid "KBOS"
msgstr ""
-#: my-evolution/e-summary-preferences.c:578
+#: my-evolution/e-summary-preferences.c:584
msgid "Dictionary.com Word of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:596
+#: my-evolution/e-summary-preferences.c:602
msgid "Quotes of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:863
+#: my-evolution/e-summary-preferences.c:869
msgid "Add a news feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:871
+#: my-evolution/e-summary-preferences.c:877
msgid "Enter the URL of the news feed you wish to add"
msgstr ""
@@ -23039,11 +23181,11 @@ msgstr ""
msgid "My Weather"
msgstr ""
-#: my-evolution/e-summary-weather.c:279
+#: my-evolution/e-summary-weather.c:267
msgid "There was an error downloading data for"
msgstr ""
-#: my-evolution/e-summary-weather.c:501
+#: my-evolution/e-summary-weather.c:489
msgid "Weather"
msgstr ""
@@ -24370,6 +24512,11 @@ msgid ""
"%s"
msgstr "Synchronising \"%s\""
+#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr ""
+
#: shell/e-folder-list.c:312
#, fuzzy
msgid "Add a Folder"
@@ -24580,24 +24727,35 @@ msgid "Rename folder"
msgstr "Synchronising \"%s\""
#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:168
+#: shell/e-shell-folder-creation-dialog.c:165
#, c-format
msgid "The specified folder name is not valid: %s"
msgstr ""
-#: shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-folder-commands.c:586
+msgid "Selected folder does not belong to another user"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:589
+#, fuzzy, c-format
+msgid ""
+"Cannot remove folder:\n"
+"%s"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-folder-creation-dialog.c:122
#, c-format
msgid ""
"Cannot create the specified folder:\n"
"%s"
msgstr ""
-#: shell/e-shell-folder-creation-dialog.c:291
+#: shell/e-shell-folder-creation-dialog.c:288
#, fuzzy
msgid "Create New Folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:393
msgid "New..."
msgstr ""
@@ -24622,123 +24780,113 @@ msgstr ""
msgid "Please select the information that you would like to import:"
msgstr ""
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:243
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
#, c-format
msgid ""
"Importing %s\n"
"Importing item %d."
msgstr ""
-#: shell/e-shell-importer.c:366
+#: shell/e-shell-importer.c:355
#, fuzzy
msgid "Select importer"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:487
#, c-format
msgid "File %s does not exist"
msgstr ""
-#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
-#: shell/e-shell-importer.c:565
+#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:555
#, fuzzy
msgid "Evolution Error"
msgstr "Cannot initialise the Evolution shell."
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:504
#, c-format
msgid ""
"There is no importer that is able to handle\n"
"%s"
msgstr ""
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
msgid "Importing"
msgstr ""
-#: shell/e-shell-importer.c:532
+#: shell/e-shell-importer.c:522
#, c-format
msgid ""
"Importing %s.\n"
"Starting %s"
msgstr ""
-#: shell/e-shell-importer.c:545
+#: shell/e-shell-importer.c:535
#, c-format
msgid "Error starting %s"
msgstr ""
-#: shell/e-shell-importer.c:564
+#: shell/e-shell-importer.c:554
#, c-format
msgid "Error loading %s"
msgstr ""
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:571
#, c-format
msgid ""
"Importing %s\n"
"Importing item 1."
msgstr ""
-#: shell/e-shell-importer.c:635
+#: shell/e-shell-importer.c:625
msgid "Automatic"
msgstr ""
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:676
msgid "Filename:"
msgstr ""
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:681
msgid "Select a file"
msgstr ""
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
msgid "File type:"
msgstr ""
-#: shell/e-shell-importer.c:726
+#: shell/e-shell-importer.c:716
msgid "Import data and settings from older programs"
msgstr ""
-#: shell/e-shell-importer.c:730
+#: shell/e-shell-importer.c:720
msgid "Import a single file"
msgstr ""
-#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
msgid "Starting Intelligent Importers"
msgstr ""
-#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
#, c-format
msgid "From %s:"
msgstr ""
-#: shell/e-shell-importer.c:1090
+#: shell/e-shell-importer.c:1080
#, fuzzy
msgid "Select folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-importer.c:1091
+#: shell/e-shell-importer.c:1081
msgid "Select a destination folder for importing this data"
msgstr ""
-#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
msgid "Import"
msgstr ""
@@ -24764,32 +24912,32 @@ msgstr "Synchronising \"%s\""
msgid "Synchronizing \"%s\" (%d of %d) ..."
msgstr "Synchronising \"%s\""
-#: shell/e-shell-settings-dialog.c:290
+#: shell/e-shell-settings-dialog.c:326
#, fuzzy
msgid "Evolution Settings"
msgstr "Cannot initialise the Evolution shell."
-#: shell/e-shell-shared-folder-picker-dialog.c:349
+#: shell/e-shell-shared-folder-picker-dialog.c:326
#, fuzzy
msgid "Opening Folder"
msgstr "Synchronising \"%s\""
-#: shell/e-shell-shared-folder-picker-dialog.c:356
+#: shell/e-shell-shared-folder-picker-dialog.c:333
#, fuzzy, c-format
msgid "Opening Folder \"%s\""
msgstr "Synchronising \"%s\""
-#: shell/e-shell-shared-folder-picker-dialog.c:361
+#: shell/e-shell-shared-folder-picker-dialog.c:338
#, c-format
msgid "in \"%s\" ..."
msgstr ""
-#: shell/e-shell-shared-folder-picker-dialog.c:467
+#: shell/e-shell-shared-folder-picker-dialog.c:435
#, fuzzy, c-format
msgid "Could not open shared folder: %s."
msgstr "Synchronising \"%s\""
-#: shell/e-shell-shared-folder-picker-dialog.c:539
+#: shell/e-shell-shared-folder-picker-dialog.c:488
msgid "Cannot find the specified shared folder."
msgstr ""
@@ -24827,44 +24975,44 @@ msgstr ""
msgid "'.' and '..' are reserved folder names."
msgstr ""
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:196
msgid "Bug buddy was not found in your $PATH."
msgstr ""
-#: shell/e-shell-view-menu.c:186
+#: shell/e-shell-view-menu.c:204
msgid "Bug buddy could not be run."
msgstr ""
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:248
#, fuzzy
msgid "About Ximian Evolution"
msgstr "Cannot initialise the Evolution shell."
-#: shell/e-shell-view-menu.c:473
+#: shell/e-shell-view-menu.c:503
msgid "Go to folder..."
msgstr ""
-#: shell/e-shell-view-menu.c:474
+#: shell/e-shell-view-menu.c:504
msgid "Select the folder that you want to open"
msgstr ""
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:625
msgid "Create New Shortcut"
msgstr ""
-#: shell/e-shell-view-menu.c:596
+#: shell/e-shell-view-menu.c:626
msgid "Select the folder you want the shortcut to point to:"
msgstr ""
-#: shell/e-shell-view-menu.c:763
+#: shell/e-shell-view-menu.c:786
msgid "_Work Online"
msgstr ""
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
+#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:67
msgid "_Work Offline"
msgstr ""
-#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:42
msgid "Work Offline"
msgstr ""
@@ -24872,25 +25020,25 @@ msgstr ""
msgid "(No folder displayed)"
msgstr ""
-#: shell/e-shell-view.c:1838
+#: shell/e-shell-view.c:1847
#, c-format
msgid "%s (%d)"
msgstr ""
-#: shell/e-shell-view.c:1840
+#: shell/e-shell-view.c:1849
msgid "(None)"
msgstr ""
-#: shell/e-shell-view.c:1887
+#: shell/e-shell-view.c:1896
msgid ""
"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-view.c:1894
+#: shell/e-shell-view.c:1903
msgid "Ximian Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell-view.c:1900
+#: shell/e-shell-view.c:1909
msgid ""
"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
@@ -24903,12 +25051,12 @@ msgid ""
"%s"
msgstr ""
-#: shell/e-shell.c:731
+#: shell/e-shell.c:739
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr ""
-#: shell/e-shell.c:1828
+#: shell/e-shell.c:1876
#, c-format
msgid ""
"The Evolution component that handles folders of type \"%s\"\n"
@@ -24916,19 +25064,19 @@ msgid ""
"in order to access that data again."
msgstr ""
-#: shell/e-shell.c:2129
+#: shell/e-shell.c:2177
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:2131
+#: shell/e-shell.c:2179
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:2133
+#: shell/e-shell.c:2181
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:2135 shell/e-storage.c:488
+#: shell/e-shell.c:2183 shell/e-storage.c:558
msgid "Generic error"
msgstr ""
@@ -25063,59 +25211,63 @@ msgstr ""
msgid "Checkbox"
msgstr ""
-#: shell/e-storage.c:486
+#: shell/e-storage.c:556
msgid "No error"
msgstr ""
-#: shell/e-storage.c:490
+#: shell/e-storage.c:560
msgid "A folder with the same name already exists"
msgstr ""
-#: shell/e-storage.c:492
+#: shell/e-storage.c:562
msgid "The specified folder type is not valid"
msgstr ""
-#: shell/e-storage.c:494
+#: shell/e-storage.c:564
msgid "I/O error"
msgstr ""
-#: shell/e-storage.c:496
+#: shell/e-storage.c:566
msgid "Not enough space to create the folder"
msgstr ""
-#: shell/e-storage.c:498
+#: shell/e-storage.c:568
msgid "The folder is not empty"
msgstr ""
-#: shell/e-storage.c:500
+#: shell/e-storage.c:570
msgid "The specified folder was not found"
msgstr ""
-#: shell/e-storage.c:502
+#: shell/e-storage.c:572
msgid "Function not implemented in this storage"
msgstr ""
-#: shell/e-storage.c:506
+#: shell/e-storage.c:576
msgid "Operation not supported"
msgstr ""
-#: shell/e-storage.c:508
+#: shell/e-storage.c:578
msgid "The specified type is not supported in this storage"
msgstr ""
-#: shell/e-storage.c:510
+#: shell/e-storage.c:580
msgid "The specified folder cannot be modified or removed"
msgstr ""
-#: shell/e-storage.c:512
+#: shell/e-storage.c:582
msgid "Cannot make a folder a child of one of its descendants"
msgstr ""
-#: shell/e-storage.c:514
+#: shell/e-storage.c:584
#, fuzzy
msgid "Cannot create a folder with that name"
msgstr "Synchronising \"%s\""
+#: shell/e-storage.c:586
+msgid "This operation cannot be performed in off-line mode"
+msgstr ""
+
#: shell/e-task-widget.c:191
#, c-format
msgid "%s (...)"
@@ -25312,7 +25464,7 @@ msgstr ""
#: shell/glade/evolution-startup-wizard.glade.h:15
msgid ""
"You have successfully entered all of the information\n"
-"needed to setup Evolution. \n"
+"needed to set up Evolution. \n"
"\n"
"Click the \"Finish\" button to save your settings. "
msgstr ""
@@ -25326,26 +25478,22 @@ msgid "Evolution Import Assistant"
msgstr ""
#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
-msgstr ""
-
-#: shell/importer/import.glade.h:4
msgid "Import File (step 3 of 3)"
msgstr ""
-#: shell/importer/import.glade.h:5
+#: shell/importer/import.glade.h:4
msgid "Importer Type (step 1 of 3)"
msgstr ""
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:5
msgid "Select Importers (step 2 of 3)"
msgstr ""
-#: shell/importer/import.glade.h:7
+#: shell/importer/import.glade.h:6
msgid "Select a File (step 2 of 3)"
msgstr ""
-#: shell/importer/import.glade.h:8
+#: shell/importer/import.glade.h:7
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of\n"
@@ -25553,10 +25701,10 @@ msgstr ""
#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
#: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
msgid "_Actions"
msgstr ""
@@ -25675,7 +25823,7 @@ msgid "Print this item"
msgstr ""
#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:155
msgid "Save"
msgstr ""
@@ -25702,7 +25850,7 @@ msgstr ""
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:42
#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:49
msgid "_File"
msgstr ""
@@ -25784,8 +25932,9 @@ msgid "Schedule a meeting for this item"
msgstr ""
#: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr ""
+#, fuzzy
+msgid "Customize My Evolution"
+msgstr "Cannot initialise the Evolution shell."
#: ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
@@ -25832,27 +25981,28 @@ msgid "Post a message to a Public folder"
msgstr ""
#: ui/evolution-mail-global.xml.h:13
-msgid "Show message preview window"
-msgstr ""
+#, fuzzy
+msgid "S_ubscribe to Folders..."
+msgstr "Synchronising \"%s\""
#: ui/evolution-mail-global.xml.h:14
-msgid "Subscribe or unsubscribe to folders on remote servers"
+msgid "Show message preview window"
msgstr ""
#: ui/evolution-mail-global.xml.h:15
-msgid "Virtual Folder _Editor..."
+msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr ""
-#: ui/evolution-mail-global.xml.h:17
-msgid "_Filters..."
+#: ui/evolution-mail-global.xml.h:16
+msgid "Virtual Folder _Editor..."
msgstr ""
#: ui/evolution-mail-global.xml.h:18
-msgid "_Preview Pane"
+msgid "_Filters..."
msgstr ""
#: ui/evolution-mail-global.xml.h:19
-msgid "_Subscribe to Folders..."
+msgid "_Preview Pane"
msgstr ""
#: ui/evolution-mail-list.xml.h:1
@@ -25948,7 +26098,7 @@ msgstr ""
msgid "_Expunge"
msgstr ""
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:50
msgid "_Folder"
msgstr ""
@@ -26245,7 +26395,7 @@ msgid "Search for text in the body of the displayed message"
msgstr ""
#: ui/evolution-mail-message.xml.h:81
-msgid "Setup the page settings for your current printer"
+msgid "Set up the page settings for your current printer"
msgstr ""
#: ui/evolution-mail-message.xml.h:82
@@ -26352,7 +26502,7 @@ msgstr ""
msgid "_Resend..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:65
msgid "_Tools"
msgstr ""
@@ -26367,13 +26517,13 @@ msgstr ""
#: ui/evolution-mail-messagedisplay.xml.h:5
#: ui/evolution-message-composer.xml.h:39
#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:46
#, fuzzy
msgid "_Close"
msgstr "Colours"
#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:66
msgid "_View"
msgstr ""
@@ -26545,7 +26695,7 @@ msgstr ""
msgid "Save the current file and close the window"
msgstr ""
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:54
msgid "_Help"
msgstr ""
@@ -26708,7 +26858,7 @@ msgid "Open Other _User's Folder..."
msgstr ""
#: ui/evolution.xml.h:22
-msgid "Open a folder that is made available by some other user on the server"
+msgid "Open a folder belonging to some other user on the server"
msgstr ""
#: ui/evolution.xml.h:23
@@ -26725,112 +26875,130 @@ msgid "Pi_lot Settings..."
msgstr "Cannot initialise the Evolution shell."
#: ui/evolution.xml.h:27
+#, fuzzy
+msgid "Pilot Con_duit Settings..."
+msgstr "Cannot initialise the Evolution shell."
+
+#: ui/evolution.xml.h:28
+msgid "Remove a folder added with \"Open Other User's Folder\""
+msgstr ""
+
+#: ui/evolution.xml.h:29
msgid "Send / Receive"
msgstr ""
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
msgid "Send queued items and retrieve new items"
msgstr ""
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+msgid "Set up Pilot conduit configuration"
+msgstr ""
+
+#: ui/evolution.xml.h:32
msgid "Set up Pilot configuration"
msgstr ""
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:33
msgid "Show information about Ximian Evolution"
msgstr ""
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:34
msgid "Submit Bug Report"
msgstr ""
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:35
msgid "Submit _Bug Report"
msgstr ""
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
msgid "Submit a bug report using Bug Buddy"
msgstr ""
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:37
msgid "Toggle"
msgstr ""
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:38
msgid "Toggle whether to show the folder bar"
msgstr ""
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:39
msgid "Toggle whether to show the shortcut bar"
msgstr ""
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:40
msgid "Toggle whether we are working offline."
msgstr ""
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:41
msgid "View the selected folder"
msgstr ""
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:43
#, fuzzy
msgid "Ximian Evolution _FAQ"
msgstr "Cannot initialise the Evolution shell."
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:44
msgid "_About Ximian Evolution..."
msgstr ""
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:47
msgid "_Copy..."
msgstr ""
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:51
msgid "_Folder Bar"
msgstr ""
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:52
#, fuzzy
msgid "_Folder..."
msgstr "Synchronising \"%s\""
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:53
msgid "_Go to Folder..."
msgstr ""
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:55
msgid "_Import..."
msgstr ""
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:56
msgid "_Move..."
msgstr ""
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:57
msgid "_New"
msgstr ""
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:58
msgid "_New Folder"
msgstr ""
-#: ui/evolution.xml.h:56
-msgid "_Preferences..."
+#: ui/evolution.xml.h:59
+msgid "_Remove Other User's Folder"
msgstr ""
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:60
msgid "_Rename..."
msgstr ""
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:61
msgid "_Send / Receive"
msgstr ""
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:62
+#, fuzzy
+msgid "_Settings..."
+msgstr "Cannot initialise the Evolution shell."
+
+#: ui/evolution.xml.h:63
msgid "_Shortcut Bar"
msgstr ""
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:64
msgid "_Shortcut..."
msgstr ""
@@ -27059,11 +27227,11 @@ msgstr ""
msgid "..."
msgstr ""
-#: widgets/misc/e-filter-bar.c:188
+#: widgets/misc/e-filter-bar.c:189
msgid "Search Editor"
msgstr ""
-#: widgets/misc/e-filter-bar.c:210
+#: widgets/misc/e-filter-bar.c:211
msgid "Save Search"
msgstr ""