aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_AU.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_AU.po')
-rw-r--r--po/en_AU.po6407
1 files changed, 3562 insertions, 2845 deletions
diff --git a/po/en_AU.po b/po/en_AU.po
index d6a39073a8..26d997774f 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
"Language-Team: \n"
@@ -20,6 +20,15 @@ msgstr ""
msgid "evolution addressbook"
msgstr "Cannot initialise Evolution's mail component."
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Cannot initialise Evolution's mail component."
+
#: a11y/addressbook/ea-minicard-view.c:101
#, fuzzy
msgid "current addressbook folder "
@@ -41,15 +50,6 @@ msgstr ""
msgid " card"
msgstr ""
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Cannot initialise Evolution's mail component."
-
#: addressbook/conduit/address-conduit.c:272
msgid "Default Sync Address:"
msgstr ""
@@ -65,65 +65,20 @@ msgstr "Cannot initialise Evolution's mail component."
msgid "Could not read pilot's Address application block"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr ""
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Failed to authenticate.\n"
+msgstr "Could not close temporary folder: %s"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
msgstr ""
#: addressbook/gui/component/addressbook-component.c:93
@@ -171,41 +126,45 @@ msgstr "_Other Organiser"
msgid "Create a new contacts group"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:483
msgid "Failed to connect to LDAP server"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
msgid "Failed to authenticate with LDAP server"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
msgid "Could not perform query on Root DSE"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
msgid "The server responded with no supported search bases"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
msgid "This server does not support LDAPv3 schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
msgid "Error retrieving schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1274
msgid "Server did not respond with valid schema information"
msgstr ""
#: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
msgid "Migrating..."
msgstr ""
#: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
#, c-format
msgid "Migrating `%s':"
msgstr ""
@@ -213,8 +172,8 @@ msgstr ""
#. create the local source group
#: addressbook/gui/component/addressbook-migrate.c:438
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr ""
@@ -222,7 +181,7 @@ msgstr ""
#: addressbook/gui/component/addressbook-migrate.c:446
#: addressbook/gui/contact-editor/contact-editor.glade.h:37
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
#: mail/mail-config.glade.h:106
msgid "Personal"
msgstr ""
@@ -269,20 +228,41 @@ msgid ""
"Please be patient while Evolution migrates your Pilot Sync data..."
msgstr ""
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook-view.c:761
#, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr "Could not close temporary folder: %s"
+msgid "New Address Book"
+msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/addressbook-view.c:762
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr ""
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/migration.c:373
+msgid "Contacts"
msgstr ""
#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
@@ -303,6 +283,62 @@ msgstr ""
msgid "URI for the folder last used in the select names dialog"
msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
+
#: addressbook/gui/component/ldap-config.glade.h:1
msgid " S_how Supported Bases "
msgstr ""
@@ -324,6 +360,7 @@ msgstr ""
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr ""
@@ -394,7 +431,7 @@ msgstr "_Other Organiser"
msgid "Address Book Properties"
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
#: mail/mail-config.glade.h:40
msgid "Always"
msgstr ""
@@ -409,110 +446,100 @@ msgid "Basic"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "C_lose"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
msgid "Connecting"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
#: smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
msgid "Distinguished _name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
msgid "Distinguished name"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
msgid "Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
#, fuzzy
msgid "Email address"
msgstr "Chile"
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
#, fuzzy
msgid "Email address:"
msgstr "Chile"
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
msgid "Evolution will use this DN to authenticate you with the server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid ""
"Evolution will use this email address to authenticate you with the server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid "Find Possible Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
#: mail/mail-config.glade.h:99
msgid "Never"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
msgid "One"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid "Only locations within starting point"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
msgid "S_earch scope: "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid "Search base only"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
#, fuzzy
msgid "Search base:"
msgstr "_Other Organiser"
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
#, fuzzy
msgid "Search scope:"
msgstr "_Other Organiser"
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
msgid "Searching"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -523,7 +550,7 @@ msgid ""
"secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -532,19 +559,19 @@ msgid ""
"exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "Starting point and locations within it"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Sub"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "Supported Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -552,7 +579,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -562,34 +589,34 @@ msgid ""
"your base.\n"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
"too large will slow down your address book."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:61
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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -597,124 +624,131 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:67
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:68
msgid "Timeout:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
msgid "U_se SSL/TLS:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid "Using distinguished name (DN)"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid "Using email address"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
#: mail/mail-config.glade.h:154
msgid "Whenever Possible"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
#, fuzzy
msgid "_Add Contacts Group"
msgstr "_Other Organiser"
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
#: calendar/gui/dialogs/calendar-setup.glade.h:12
msgid "_Display name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
msgid "_Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
#, fuzzy
msgid "_Email address:"
msgstr "Chile"
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
msgid "_Log in method:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
msgid "_Name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
msgid "_Port number:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid "_Port:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
msgid "_Search base:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
msgid "_Server name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
msgid "_Server:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
msgid "_Timeout (minutes):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid "_Use secure connection:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "cards"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
msgid "connecting-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "general-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
#: calendar/gui/dialogs/alarm-options.glade.h:14
#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
#: mail/mail-config.glade.h:182
msgid "minutes"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "searching-tab"
msgstr ""
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
msgstr ""
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr ""
+
#: addressbook/gui/component/select-names/e-select-names-popup.c:222
#, fuzzy
msgid "View Contact List"
@@ -738,21 +772,14 @@ msgstr ""
msgid "Unnamed Contact"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr ""
-
#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
#: addressbook/gui/widgets/e-addressbook-view.c:222
msgid "Source"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
msgstr ""
#: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -821,55 +848,46 @@ msgid "<b>Work</b>"
msgstr "Organisation"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:361
msgid "AIM"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:12
#, fuzzy
-msgid "Address 2:"
-msgstr "Chile"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
msgid "Address:"
msgstr "Chile"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
msgid "Anniversary:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "Assistant:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
#, fuzzy
msgid "Birthday:"
msgstr "_Other Organiser"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
#: calendar/gui/dialogs/event-page.glade.h:5
#, fuzzy
msgid "Calendar:"
msgstr "Organisation"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
msgid "City:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
msgid "Company:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
@@ -877,77 +895,85 @@ msgstr ""
msgid "Contact"
msgstr "_Other Organiser"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
msgid "Contact Editor"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "Country:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
msgid "Department:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
msgid "Free/Busy:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
msgid "Full _Name..."
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
msgid "Home"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "Home Page:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "Job title:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
#: calendar/gui/e-itip-control.c:936
#, fuzzy
msgid "Location:"
msgstr "Organisation"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
#, fuzzy
msgid "MSN Messenger"
msgstr "Can not open message"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
#, fuzzy
msgid "Mailing Address"
msgstr "Chile"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "Manager:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "Ni_ckname:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "Notes:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
msgid "Novell Groupwise"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
msgid "Other"
msgstr ""
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "PO Box:"
+msgstr ""
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "Personal Information"
msgstr ""
@@ -971,9 +997,9 @@ msgstr ""
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
#: mail/mail-config.glade.h:155
msgid "Work"
msgstr ""
@@ -1004,24 +1030,36 @@ msgstr ""
msgid "item8"
msgstr ""
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
#, fuzzy
msgid "Address"
msgstr "Chile"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-minicard.c:174
#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
#: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
msgid "Editable"
msgstr ""
@@ -1994,94 +2032,109 @@ msgstr ""
msgid "Zimbabwe"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
msgid "Jabber"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Organisation"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:366
msgid "Yahoo"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:365
msgid "MSN"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
msgid "GroupWise"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
msgid "Source Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
msgid "Target Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
#, fuzzy
msgid "Is New Contact"
msgstr "_Other Organiser"
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
msgid "Writable Fields"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
#, fuzzy
msgid "Changed"
msgstr "Chile"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
msgid "Category editor not available."
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
msgid "This contact belongs to these categories:"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+msgid "Please select an image for this contact"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+msgid "No image"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr ""
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "Location"
+msgstr "Organisation"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr ""
+
#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
msgid "Contact Quick-Add"
msgstr ""
@@ -2099,18 +2152,6 @@ msgstr ""
msgid "E-_mail:"
msgstr ""
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
#: addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Address _2:"
msgstr ""
@@ -2258,8 +2299,8 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
msgid "Book"
msgstr ""
@@ -2316,6 +2357,419 @@ msgstr ""
msgid "Advanced Search"
msgstr ""
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "Chile"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr ""
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Cannot initialise Evolution's mail component."
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "_Other Organiser"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: camel/camel-service.c:728 camel/camel-service.c:766
+#: camel/camel-service.c:850 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr ""
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Could not close temporary folder: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Synchronising folder failed: %s: %s"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"We were unable to open this addressbook. Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it. If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+msgid ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:206
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+msgid "Overwrite"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:400
+#, c-format
+msgid "Error saving %s: %s"
+msgstr ""
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:437
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:199
+msgid "(none)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr ""
+
#: addressbook/gui/widgets/e-addressbook-model.c:148
#, fuzzy
msgid "No contacts"
@@ -2331,8 +2785,8 @@ msgstr[1] "_Other Organiser"
#: addressbook/gui/widgets/e-addressbook-model.c:302
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
#: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
msgid "Query"
msgstr ""
@@ -2387,9 +2841,9 @@ msgstr "Cannot initialise Evolution's mail component."
#: addressbook/gui/widgets/e-addressbook-view.c:850
#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+msgid "Save as VCard..."
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2457,7 +2911,7 @@ msgid "Cut"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
@@ -2468,18 +2922,8 @@ msgstr ""
msgid "Paste"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr ""
-
#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
msgid "Current View"
msgstr ""
@@ -2492,7 +2936,7 @@ msgid ""
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
#: calendar/gui/cal-search-bar.c:362
msgid "Any Category"
msgstr ""
@@ -2533,21 +2977,6 @@ msgstr ""
msgid "Company Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr ""
-
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Family Name"
msgstr ""
@@ -2586,29 +3015,14 @@ msgstr "Comoros"
msgid "Manager"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr ""
-
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
msgid "Nickname"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr ""
-
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Office"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisation"
-
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Other Fax"
msgstr ""
@@ -2660,21 +3074,29 @@ msgstr ""
msgid "Web Site"
msgstr ""
-#: addressbook/gui/widgets/e-minicard-label.c:115
#: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
msgid "Width"
msgstr ""
-#: addressbook/gui/widgets/e-minicard-label.c:122
#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
msgid "Height"
msgstr ""
-#: addressbook/gui/widgets/e-minicard-label.c:129
#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
msgid "Has Focus"
msgstr ""
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
#: addressbook/gui/widgets/e-minicard-label.c:136
msgid "Field"
msgstr ""
@@ -2691,10 +3113,6 @@ msgstr ""
msgid "Max field name length"
msgstr ""
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr ""
-
#: addressbook/gui/widgets/e-minicard-view.c:142
msgid ""
"\n"
@@ -2715,392 +3133,8 @@ msgstr ""
msgid "Adapter"
msgstr ""
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "Chile"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr ""
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Cannot initialise Evolution's mail component."
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "_Other Organiser"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr ""
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Could not close temporary folder: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Synchronising folder failed: %s: %s"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook. Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr ""
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "_Other Organiser"
-msgstr[1] "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
msgstr ""
#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3148,11 +3182,6 @@ msgstr "Cannot initialise Evolution's mail component."
msgid "VCard (.vcf, .gcrd)"
msgstr ""
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr ""
-
#: addressbook/printing/e-contact-print.c:998
#, fuzzy
msgid "Print contacts"
@@ -3164,6 +3193,11 @@ msgstr "_Other Organiser"
msgid "Print contact"
msgstr "_Other Organiser"
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr ""
+
#: addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
msgstr ""
@@ -3349,17 +3383,6 @@ msgstr "_Other Organiser"
msgid "This should test the contact print code"
msgstr ""
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-#, fuzzy
-msgid "Can not open file"
-msgstr "Can not open message"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr ""
-
#: addressbook/tools/evolution-addressbook-export.c:56
msgid "Specify the output file instead of standard output"
msgstr ""
@@ -3414,6 +3437,17 @@ msgstr ""
msgid "Impossible internal error."
msgstr ""
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#, fuzzy
+msgid "Can not open file"
+msgstr "Can not open message"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr ""
+
#: addressbook/tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
msgstr ""
@@ -3426,11 +3460,12 @@ msgstr ""
msgid "No filename provided."
msgstr ""
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
msgid "Unnamed List"
msgstr ""
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
msgid "Enter password"
msgstr ""
@@ -3462,124 +3497,54 @@ msgstr ""
msgid "Could not read pilot's ToDo application block"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr ""
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
msgid "Starting:"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
msgid "Ending:"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
#, fuzzy
msgid "Evolution Alarm"
msgstr "Cannot initialise Evolution's mail component."
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
#, c-format
msgid "Alarm on %s"
msgstr ""
#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "C_lose"
+msgid "Snooze _time (minutes):"
+msgstr ""
#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
+msgid "_Edit appointment"
msgstr ""
#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+msgid "_Snooze"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
msgid "Dismiss"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
msgid "Dismiss All"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
msgid "No description available."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3588,12 +3553,12 @@ msgid ""
"Ending at %s"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
msgid "Warning"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3601,7 +3566,7 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3612,19 +3577,19 @@ msgid ""
"Are you sure you want to run this program?"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
msgid "Do not ask me about this program again."
msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:139
msgid "Could not initialize Bonobo"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
msgid "Could not create the alarm notify service factory"
msgstr ""
@@ -3735,179 +3700,173 @@ msgid "Weekday the week starts on"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Whether to set a default reminder for events"
msgstr ""
#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to show week numbers in date navigator"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
+msgid "Whether to show times in 24h format instead of using am/pm"
msgstr ""
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Organisation"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Whether to show week numbers in date navigator"
msgstr ""
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/gnome-cal.c:1703
#: camel/providers/groupwise/camel-gw-listener.c:304
#: camel/providers/groupwise/camel-gw-listener.c:327
msgid "Calendar"
msgstr ""
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
msgid ""
"This operation will permanently erase all events older than the selected "
"amount of time. If you continue, you will not be able to recover these "
"events."
msgstr ""
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
msgid "Purge events older than"
msgstr ""
-#: calendar/gui/calendar-commands.c:362
+#: calendar/gui/calendar-commands.c:363
#: calendar/gui/dialogs/alarm-options.glade.h:10
#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
msgid "days"
msgstr ""
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
msgid "%A %d %B %Y"
msgstr ""
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr ""
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
msgid "%a %d %b %Y"
msgstr ""
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
msgid "%d %B %Y"
msgstr "%m/%d/%Y"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
msgid "%d %B"
msgstr ""
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
#, c-format
msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
msgid "New Calendar"
msgstr ""
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
+#: calendar/gui/calendar-component.c:623
+msgid "Failed upgrading calendars."
msgstr ""
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
msgid "There is no calendar available for creating events and meetings"
msgstr ""
-#: calendar/gui/calendar-component.c:836
+#: calendar/gui/calendar-component.c:963
msgid ""
"Selected calendar is read-only, events cannot be created. Please select a "
"read-write calendar."
msgstr ""
-#: calendar/gui/calendar-component.c:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:1234
msgid "New appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
msgid "_Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
msgid "Create a new appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
#, fuzzy
msgid "New meeting"
msgstr "Synchronising folders"
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
#, fuzzy
msgid "M_eeting"
msgstr "Organisation"
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
msgid "Create a new meeting request"
msgstr ""
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
msgid "New all day appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
msgid "All _Day Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
msgid "Create a new all-day appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
#, fuzzy
msgid "New calendar"
msgstr "Synchronising folder failed: %s: %s"
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
#, fuzzy
msgid "C_alendar"
msgstr "Organisation"
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
msgid "Create a new calendar"
msgstr ""
@@ -3937,15 +3896,36 @@ msgstr ""
msgid "Month View"
msgstr ""
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Organisation"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:409
msgid "Error while opening the calendar"
msgstr ""
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
msgid "Method not supported when opening the calendar"
msgstr ""
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
msgid "Permission denied to open the calendar"
msgstr ""
@@ -3954,19 +3934,6 @@ msgstr ""
msgid "open_client(): %s"
msgstr ""
-#: calendar/gui/control-factory.c:142
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Could not close temporary folder: %s"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
#: calendar/gui/dialogs/alarm-options.c:466
msgid "Audio Alarm Options"
msgstr ""
@@ -4032,7 +3999,7 @@ msgstr ""
msgid "hours"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
msgid "Action/Trigger"
msgstr ""
@@ -4051,12 +4018,12 @@ msgstr ""
msgid "Date/Time:"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:6
@@ -4073,6 +4040,7 @@ msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:187
#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr ""
@@ -4111,10 +4079,103 @@ msgstr ""
msgid "start of appointment"
msgstr ""
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "_Other Organiser"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "C_lose"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+#, fuzzy
+msgid "Remote"
+msgstr "Synchronising folder"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "Task List Properties"
+msgstr "_Other Organiser"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_Add Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+msgid "_Type:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr ""
+
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
msgid "Enabled"
msgstr ""
@@ -4128,19 +4189,19 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.c:778
#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
msgid "Disable"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.c:778
#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
msgid "Enable"
msgstr ""
@@ -4165,164 +4226,176 @@ msgid "60 minutes"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr ""
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "Organisation"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "_Other Organiser"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
msgid "Calendar and Tasks Settings"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
msgid "Color for overdue tasks"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
msgid "Color for tasks due today"
msgstr "Colours for display"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
msgid "Day _ends:"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
msgid "Days"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "Chile"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
#: mail/mail-config.glade.h:74
msgid "E_nable"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Free/Busy Publishing"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1048
#: calendar/gui/e-itip-control.c:563
msgid "Friday"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
msgid "Hours"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
msgid "Minutes"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1044
#: calendar/gui/e-itip-control.c:559
msgid "Monday"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
msgid "S_un"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1049
#: calendar/gui/e-itip-control.c:564
msgid "Saturday"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
msgid "Sh_ow a reminder"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
msgid "Show week _numbers in date navigator"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1050
#: calendar/gui/e-itip-control.c:558
msgid "Sunday"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
#, fuzzy
msgid "T_asks due today:"
msgstr "Colours for display"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
msgid "T_hu"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "_Other Organiser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1047
#: calendar/gui/e-itip-control.c:562
msgid "Thursday"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
msgid "Time _zone:"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
msgid "Time format:"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1045
#: calendar/gui/e-itip-control.c:560
msgid "Tuesday"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
msgid "W_eek starts:"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1046
#: calendar/gui/e-itip-control.c:561
msgid "Wednesday"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
msgid "Work days:"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
msgid "_12 hour (AM/PM)"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
msgid "_24 hour"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "_Add URL"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
msgid "_Ask for confirmation when deleting items"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
msgid "_Compress weekends in month view"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
msgid "_Day begins:"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4332,138 +4405,46 @@ msgstr ""
msgid "_Edit"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
msgid "_Fri"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
msgid "_Hide completed tasks after"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
msgid "_Mon"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
msgid "_Overdue tasks:"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
msgid "_Sat"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
msgid "_Show appointment end times in week and month views"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
msgid "_Time divisions:"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
msgid "_Tue"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
msgid "_Wed"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
msgid "before every appointment"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "_Other Organiser"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Synchronising folder"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "_Other Organiser"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_Add Group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "_Refresh:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-msgid "_Type:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
-
#: calendar/gui/dialogs/cancel-comp.c:57
msgid ""
"The event being deleted is a meeting, would you like to send a cancellation "
@@ -4538,80 +4519,80 @@ msgstr ""
msgid "%s You have made no changes, update the editor?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
#, fuzzy
msgid "Could not update object"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
msgid "Edit Appointment"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
#, c-format
msgid "Appointment - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
#, c-format
msgid "Task - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
#, c-format
msgid "Journal entry - %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
msgid "Save as..."
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
msgid "Unable to use current version!"
msgstr ""
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
#: calendar/gui/dialogs/copy-source-dialog.c:57
#, fuzzy
msgid "Could not open source"
@@ -4734,27 +4715,27 @@ msgstr ""
msgid "Enter Delegate"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
msgid "Appointment"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
msgid "Reminder"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
msgid "Recurrence"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
msgid "Scheduling"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:229
+#: calendar/gui/dialogs/event-editor.c:298
+#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr ""
@@ -4766,7 +4747,7 @@ msgstr ""
msgid "Event with no end date"
msgstr ""
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
msgid "Start date is wrong"
msgstr ""
@@ -4853,10 +4834,10 @@ msgstr ""
#. an empty string is the same as 'None'
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
+#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4875,15 +4856,15 @@ msgstr ""
msgid "At least one attendee is required."
msgstr ""
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
msgid "_Delegate To..."
msgstr ""
#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: calendar/gui/dialogs/meeting-page.c:655
#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5154,25 +5135,19 @@ msgstr ""
msgid "Save Event"
msgstr ""
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr ""
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
-msgstr ""
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
+msgstr "Could not initialise Bonobo"
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
#, fuzzy
-msgid "calendar"
-msgstr "Organisation"
+msgid "_Destination"
+msgstr "Synchronising folder"
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
#, fuzzy
-msgid "task list"
+msgid "Task List"
msgstr "_Other Organiser"
#: calendar/gui/dialogs/send-comp.c:57
@@ -5201,38 +5176,44 @@ msgid "% _Complete"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
msgid "Completed"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
msgid "High"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
#: calendar/gui/print.c:2343
msgid "In Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
msgid "Low"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: mail/message-list.c:957
msgid "Normal"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
msgid "Not Started"
msgstr ""
@@ -5268,11 +5249,11 @@ msgstr ""
msgid "Assignment"
msgstr ""
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
msgid "Due date is wrong"
msgstr ""
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr ""
@@ -5281,8 +5262,9 @@ msgstr ""
msgid "Con_fidential"
msgstr ""
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
msgid "Description:"
msgstr ""
@@ -5430,97 +5412,53 @@ msgstr ""
msgid "%s for an unknown trigger type"
msgstr ""
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr ""
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "_Other Organiser"
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Other Organiser"
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
+#: calendar/gui/e-cal-component-preview.c:247
+msgid "Priority:"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
+#: calendar/gui/e-cal-component-preview.c:300
+msgid "Web Page:"
msgstr ""
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+msgid "Public"
msgstr ""
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330
+msgid "Private"
msgstr ""
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332
+msgid "Confidential"
msgstr ""
#: calendar/gui/e-calendar-table.c:396
@@ -5567,17 +5505,26 @@ msgstr ""
msgid "100%"
msgstr ""
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
msgid "Updating objects"
msgstr ""
#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr ""
@@ -5586,41 +5533,42 @@ msgid "Open _Web Page"
msgstr ""
#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr ""
#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
+#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
#: ui/evolution-tasks.xml.h:25
msgid "_Print..."
msgstr ""
#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
#: 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:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
+#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
msgid "_Copy"
msgstr ""
#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
msgid "_Paste"
msgstr ""
@@ -5677,77 +5625,153 @@ msgstr ""
msgid "Start date"
msgstr "_Other Organiser"
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
+msgid "Summary"
+msgstr ""
+
#: calendar/gui/e-calendar-table.etspec.h:11
msgid "Task sort"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
msgid "New Task"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
#, fuzzy
msgid "_Select Date..."
msgstr "Organisation"
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
#, fuzzy
msgid "Cop_y to Calendar..."
msgstr "Organisation"
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
#, fuzzy
msgid "Mo_ve to Calendar..."
msgstr "Cannot initialise Evolution's mail component."
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
msgid "Delete _All Occurrences"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
msgid "_Settings..."
msgstr ""
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr ""
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr ""
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1534
+#: camel/providers/imap4/camel-imap4-engine.c:1561
+#: camel/providers/imap4/camel-imap4-engine.c:1591
+#: camel/providers/imap4/camel-imap4-engine.c:1631
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
+#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
#. strftime format of a weekday, a date and a time, 24-hour.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
@@ -5768,35 +5792,35 @@ msgid ""
"%s"
msgstr ""
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
+#: calendar/gui/print.c:840
+msgid "pm"
msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
msgstr ""
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr ""
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
msgstr ""
#: calendar/gui/e-itip-control.c:592
@@ -5904,10 +5928,6 @@ msgstr ""
msgid "<i>None</i>"
msgstr ""
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr ""
-
#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
@@ -5937,7 +5957,7 @@ msgstr ""
#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr ""
@@ -6150,60 +6170,56 @@ msgstr ""
msgid "The attachment has no viewable calendar items"
msgstr ""
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
msgid "There was an error on the CORBA system\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
msgid "Object could not be found\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
#, fuzzy
msgid "You don't have the right permissions to update the calendar\n"
msgstr "Could not close temporary folder: %s"
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
msgid "Attendee status could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
msgid "The item could not be sent!\n"
msgstr ""
@@ -6320,28 +6336,6 @@ msgstr ""
msgid "In Process"
msgstr ""
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr ""
@@ -6402,77 +6396,160 @@ msgstr ""
msgid "Meeting _end time:"
msgstr ""
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2093
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
#, c-format
msgid ""
"Error on %s:\n"
" %s"
msgstr ""
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
msgstr ""
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
#, c-format
msgid "Opening tasks at %s"
msgstr ""
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
#, c-format
msgid ""
"Error opening %s:\n"
"%s"
msgstr ""
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
msgid "Loading tasks"
msgstr ""
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
msgid "Expunging"
msgstr ""
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1876
#, c-format
msgid "Loading appointments at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
#, c-format
msgid "Loading tasks at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
#, fuzzy, c-format
msgid "Opening %s"
msgstr "Synchronising folders"
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
#, c-format
msgid "The calendar backend for '%s' has crashed."
msgstr ""
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
+#: calendar/gui/gnome-cal.c:2894
+msgid "Purging"
msgstr ""
-#: calendar/gui/gnome-cal.c:2757
-msgid "Purging"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Organisation"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:1
@@ -6612,6 +6689,23 @@ msgstr ""
msgid "On The Web"
msgstr ""
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Could not close temporary folder: %s"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Could not close temporary folder: %s"
+
#: calendar/gui/print.c:489
msgid "1st"
msgstr ""
@@ -6831,7 +6925,7 @@ msgid "Contacts: "
msgstr ""
#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
msgid "Print Preview"
msgstr ""
@@ -6843,67 +6937,76 @@ msgstr ""
msgid "Print Setup"
msgstr ""
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
#, fuzzy
msgid "New Task List"
msgstr "_Other Organiser"
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
+
+#: calendar/gui/tasks-component.c:447
+msgid "Failed upgrading tasks."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:526
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
msgid "There is no calendar available for creating tasks"
msgstr ""
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
msgid ""
"Selected task list is read-only, events cannot be created. Please select a "
"read-write calendar."
msgstr ""
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
msgid "New task"
msgstr ""
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
msgid "_Task"
msgstr ""
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
msgid "Create a new task"
msgstr ""
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
#, fuzzy
msgid "New tasks group"
msgstr "_Other Organiser"
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
msgid "_Tasks Group"
msgstr ""
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
#, fuzzy
msgid "Create a new tasks group"
msgstr "_Other Organiser"
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -6911,11 +7014,11 @@ msgid ""
"Really erase these tasks?"
msgstr ""
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
msgid "Do not ask me again."
msgstr ""
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
msgid "Print Tasks"
msgstr ""
@@ -8558,7 +8661,7 @@ msgstr ""
msgid "Downloading new messages for offline mode"
msgstr ""
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
#, fuzzy, c-format
msgid "Preparing folder '%s' for offline"
msgstr "Synchronising \"%s\""
@@ -8651,31 +8754,6 @@ msgstr ""
msgid "Error executing filter search: %s: %s"
msgstr ""
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Can not parse search expression: %s\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
#: camel/camel-folder.c:653
#, c-format
msgid "Unsupported operation: append message: for %s"
@@ -8709,7 +8787,48 @@ msgstr ""
msgid "Filtering new message(s)"
msgstr "Can not open message"
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Can not parse search expression: %s\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+#: camel/camel-folder-search.c:785
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -8717,43 +8836,43 @@ msgid ""
"%s"
msgstr ""
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
msgstr ""
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
+#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr ""
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr ""
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
#, fuzzy
msgid "Failed to encrypt: No valid recipients specified."
msgstr "Can not encrypt this message: no recipients specified"
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
#, fuzzy, c-format
msgid ""
"Failed to GPG %s: %s\n"
@@ -8761,85 +8880,65 @@ msgid ""
"%s"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
#, fuzzy, c-format
msgid "Failed to GPG %s: %s\n"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
#, fuzzy, c-format
msgid "Could not generate signing data: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
#, fuzzy, c-format
msgid "Failed to execute gpg: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
+#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
+#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
msgid "Failed to execute gpg."
msgstr ""
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
msgid "This is a digitally signed message part"
msgstr ""
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
+#: camel/camel-smime-context.c:739
#, fuzzy
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Can not verify this message: could not create temporary file: %s"
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
#, fuzzy, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "Can not verify this message: could not create temporary file: %s"
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
#, fuzzy, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
msgid "This is a digitally encrypted message part"
msgstr ""
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
msgid "Encrypted content"
msgstr ""
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
#, fuzzy
msgid "Unable to parse message content"
msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Can not build locking helper pipe: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Can not fork locking helper: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr ""
-
#: camel/camel-lock.c:92 camel/camel-lock.c:113
#, c-format
msgid "Could not create lock file for %s: %s"
@@ -8860,6 +8959,26 @@ msgstr ""
msgid "Failed to get lock using flock(2): %s"
msgstr ""
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Can not build locking helper pipe: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Can not fork locking helper: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr ""
+
#: camel/camel-movemail.c:107
#, c-format
msgid "Could not check mail file %s: %s"
@@ -9092,7 +9211,7 @@ msgstr ""
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1196
+#: camel/providers/imap/camel-imap-store.c:1212
msgid "Bad authentication response from server."
msgstr ""
@@ -9283,8 +9402,9 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr ""
#: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
-msgstr ""
+#, fuzzy
+msgid "Cannot add encryption certificate"
+msgstr "Can not get folder: %s: %s"
#: camel/camel-smime-context.c:360
msgid "Cannot add CMS SignerInfo"
@@ -9300,7 +9420,7 @@ msgstr "Can not create folder lock on %s: %s"
msgid "Failed to add data to CMS encoder"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
#, fuzzy
msgid "Failed to encode data"
msgstr "Could not close temporary folder: %s"
@@ -9365,95 +9485,95 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
#, fuzzy
msgid "Certificate import failed"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
msgstr ""
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
msgstr ""
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
msgid "Can't find signature digests"
msgstr ""
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr ""
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
msgid "Decoder failed"
msgstr ""
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
#, fuzzy, c-format
msgid "Can't find certificate for `%s'"
msgstr "Can not get folder: %s: %s"
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
msgid "Can't find common bulk encryption algorithm"
msgstr ""
#. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
msgid "Can't allocate slot for encryption bulk key"
msgstr ""
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
#, fuzzy
msgid "Can't create CMS Message"
msgstr "Can not open message"
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
msgid "Can't create CMS EnvelopedData"
msgstr ""
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
msgid "Can't attach CMS EnvelopedData"
msgstr ""
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
msgid "Can't attach CMS data object"
msgstr ""
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
msgid "Can't create CMS RecipientInfo"
msgstr ""
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
msgid "Can't add CMS RecipientInfo"
msgstr ""
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
#, fuzzy
msgid "Can't create encoder context"
msgstr "Can not create folder lock on %s: %s"
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
#, fuzzy
msgid "Failed to add data to encoder"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
#, c-format
msgid "Decoder failed, error %d"
msgstr ""
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
msgid "S/MIME Decrypt: No encrypted content found"
msgstr ""
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
msgid "import keys: unimplemented"
msgstr ""
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
msgid "export keys: unimplemented"
msgstr ""
@@ -9470,16 +9590,26 @@ msgstr "Can not get folder: %s: %s"
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Can not create folder: Invalid operation on this store"
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Can not delete folder: %s: Invalid operation"
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/camel-store.c:811
msgid "Trash"
msgstr ""
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr ""
@@ -9601,7 +9731,7 @@ msgstr ""
msgid "Error in application verification"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
#, c-format
msgid ""
"Issuer: %s\n"
@@ -9610,11 +9740,11 @@ msgid ""
"Signature: %s"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
msgid "GOOD"
msgstr ""
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
msgid "BAD"
msgstr ""
@@ -9631,7 +9761,7 @@ msgid ""
msgstr ""
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -9641,28 +9771,28 @@ msgid ""
"Do you wish to accept?"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
#, c-format
msgid ""
"Certificate problem: %s\n"
"Issuer: %s"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
#, c-format
msgid ""
"Bad certificate domain: %s\n"
"Issuer: %s"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
#, c-format
msgid ""
"Certificate expired: %s\n"
"Issuer: %s"
msgstr ""
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -9674,17 +9804,17 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr ""
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
#, c-format
msgid "Error storing `%s': %s"
msgstr ""
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
#, c-format
msgid "No such message %s in %s"
msgstr ""
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
#, fuzzy
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "You can not copy messages from this rubbish bin."
@@ -9694,11 +9824,6 @@ msgstr "You can not copy messages from this rubbish bin."
msgid "Cannot delete folder: %s: No such folder"
msgstr "Can not delete folder: %s: No such folder"
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Can not rename folder: %s: Invalid operation"
-
#: camel/camel-vee-store.c:398
#, c-format
msgid "Cannot rename folder: %s: No such folder"
@@ -9715,10 +9840,12 @@ msgid "Cannot copy messages to the Junk folder"
msgstr "Could not close temporary folder: %s"
#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
msgid "Checking for new mail"
msgstr ""
#: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:37
#: camel/providers/imap/camel-imap-provider.c:45
msgid "Check for new messages in all folders"
msgstr ""
@@ -9750,6 +9877,7 @@ msgid "For accessing Novell Groupwise servers"
msgstr ""
#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imap/camel-imap-provider.c:93
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-provider.c:71
@@ -9768,26 +9896,315 @@ msgstr ""
msgid "Checklist"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:218
-#: camel/providers/imap/camel-imap-command.c:257
-#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3118
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
msgstr ""
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1144
+#: camel/providers/imap4/camel-imap4-engine.c:1533
+#: camel/providers/imap4/camel-imap4-engine.c:1560
+#: camel/providers/imap4/camel-imap4-engine.c:1590
+#: camel/providers/imap4/camel-imap4-engine.c:1630
#, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
msgstr ""
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:287
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
msgid "Unknown error"
msgstr ""
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Can not delete folder: %s: No such folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "_Other Organiser"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3168
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3171
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
#. for imap ALERT codes, account user@host
#: camel/providers/imap/camel-imap-command.c:320
#, c-format
@@ -9830,23 +10247,23 @@ msgstr ""
msgid "Could not load summary for %s"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
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:569
+#: camel/providers/imap/camel-imap-folder.c:573
msgid "Scanning for changed messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
#, fuzzy, c-format
msgid "Unable to retrieve message: %s"
msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -9862,25 +10279,25 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mh-folder.c:200
msgid "No such message"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -9919,23 +10336,6 @@ msgstr "Could not close temporary folder: %s"
msgid "Command:"
msgstr ""
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
#: camel/providers/imap/camel-imap-provider.c:64
msgid "Apply filters to new messages in INBOX on this server"
msgstr ""
@@ -9956,85 +10356,43 @@ msgstr ""
msgid "For reading and storing mail on IMAP servers."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Could not close temporary folder: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
#, fuzzy, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1259
+#: camel/providers/imap/camel-imap-store.c:1275
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1289
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10042,25 +10400,18 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
@@ -10068,7 +10419,7 @@ msgstr ""
msgid "Cannot create folder `%s': folder exists."
msgstr "Can not get folder: %s: %s"
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "Can not get folder: %s: %s"
@@ -10167,58 +10518,58 @@ msgid ""
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
msgstr ""
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
#: camel/providers/local/camel-mbox-store.c:356
#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
#, c-format
msgid "Store root %s is not a regular directory"
msgstr ""
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Can not get folder: %s: %s"
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
msgid "Local stores do not have an inbox"
msgstr ""
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
#, c-format
msgid "Local mail file %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
#, fuzzy, c-format
msgid "Could not rename '%s': %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:423
#: camel/providers/local/camel-mbox-store.c:284
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-local-store.c:433
#: camel/providers/local/camel-mbox-store.c:296
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
#: camel/providers/local/camel-mbox-store.c:320
#, fuzzy, c-format
msgid "Could not delete folder meta file `%s': %s"
@@ -10284,7 +10635,7 @@ msgstr ""
msgid "not a maildir directory"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
#: camel/providers/local/camel-spool-store.c:286
#: camel/providers/local/camel-spool-store.c:316
#, c-format
@@ -10609,7 +10960,7 @@ msgid "Server rejected username/password"
msgstr ""
#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: camel/providers/nntp/camel-nntp-folder.c:263
#: camel/providers/pop3/camel-pop3-folder.c:262
#: camel/providers/pop3/camel-pop3-folder.c:430
#: camel/providers/pop3/camel-pop3-folder.c:491
@@ -10618,8 +10969,8 @@ msgid "User cancelled"
msgstr ""
#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
#: camel/providers/pop3/camel-pop3-folder.c:433
#: camel/providers/pop3/camel-pop3-folder.c:494
#: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10630,46 +10981,46 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: camel/providers/nntp/camel-nntp-folder.c:188
+#: camel/providers/nntp/camel-nntp-folder.c:228
#, c-format
msgid "Internal error: uid in invalid format: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
#, fuzzy, c-format
msgid "Could not get article %s from NNTP server"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
msgid "Posting not allowed by news server"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: camel/providers/nntp/camel-nntp-folder.c:373
#, c-format
msgid "Failed to send newsgroups header: %s: message not posted"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: camel/providers/nntp/camel-nntp-folder.c:413
+#: camel/providers/nntp/camel-nntp-folder.c:426
#, c-format
msgid "Error posting to newsgroup: %s: message not posted"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:438
msgid "Error reading response to posted message: message not posted"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
#, c-format
msgid "Error posting message: %s: message not posted"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
msgid "You cannot post NNTP messages while working offline!"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
#, fuzzy
msgid "You cannot copy messages from a NNTP folder!"
msgstr "Could not close temporary folder: %s"
@@ -10783,8 +11134,11 @@ msgid "Could not get group: %s"
msgstr "Could not close temporary folder: %s"
#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
msgstr ""
+"Can not get message: %s\n"
+" %s"
#: camel/providers/nntp/camel-nntp-summary.c:378
#, c-format
@@ -10836,8 +11190,8 @@ msgstr ""
msgid "Retrieving POP message %d"
msgstr ""
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
msgid "Unknown reason"
msgstr ""
@@ -11269,7 +11623,7 @@ msgstr ""
msgid "%.0fG"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
msgid "attachment"
msgstr ""
@@ -11313,6 +11667,91 @@ msgstr ""
msgid "Suggest automatic display of attachment"
msgstr ""
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Can not encrypt this message: no plaintext to encrypt"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Can not encrypt this message: no plaintext to encrypt"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Can not open message"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Can not open message"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr ""
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:3175
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
#: composer/e-msg-composer-hdrs.c:512
msgid "Posting destination"
msgstr ""
@@ -11391,194 +11830,129 @@ msgstr ""
msgid "Attach file(s)"
msgstr ""
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Can not encrypt this message: no plaintext to encrypt"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Can not open message"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
msgstr ""
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Can not open message"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
msgstr ""
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
msgstr ""
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
msgstr ""
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
msgstr ""
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Can not open message"
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
msgstr ""
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
msgstr ""
-#: composer/e-msg-composer.c:3165
-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"
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
msgstr ""
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Synchronising folder"
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Could not close temporary folder: %s"
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
msgstr ""
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
msgstr ""
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
msgid ""
"Are you sure you want to discard the message, titled '{0}', you are "
"composing?"
msgstr ""
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
msgid ""
"Closing this composer window will discard the message permanently, unless "
"you choose to save the message in your Drafts folder. This will allow you to "
"continue the message at a later date."
msgstr ""
-#: composer/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr "Could not close temporary folder: %s"
-
-#: composer/mail-composer-errors.xml.in.h:8
-#, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Could not close temporary folder: %s"
-
-#: composer/mail-composer-errors.xml.in.h:9
-#, fuzzy
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Could not close temporary folder: %s"
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
msgid "Discard Changes"
msgstr ""
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:15
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:16
-#, fuzzy
-msgid "Recover"
-msgstr "Synchronising folder"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
#, fuzzy
msgid "Save Message"
msgstr "Can not open message"
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Could not close temporary folder: %s"
-#: composer/mail-composer-errors.xml.in.h:19
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"${0}\", you may need to select different mail options."
msgstr ""
-#: composer/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
#, fuzzy
-msgid "Unfinished messages found"
-msgstr "Can not open message"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Could not close temporary folder: %s"
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
msgstr ""
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
msgstr ""
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
msgid "You need to configure an account before you can compose mail."
msgstr ""
@@ -11698,7 +12072,8 @@ msgid ""
"Overwrite it?"
msgstr ""
-#: e-util/e-dialog-utils.c:251
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
msgid "Overwrite file?"
msgstr ""
@@ -11875,73 +12250,89 @@ msgstr ""
msgid "_Filter Rules"
msgstr ""
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
msgstr ""
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
msgstr ""
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Can not delete folder: %s: No such folder"
-
-#: filter/filter-errors.xml.in.h:4
-msgid "Missing date."
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
msgstr ""
-#: filter/filter-errors.xml.in.h:5
-msgid "Missing file name."
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
msgstr ""
-#: filter/filter-errors.xml.in.h:6
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Can not delete folder: %s: No such folder"
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
#, fuzzy
msgid "Missing folder."
msgstr "Synchronising folder"
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
msgstr ""
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
msgstr ""
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
msgstr ""
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
msgstr ""
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
msgid "You must name this filter."
msgstr ""
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
msgid "You must name this vFolder."
msgstr ""
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
msgstr ""
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
msgstr ""
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr ""
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
msgstr ""
#: filter/filter-file.c:288
@@ -11954,65 +12345,11 @@ msgstr ""
msgid "<b>Then</b>"
msgstr "Organisation"
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
msgid "Select Folder"
msgstr ""
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "_Other Organiser"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr ""
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr ""
-
#: filter/filter.glade.h:1
msgid " "
msgstr ""
@@ -12095,6 +12432,72 @@ msgstr ""
msgid "years"
msgstr ""
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
+#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+msgid "Important"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "_Other Organiser"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
#. Automatically generated. Do not edit.
#: filter/libfilter-i18n.h:2
msgid "Adjust Score"
@@ -12225,7 +12628,7 @@ msgstr ""
msgid "Junk Test"
msgstr "Cannot initialise Evolution's mail component."
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr ""
@@ -12262,7 +12665,7 @@ msgstr ""
msgid "Play Sound"
msgstr ""
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
msgid "Read"
msgstr ""
@@ -12331,9 +12734,9 @@ msgstr ""
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
#: smime/lib/e-cert.c:1079
msgid "Subject"
msgstr ""
@@ -12395,106 +12798,59 @@ msgstr ""
msgid "Virtual _Folders"
msgstr "Synchronising folder"
-#: filter/vfolder-rule.c:572
-msgid "VFolder source"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
+#: filter/vfolder-rule.c:493
+msgid "_Add"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
+#: filter/vfolder-rule.c:573
+msgid "VFolder source"
msgstr ""
#. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
msgid "[Default]"
msgstr ""
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
msgid "Account name"
msgstr ""
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
msgid "Protocol"
msgstr ""
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
msgid "Unnamed"
msgstr ""
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
msgid "Language(s)"
msgstr ""
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
msgid "Add signature script"
msgstr ""
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
msgid "Signature(s)"
msgstr ""
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1499
+msgid "an unknown sender"
+msgstr ""
+
+#. translators: attribution string used when quoting messages,
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-composer-utils.c:1509
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
msgid "Create _Virtual Folder From Search..."
msgstr ""
@@ -12530,535 +12886,559 @@ msgstr ""
msgid "Create New Folder"
msgstr ""
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr ""
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Synchronising folder"
+
#: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder _name:"
msgstr ""
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr ""
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
#, fuzzy, c-format
msgid "Moving folder %s"
msgstr "Synchronising \"%s\""
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
#, fuzzy, c-format
msgid "Copying folder %s"
msgstr "Synchronising \"%s\""
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
#, fuzzy, c-format
msgid "Moving messages into folder %s"
msgstr "Can not append message to mh folder: %s: %s"
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
#, fuzzy, c-format
msgid "Copying messages into folder %s"
msgstr "Can not append message to mh folder: %s: %s"
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
#, fuzzy
msgid "Cannot drop message(s) into toplevel store"
msgstr "You can not copy messages from this rubbish bin."
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr ""
+
+#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr ""
+
+#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr ""
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+msgid "Cancel _Drag"
+msgstr ""
+
+#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
#: mail/importers/evolution-mbox-importer.c:119
msgid "Select folder"
msgstr ""
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+msgid "C_opy"
+msgstr ""
+
+#: mail/em-folder-tree.c:2096
#, fuzzy, c-format
msgid "Creating folder `%s'"
msgstr "Synchronising \"%s\""
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
#, fuzzy
msgid "Create folder"
msgstr "Synchronising folder"
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
#, fuzzy
msgid "Rename Folder"
msgstr "Synchronising folder"
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr ""
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
msgid "Open in _New Window"
msgstr ""
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr ""
-
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
#, fuzzy
msgid "_New Folder..."
msgstr "Synchronising folders"
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
msgid "_Rename"
msgstr ""
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr ""
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+msgid "Loading..."
+msgstr ""
+
+#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
+msgid "Mail"
+msgstr ""
+
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
msgid "_Edit as New Message..."
msgstr ""
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
msgid "_Print"
msgstr ""
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr ""
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr ""
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr ""
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
msgid "_Forward"
msgstr ""
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
msgid "Follo_w Up..."
msgstr ""
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
msgid "Fla_g Completed"
msgstr ""
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
msgid "Cl_ear Flag"
msgstr ""
-#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr ""
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
msgid "Mark as _Unread"
msgstr ""
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
msgid "Mark as _Important"
msgstr ""
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
msgid "Mark as _Junk"
msgstr ""
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
msgid "Mark as _Not Junk"
msgstr ""
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
msgid "U_ndelete"
msgstr ""
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr ""
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
msgid "Appl_y Filters"
msgstr ""
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
msgid "F_ilter Junk"
msgstr ""
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
msgid "VFolder on _Subject"
msgstr ""
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr ""
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
msgid "Filter on Sen_der"
msgstr ""
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr ""
-
#. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
#: mail/mail-config.glade.h:66
msgid "Default"
msgstr ""
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
msgid "Print Message"
msgstr ""
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
#, fuzzy
msgid "_Copy Link Location"
msgstr "Organisation"
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
#, c-format
msgid "Click to mail %s"
msgstr ""
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %s"
+#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
msgstr ""
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
+#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
msgstr ""
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
+#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
msgstr ""
-#: mail/em-format-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
msgstr ""
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
msgstr ""
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
msgstr ""
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
msgstr ""
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
msgstr ""
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
msgstr ""
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
msgstr ""
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
msgstr ""
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
msgstr ""
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
msgstr ""
-#: mail/em-format-html-display.c:656
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
msgstr ""
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
msgstr ""
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted. It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
msgstr ""
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
msgstr ""
-#: mail/em-format-html-display.c:658
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
msgstr ""
-#: mail/em-format-html-display.c:755
-#, fuzzy
-msgid "_View Certificate"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/em-format-html-display.c:770
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/em-format-html-display.c:1002
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
msgstr ""
-#: mail/em-format-html-display.c:1013
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
msgstr ""
-#: mail/em-format-html-display.c:1084
-msgid "_Hide"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
msgstr ""
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
msgstr ""
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
msgstr ""
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
msgid "Malformed external-body part."
msgstr ""
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
#, fuzzy
msgid "Formatting message"
msgstr "Can not open message"
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
msgstr ""
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
msgstr ""
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
msgstr ""
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
+#: mail/em-format-html-display.c:645
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
msgstr ""
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
msgstr ""
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
msgstr ""
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
+#: mail/em-format-html-display.c:647
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
msgstr ""
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"The Internet."
msgstr ""
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
+#: mail/em-format-html-display.c:654
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
msgstr ""
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:655
+msgid ""
+"This message is encrypted. It would be difficult for an outsider to view "
+"the content of this message."
msgstr ""
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:656
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
msgstr ""
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:757
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-format-html-display.c:772
+#, fuzzy
+msgid "This certificate is not viewable"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-format-html-display.c:1007
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
msgstr ""
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
msgstr ""
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
+#: mail/em-format-html-display.c:1089
+msgid "_Hide"
msgstr ""
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
msgstr ""
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
msgid "Spamassassin (built-in)"
msgstr ""
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
msgid "Every time"
msgstr ""
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
msgid "Once per day"
msgstr ""
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
msgid "Once per week"
msgstr ""
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
msgid "Once per month"
msgstr ""
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -13066,26 +13446,52 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Can not get folder: %s: %s"
+
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-migrate.c:1919
#, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
+msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1933
#, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
#, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2480
#, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Unable to create local mail folders at `%s': %s"
msgstr "Could not close temporary folder: %s"
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
#: mail/em-popup.c:699
msgid "Save As..."
msgstr ""
@@ -13095,91 +13501,77 @@ msgstr ""
msgid "untitled_image.%s"
msgstr ""
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
msgid "Set as _Background"
msgstr ""
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
msgid "_Reply to sender"
msgstr ""
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
msgid "_Open Link in Browser"
msgstr ""
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
msgid "Se_nd message to..."
msgstr ""
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
#, fuzzy
msgid "_Add to Addressbook"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
#, c-format
msgid "Open in %s..."
msgstr ""
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
msgid "This store does not support subscriptions, or they are not enabled."
msgstr ""
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
msgid "Subscribed"
msgstr ""
-#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr ""
#. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
msgid "Please select a server."
msgstr ""
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
msgid "No server has been selected"
msgstr ""
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
msgid "Don't show this message again."
msgstr ""
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
msgid "Filters"
msgstr ""
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr ""
-
-#: mail/em-utils.c:1137
-msgid "an unknown sender"
-msgstr ""
-
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
#, fuzzy
msgid "message"
msgstr "Can not open message"
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
msgid "Save Message..."
msgstr ""
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
#, fuzzy
msgid "Add address"
msgstr "Chile"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
#, c-format
msgid "Messages from %s"
msgstr ""
@@ -13197,11 +13589,11 @@ msgid "Check incoming mail being junk"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:6
@@ -13300,157 +13692,157 @@ msgid "Last time empty trash was run"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+msgid "List of accepted licenses"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
msgid "List of custom headers and whether they are enabled."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
msgid "List of mime types to check for bonobo component viewers"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
msgid "Load images for HTML messages over http"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
msgid ""
"Load images for HTML messages over http(s). Possible values are: 0 - Never "
"load images off the net 1 - Load images if sender is in the addressbook 2 - "
"Always load images off the net"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
msgid "Log filter actions"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
msgid "Log filter actions to the specified log file."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
msgid "Logfile to log filter actions"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
msgid "Logfile to log filter actions."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
msgid "Mark as Seen after specified timeout"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
msgid "Mark as Seen after specified timeout."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
msgid "Mark citations in the message \"Preview\""
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
msgid "Mark citations in the message \"Preview\"."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
msgid "Message Window default height"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
msgid "Message Window default width"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
msgid "Message-display style (normal, full headers, source)"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
msgid "Minimum days between emptying the trash on exit"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
msgid "Minimum time between emptying the trash on exit, in days."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
msgid "New Mail Notify sound file"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
msgid "New Mail Notify type"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
msgid "Prompt on empty subject"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
msgid "Prompt when user expunges"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
msgid "Prompt when user only fills Bcc"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:58
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:65
@@ -13498,7 +13890,7 @@ msgid "Spell check inline"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:77
@@ -13635,51 +14027,84 @@ msgstr ""
msgid "spamd port"
msgstr ""
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
msgstr ""
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
msgstr ""
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
msgstr ""
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
#, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
msgstr ""
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Chile"
+
#: mail/importers/elm-importer.c:88
msgid "Evolution is importing your old Elm mail"
msgstr ""
#: mail/importers/elm-importer.c:89
#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
msgid "Importing..."
msgstr ""
#: mail/importers/elm-importer.c:91
#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
msgid "Please wait"
msgstr ""
@@ -13707,19 +14132,49 @@ msgid "Select folder to import into"
msgstr ""
#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
#, c-format
msgid "Importing `%s'"
msgstr ""
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
#, fuzzy
msgid "Importing mailbox"
msgstr "Organisation"
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
#, c-format
msgid "Scanning %s"
msgstr ""
@@ -13729,7 +14184,7 @@ msgstr ""
msgid "Priority Filter \"%s\""
msgstr ""
-#: mail/importers/netscape-importer.c:651
+#: mail/importers/netscape-importer.c:662
msgid ""
"Some of your Netscape email filters are based on\n"
"email priorities, which are not used in Evolution.\n"
@@ -13744,7 +14199,7 @@ msgid ""
"everything still works as intended."
msgstr ""
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
msgid ""
"Some of your Netscape email filters use\n"
"the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13752,7 +14207,7 @@ msgid ""
"These filters will be dropped."
msgstr ""
-#: mail/importers/netscape-importer.c:692
+#: mail/importers/netscape-importer.c:703
msgid ""
"Some of your Netscape email filters test the\n"
"body of emails for (in)equality to a given string,\n"
@@ -13761,23 +14216,23 @@ msgid ""
"contained in the message body."
msgstr ""
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
msgid "Evolution is importing your old Netscape data"
msgstr ""
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
msgid "Importing Netscape data"
msgstr ""
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
msgid "Settings"
msgstr ""
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
msgid "Mail Filters"
msgstr ""
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -13806,166 +14261,178 @@ msgid "Pine"
msgstr ""
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
msgid "_Host:"
msgstr ""
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
msgid "User_name:"
msgstr ""
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
msgid "_Path:"
msgstr ""
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
#, c-format
msgid "Mail to %s"
msgstr ""
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
#, c-format
msgid "Subject is %s"
msgstr ""
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
#, c-format
msgid "Mail from %s"
msgstr ""
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
#, c-format
msgid "%s mailing list"
msgstr ""
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
msgid "Add Filter Rule"
msgstr ""
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
#, c-format
msgid "%d deleted"
msgstr ""
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
#, c-format
msgid "%d junk"
msgstr ""
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
#, c-format
msgid "%d drafts"
msgstr ""
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
#, fuzzy, c-format
msgid "%d sent"
msgstr "_Other Organiser"
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
#, fuzzy, c-format
msgid "%d unsent"
msgstr "_Other Organiser"
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
#, fuzzy, c-format
msgid "%d total"
msgstr "_Other Organiser"
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
#, c-format
msgid ", %d unread"
msgstr ""
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "_Other Organiser"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
#, fuzzy
msgid "New Mail Message"
msgstr "Can not open message"
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
#, fuzzy
msgid "_Mail Message"
msgstr "Can not open message"
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
#, fuzzy
msgid "Compose a new mail message"
msgstr "Can not open message"
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
#, fuzzy
msgid "New Mail Folder"
msgstr "Synchronising folders"
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
#, fuzzy
msgid "Mail _Folder"
msgstr "Synchronising folder"
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
#, fuzzy
msgid "Create a new mail folder"
msgstr "Synchronising folder"
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
msgstr ""
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
msgid "Identity"
msgstr ""
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
"information in email you send."
msgstr ""
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
#: mail/mail-config.glade.h:116
msgid "Receiving Mail"
msgstr ""
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
msgid ""
"Please enter information about your incoming mail server below. If you are "
"not sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
msgid "Please select among the following options"
msgstr ""
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
msgid "Sending Mail"
msgstr ""
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
msgid "Account Management"
msgstr ""
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
msgid ""
"You are almost done with the mail configuration process. The identity, "
"incoming mail server and outgoing mail transport method which you provided "
@@ -13974,14 +14441,6 @@ msgid ""
"purposes only."
msgstr ""
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr ""
-
#: mail/mail-config.glade.h:1
msgid " Ch_eck for Supported Types "
msgstr ""
@@ -14272,7 +14731,7 @@ msgid "Execute Command..."
msgstr ""
#: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
msgstr ""
#: mail/mail-config.glade.h:82
@@ -14573,385 +15032,500 @@ msgstr "Colours"
msgid "description"
msgstr ""
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Could not close temporary folder: %s"
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
msgstr ""
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
msgstr ""
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
msgstr ""
-#: mail/mail-errors.xml.in.h:5
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+msgid "Are you sure you want to send a message in HTML format?"
msgstr ""
-#: mail/mail-errors.xml.in.h:6
-msgid "Are you sure you want to send a message in HTML format?"
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
msgstr ""
-#: mail/mail-errors.xml.in.h:7
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+msgid "_Send"
msgstr ""
-#: mail/mail-errors.xml.in.h:8
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
msgid "Are you sure you want to send a message without a subject?"
msgstr ""
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
msgstr ""
-#: mail/mail-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+msgid "Are you sure you want to send a message with only BCC recipients?"
msgstr ""
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
msgstr ""
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
msgstr ""
-#: mail/mail-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Synchronising folder failed: %s: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Can not get folder: %s: %s"
-
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Can not create folder lock on %s: %s"
-
-#: mail/mail-errors.xml.in.h:16
-#, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Can not create folder lock on %s: %s"
-
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Can not delete folder: %s: No such folder"
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
-#: mail/mail-errors.xml.in.h:18
-#, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Can not delete folder: %s: No such folder"
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
#, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Can not get folder: %s: %s"
+msgid "Use default drafts folder?"
+msgstr "Synchronising folder"
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Can not get folder: %s: %s"
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Could not close temporary folder: %s"
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr ""
-#: mail/mail-errors.xml.in.h:22
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Could not close temporary folder: %s"
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr ""
-#: mail/mail-errors.xml.in.h:23
-#, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Can not open message"
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
msgstr ""
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Can not rename folder: %s: No such folder"
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
msgstr ""
-#: mail/mail-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Can not create folder lock on %s: %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
msgstr ""
-"Can not get message: %s\n"
-" %s"
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
msgstr ""
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder. Check the message for errors "
+"and resend."
msgstr ""
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Could not close temporary folder: %s"
-
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
msgstr ""
-#: mail/mail-errors.xml.in.h:33
-msgid "Delete account?"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
msgstr ""
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
msgstr ""
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
msgstr ""
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
+#. mail:session-message-info secondary
+#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
+msgid "{0}"
msgstr ""
-#: mail/mail-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
msgid "Enter password."
msgstr ""
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
msgid "Error loading filter definitions."
msgstr ""
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr ""
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Can not create folder lock on %s: %s"
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
msgstr ""
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
msgstr ""
+"Can not get message: %s\n"
+" %s"
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
#, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Can not delete folder: %s: No such folder"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Can not create folder lock on %s: %s"
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Can not create folder lock on %s: %s"
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. mail:no-create-tmp-path secondary
+#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
msgstr ""
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
msgstr ""
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "Can not delete folder: %s: No such folder"
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
#, fuzzy
-msgid "Invalid authentication"
-msgstr "Could not close temporary folder: %s"
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Can not delete folder: %s: No such folder"
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Can not delete folder: %s: No such folder"
-#: mail/mail-errors.xml.in.h:49
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
msgstr ""
-#: mail/mail-errors.xml.in.h:50
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Can not rename folder: %s: No such folder"
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
msgstr ""
-#: mail/mail-errors.xml.in.h:52
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
#, fuzzy
msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgstr "Can not delete folder: %s: No such folder"
-#: mail/mail-errors.xml.in.h:53
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
msgstr ""
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient."
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr ""
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr ""
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
msgstr ""
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Can not get folder: %s: %s"
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Could not close temporary folder: %s"
+
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Can not open message"
+
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Synchronising folder failed: %s: %s"
+
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Can not get folder: %s: %s"
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Could not close temporary folder: %s"
+
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
msgstr ""
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
msgstr ""
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
msgstr ""
-#: mail/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
msgstr ""
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
msgstr ""
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
msgstr ""
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
msgstr ""
-#: mail/mail-errors.xml.in.h:65
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
#, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Synchronising folder"
+msgid "Could not save signature file."
+msgstr "Could not close temporary folder: %s"
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
msgstr ""
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
msgstr ""
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
msgstr ""
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
msgstr ""
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
msgstr ""
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
msgstr ""
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
msgstr ""
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Can not get folder: %s: %s"
+
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
msgstr ""
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
msgstr ""
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
msgid "vFolders automatically updated."
msgstr ""
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+" \"{1}\"\n"
+"And have been updated."
msgstr ""
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
msgstr ""
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+" \"{1}\"\n"
+"And have been updated."
msgstr ""
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
+msgstr ""
+
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
+msgstr ""
+
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
msgstr ""
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+msgid "_Append"
+msgstr ""
+
+#: mail/mail-folder-cache.c:787
#, c-format
msgid "Pinging %s"
msgstr ""
@@ -14960,170 +15534,170 @@ msgstr ""
msgid "Working"
msgstr ""
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
msgid "Filtering Folder"
msgstr ""
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
msgid "Fetching Mail"
msgstr ""
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
#, fuzzy, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
#, c-format
msgid ""
"Failed to append to %s: %s\n"
"Appending to local `Sent' folder instead."
msgstr ""
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
#, fuzzy, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
#, c-format
msgid "Sending message %d of %d"
msgstr ""
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
#, fuzzy, c-format
msgid "Failed to send %d of %d messages"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
msgid "Complete."
msgstr ""
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
msgid "Saving message to folder"
msgstr ""
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
#, c-format
msgid "Moving messages to %s"
msgstr ""
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
#, c-format
msgid "Copying messages to %s"
msgstr ""
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
#, c-format
msgid "Scanning folders in \"%s\""
msgstr ""
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
msgid "Forwarded messages"
msgstr ""
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
#, c-format
msgid "Opening folder %s"
msgstr ""
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
#, c-format
msgid "Removing folder %s"
msgstr ""
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
#, c-format
msgid "Storing folder '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
#, c-format
msgid "Expunging and storing account '%s'"
msgstr ""
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
#, fuzzy, c-format
msgid "Storing account '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
msgid "Refreshing folder"
msgstr ""
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
#, c-format
msgid "Emptying trash in '%s'"
msgstr ""
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
msgid "Local Folders"
msgstr ""
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
#, c-format
msgid "Retrieving message %s"
msgstr ""
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
#, fuzzy, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "Can not open message"
msgstr[1] "Can not open message"
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
#, fuzzy, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "Can not open message"
msgstr[1] "Can not open message"
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
#, c-format
msgid ""
"Unable to create output file: %s\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
msgid "Saving attachment"
msgstr ""
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
#, c-format
msgid "Could not write data: %s"
msgstr ""
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
#, c-format
msgid "Disconnecting from %s"
msgstr ""
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
#, c-format
msgid "Reconnecting to %s"
msgstr ""
@@ -15187,24 +15761,24 @@ msgstr ""
msgid "Waiting..."
msgstr ""
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
msgid "User canceled operation."
msgstr ""
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
#, c-format
msgid "Enter Password for %s"
msgstr ""
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
msgid "Enter Password"
msgstr ""
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
msgid "_Remember this password"
msgstr ""
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
msgid "_Remember this password for the remainder of this session"
msgstr ""
@@ -15244,89 +15818,94 @@ msgstr ""
msgid "Invalid folder: `%s'"
msgstr "Can not get folder: %s: %s"
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
#, c-format
msgid "Setting up vfolder: %s"
msgstr ""
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
-msgstr ""
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Synchronising \"%s\""
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-vfolder.c:959
msgid "vFolders"
msgstr ""
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
msgid "Edit VFolder"
msgstr ""
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
msgid "New VFolder"
msgstr ""
-#: mail/message-list.c:911
+#: mail/message-list.c:946
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:912
+#: mail/message-list.c:947
msgid "Seen"
msgstr ""
-#: mail/message-list.c:913
+#: mail/message-list.c:948
msgid "Answered"
msgstr ""
-#: mail/message-list.c:914
+#: mail/message-list.c:949
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:915
+#: mail/message-list.c:950
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:919
+#: mail/message-list.c:954
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:920
+#: mail/message-list.c:955
msgid "Lower"
msgstr ""
-#: mail/message-list.c:924
+#: mail/message-list.c:959
msgid "Higher"
msgstr ""
-#: mail/message-list.c:925
+#: mail/message-list.c:960
msgid "Highest"
msgstr ""
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
msgid "?"
msgstr ""
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
msgid "%b %d %l:%M %p"
msgstr ""
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
msgid "Generating message list"
msgstr ""
@@ -15359,43 +15938,43 @@ msgstr ""
msgid "Size"
msgstr ""
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
msgid "Call"
msgstr ""
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
msgid "Do Not Forward"
msgstr ""
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
msgid "Follow-Up"
msgstr ""
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
msgid "For Your Information"
msgstr ""
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr ""
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
msgid "No Response Necessary"
msgstr ""
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr ""
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
msgid "Reply to All"
msgstr ""
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
msgid "Review"
msgstr ""
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
msgid "Flag to Follow Up"
msgstr ""
@@ -15437,130 +16016,88 @@ msgstr ""
msgid "_Unsubscribe"
msgstr ""
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Cannot initialise Evolution's mail component."
-
#: shell/apps_evolution_shell.schemas.in.in.h:1
msgid "480"
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
msgid "Default width of the folder bar pane"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
msgid "Default window height"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
msgid "Default window width"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
#, fuzzy
msgid "Evolution configuration version"
msgstr "Cannot initialise Evolution's mail component."
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
msgid "ID or alias of the component to be shown by default at start-up."
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:7
msgid ""
"If set to true, Evolution will start up in offline mode instead of online "
"mode."
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:8
msgid ""
"If set to true, the warning dialog in development versions of Evolution is "
"not displayed."
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:9
msgid ""
"List of paths for the folders to be synchronized to disk for offline usage"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Synchronising folder"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Synchronising folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether to skip the development warning dialog"
+msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:15
+#: shell/apps_evolution_shell.schemas.in.in.h:12
#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Synchronising folder"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
+msgid "mail"
+msgstr "Chile"
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, c-format
+msgid "%ld KB"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Synchronising folder"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether Evolution should start up in offline mode"
+#: shell/e-shell.c:744
+msgid "Uknown system error."
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether to skip the development warning dialog"
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:24
-#, fuzzy
-msgid "mail"
-msgstr "Chile"
-
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/e-shell.c:1107
+msgid "Generic error"
msgstr ""
#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15686,11 +16223,11 @@ msgstr "Could not close temporary folder: %s"
msgid "_Import"
msgstr ""
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
msgid "Closing connections..."
msgstr ""
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
msgid "Evolution Settings"
msgstr ""
@@ -15727,11 +16264,28 @@ msgstr ""
msgid "'.' and '..' are reserved folder names."
msgstr ""
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:343
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell-window.c:621
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: shell/e-shell-window-commands.c:64
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr ""
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
#, c-format
msgid "Error executing %s."
msgstr ""
@@ -15746,14 +16300,14 @@ msgstr ""
#: shell/e-shell-window-commands.c:171
#, fuzzy
-msgid "About Ximian Evolution"
+msgid "About Evolution"
msgstr "Can not initialise the Ximian Evolution shell."
#: shell/e-shell-window-commands.c:382
msgid "_Work Online"
msgstr ""
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
msgid "_Work Offline"
msgstr ""
@@ -15761,44 +16315,6 @@ msgstr ""
msgid "Work Offline"
msgstr ""
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online. Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline. Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr ""
-
#: shell/e-storage-set-view.etspec.h:1
#, fuzzy
msgid "Checkbox"
@@ -15861,6 +16377,49 @@ msgstr ""
msgid "Click OK to close these connections and go offline"
msgstr ""
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Organisation"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "_Other Organiser"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Chile"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "_Other Organiser"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Synchronising folder"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Synchronising folder"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Synchronising folder"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr ""
+
#: shell/glade/evolution-startup-wizard.glade.h:2
msgid "Evolution Setup Assistant"
msgstr ""
@@ -15894,6 +16453,21 @@ msgid ""
"Click the \"Apply\" button to save your settings. "
msgstr ""
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Cannot initialise Evolution's mail component."
+
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr ""
@@ -15951,13 +16525,13 @@ msgid "Evolution can import data from the following files:"
msgstr ""
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
"\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
"but some features are either unfinished or do not work properly.\n"
"\n"
"If you want a stable version of Evolution, we urge you to uninstall\n"
@@ -15971,69 +16545,124 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
-#: shell/main.c:254
+#: shell/main.c:255
#, fuzzy
msgid ""
"Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:261
+#: shell/main.c:262
msgid "Don't tell me again"
msgstr ""
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Can not initialise the Ximian Evolution shell."
-
-#: shell/main.c:400
-#, fuzzy, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Can not initialise the Ximian Evolution shell."
-
-#: shell/main.c:497
+#: shell/main.c:496
msgid "Start Evolution activating the specified component"
msgstr ""
-#: shell/main.c:499
+#: shell/main.c:498
msgid "Start in offline mode"
msgstr ""
-#: shell/main.c:501
+#: shell/main.c:500
msgid "Start in online mode"
msgstr ""
-#: shell/main.c:504
+#: shell/main.c:503
msgid "Forcibly shut down all evolution components"
msgstr ""
-#: shell/main.c:508
+#: shell/main.c:507
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr ""
-#: shell/main.c:511
+#: shell/main.c:510
msgid "Send the debugging output of all components to a file."
msgstr ""
-#: shell/main.c:535
+#: shell/main.c:534
msgid "Evolution"
msgstr ""
-#: shell/main.c:539
+#: shell/main.c:538
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
" Use %s --help for more information.\n"
msgstr ""
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+msgid "Continue"
+msgstr ""
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Can not initialise the Ximian Evolution shell."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Cannot initialise Evolution's mail component."
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
msgid "Select a cert to import..."
msgstr ""
#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
#, fuzzy
msgid "Certificate Name"
msgstr "Could not close temporary folder: %s"
@@ -16264,12 +16893,6 @@ msgstr ""
msgid "Your Certificates"
msgstr ""
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Could not close temporary folder: %s"
-
#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
msgid "%d/%m/%Y"
msgstr "%m/%d/%Y"
@@ -16466,6 +17089,12 @@ msgstr ""
msgid "Certificate Signature Value"
msgstr "Could not close temporary folder: %s"
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Could not close temporary folder: %s"
+
#: smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr ""
@@ -16506,12 +17135,12 @@ msgstr ""
#. This most likely means that KILL_PROCESS_CMD wasn't
#. * found, so just bail completely.
#.
-#: tools/killev.c:63
+#: tools/killev.c:61
#, fuzzy, c-format
msgid "Could not execute '%s': %s\n"
msgstr "Could not close temporary folder: %s"
-#: tools/killev.c:78
+#: tools/killev.c:76
#, c-format
msgid "Shutting down %s (%s)\n"
msgstr ""
@@ -16575,7 +17204,7 @@ msgid "Select all contacts"
msgstr ""
#: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
msgstr ""
#: ui/evolution-addressbook.xml.h:24
@@ -16606,8 +17235,8 @@ msgstr ""
#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
msgid "_Actions"
msgstr ""
@@ -16625,7 +17254,7 @@ msgid "_Preview Pane"
msgstr ""
#: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+msgid "_Save as VCard..."
msgstr ""
#: ui/evolution-addressbook.xml.h:42
@@ -16751,10 +17380,20 @@ msgstr ""
msgid "Week"
msgstr ""
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr ""
+
#: ui/evolution-calendar.xml.h:42
msgid "_Open Appointment"
msgstr ""
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "C_lose"
+
#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
#: ui/evolution-contact-list-editor.xml.h:2
#: ui/evolution-mail-messagedisplay.xml.h:1
@@ -17076,6 +17715,16 @@ msgstr ""
msgid "_Threaded Message List"
msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:26
+msgid "_Close"
+msgstr ""
+
#: ui/evolution-mail-message.xml.h:1
#, fuzzy
msgid "A_dd Sender to Address Book"
@@ -17315,7 +17964,7 @@ msgid "Open the selected message in a new window"
msgstr ""
#: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+msgid "Open the selected message in the composer for editing"
msgstr ""
#: ui/evolution-mail-message.xml.h:72
@@ -17431,58 +18080,46 @@ msgstr ""
msgid "_Attached"
msgstr ""
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr ""
-
#: ui/evolution-mail-message.xml.h:111
msgid "_Create Filter From Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Go To"
-msgstr ""
-
#: ui/evolution-mail-message.xml.h:115
-msgid "_Inline"
+msgid "_Go To"
msgstr ""
#: ui/evolution-mail-message.xml.h:116
-msgid "_Larger"
+msgid "_Inline"
msgstr ""
#: ui/evolution-mail-message.xml.h:117
-msgid "_Message Display"
+msgid "_Larger"
msgstr ""
#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
+msgid "_Message Display"
msgstr ""
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
msgid "_Next Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
msgid "_Normal Display"
msgstr ""
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
msgid "_Open Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
msgid "_Previous Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
msgid "_Quoted"
msgstr ""
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr ""
-
#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
msgid "_Tools"
msgstr ""
@@ -17491,16 +18128,6 @@ msgstr ""
msgid "_Undelete"
msgstr ""
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
-msgid "_Close"
-msgstr ""
-
#: ui/evolution-message-composer.xml.h:1
msgid "Attach"
msgstr ""
@@ -17890,6 +18517,10 @@ msgstr ""
msgid "_Send / Receive"
msgstr ""
+#: ui/evolution.xml.h:36
+msgid "_Window"
+msgstr ""
+
#: views/addressbook/galview.xml.h:1
msgid "By _Company"
msgstr ""
@@ -17956,10 +18587,6 @@ msgstr "_Other Organiser"
msgid "With _Status"
msgstr ""
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
msgid "UTC"
@@ -18114,6 +18741,35 @@ msgstr ""
msgid "..."
msgstr ""
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Cannot initialise Evolution's mail component."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
#: widgets/misc/e-expander.c:181
msgid "Expanded"
msgstr ""
@@ -18226,6 +18882,32 @@ msgstr ""
msgid "Find _Now"
msgstr ""
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+msgid "Do you wish to overwrite it?"
+msgstr ""
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Can not get message: %s\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Can not get message: %s\n"
+" %s"
+
#: widgets/misc/e-task-widget.c:211
#, c-format
msgid "%s (...)"
@@ -18237,9 +18919,60 @@ msgid "%s (%d%% complete)"
msgstr ""
#, fuzzy
-#~ msgid "New Address Book"
+#~ msgid "Address 2:"
+#~ msgstr "Chile"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
#~ msgstr "Cannot initialise Evolution's mail component."
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Could not initialise gnome-vfs"
+
+#, fuzzy
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Can not initialise the Ximian Evolution shell."
+
#, fuzzy
#~ msgid "Address Book Creation Assistant"
#~ msgstr "Organisation"
@@ -18264,14 +18997,6 @@ msgstr ""
#~ msgstr "Organisation"
#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "_Other Organiser"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Other Organiser"
-
-#, fuzzy
#~ msgid "Cannot move folder `%s': illegal operation"
#~ msgstr "Can not rename folder: %s: Invalid operation"
@@ -18292,10 +19017,6 @@ msgstr ""
#~ msgstr "_Other Organiser"
#, fuzzy
-#~ msgid "_Task List"
-#~ msgstr "_Other Organiser"
-
-#, fuzzy
#~ msgid "Offline Folders"
#~ msgstr "Synchronising folders"
@@ -18376,10 +19097,6 @@ msgstr ""
#~ msgstr "Could not close temporary folder: %s"
#, fuzzy
-#~ msgid "Failed to migrate `%s': %s"
-#~ msgstr "Could not close temporary folder: %s"
-
-#, fuzzy
#~ msgid "Could not create cache for new calendar"
#~ msgstr "Could not close temporary folder: %s"