aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_AU.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@src.gnome.org>2004-06-04 02:02:56 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-06-04 02:02:56 +0800
commit3048b4c9decd91d7c5baa0a9ec29f98a91976f1a (patch)
treeba6f25a662319846fd160fdb8d2211cc058f11af /po/en_AU.po
parentdae1aa0ac0d5aa9e220f9de63b30f65ee0961665 (diff)
downloadgsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.gz
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.bz2
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.lz
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.xz
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.zst
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.zip
Merge from release branch.
svn path=/trunk/; revision=26178
Diffstat (limited to 'po/en_AU.po')
-rw-r--r--po/en_AU.po3234
1 files changed, 1393 insertions, 1841 deletions
diff --git a/po/en_AU.po b/po/en_AU.po
index 26d997774f..8cf16827e5 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-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
"Language-Team: \n"
@@ -54,14 +54,14 @@ msgstr ""
msgid "Default Sync Address:"
msgstr ""
-#: addressbook/conduit/address-conduit.c:1150
#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
#, fuzzy
msgid "Could not load addressbook"
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
msgid "Could not read pilot's Address application block"
msgstr ""
@@ -69,14 +69,14 @@ msgstr ""
msgid "Accessing LDAP Server anonymously"
msgstr ""
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
#, fuzzy
msgid "Failed to authenticate.\n"
msgstr "Could not close temporary folder: %s"
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr ""
@@ -126,51 +126,23 @@ msgstr "_Other Organiser"
msgid "Create a new contacts group"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
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:507
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: 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:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
msgid "Migrating..."
msgstr ""
#: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
#, c-format
msgid "Migrating `%s':"
msgstr ""
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
#: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -178,28 +150,28 @@ msgid "On This Computer"
msgstr ""
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
msgid "Personal"
msgstr ""
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
msgid "On LDAP Servers"
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
msgid "LDAP Servers"
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
msgid "Autocompletion Settings"
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -207,60 +179,55 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
"Please be patient while Evolution migrates your Pilot Sync data..."
msgstr ""
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
#, fuzzy
msgid "New Address Book"
msgstr "Cannot initialise Evolution's mail component."
-#: 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
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
#: 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
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
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
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
#: 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 ""
@@ -340,10 +307,6 @@ msgid "Manage your S/MIME certificates here"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:1
-msgid " S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
#: addressbook/gui/component/select-names/select-names.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:1
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -358,382 +321,310 @@ msgstr ""
#: calendar/gui/dialogs/new-task-list.glade.h:1
#: calendar/gui/dialogs/task-page.glade.h:1
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
msgid "1"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
msgid "3268"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "389"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "5"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "636"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
#, fuzzy
msgid "<b>Authentication</b>"
msgstr "Organisation"
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Display</b>"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
#, fuzzy
msgid "<b>Downloading</b>"
msgstr "Organisation"
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
#, fuzzy
msgid "<b>Searching</b>"
msgstr "Organisation"
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "<b>Server Information</b>"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
#, fuzzy
msgid "<b>Type:</b>"
msgstr "Organisation"
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
#, fuzzy
msgid "Add Contacts Group"
msgstr "_Other Organiser"
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
#, fuzzy
msgid "Address Book Properties"
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
msgid "Always"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Anonymously"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
#: calendar/gui/dialogs/task-editor.c:193
msgid "Basic"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
#: 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:23
-msgid "Distinguished _name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Distinguished name"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
msgid "Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
#, fuzzy
msgid "Email address"
msgstr "Chile"
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "Email address:"
-msgstr "Chile"
-
-#: 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:29
+#: addressbook/gui/component/ldap-config.glade.h:22
msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
msgid "Find Possible Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
msgid "Never"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
msgid "Only locations within starting point"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Other Organiser"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
msgid "Search base only"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
#, fuzzy
msgid "Search base:"
msgstr "_Other Organiser"
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
#, fuzzy
msgid "Search scope:"
msgstr "_Other Organiser"
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
msgid ""
"Selecting this option means that your server does not support either SSL or "
-"TLS. This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid "Starting point and locations within it"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
msgid "Supported Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
msgid ""
"The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
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:62
+#: addressbook/gui/component/ldap-config.glade.h:41
msgid ""
"This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
msgid "Timeout:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
msgid "Using distinguished name (DN)"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
msgid "Using email address"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
#, fuzzy
msgid "_Add Contacts Group"
msgstr "_Other Organiser"
-#: 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:75
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "_Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
#, fuzzy
msgid "_Email address:"
msgstr "Chile"
-#: addressbook/gui/component/ldap-config.glade.h:77
-msgid "_Log in method:"
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Find Possible Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
-msgid "_Name:"
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "_Log in method:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Organisation"
-#: addressbook/gui/component/ldap-config.glade.h:80
-msgid "_Port:"
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+msgid "_Name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
+#: addressbook/gui/component/ldap-config.glade.h:54
+msgid "_Port:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Other Organiser"
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
msgid "_Server:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+msgid "_Timeout:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
msgid "_Use secure connection:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
msgid "cards"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
#: 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
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
#: 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.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
#: addressbook/gui/component/select-names/e-select-names-popup.c:215
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
@@ -774,7 +665,7 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:224
msgid "Source"
msgstr ""
@@ -848,9 +739,9 @@ msgid "<b>Work</b>"
msgstr "Organisation"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
msgid "AIM"
msgstr ""
@@ -887,8 +778,8 @@ msgid "Company:"
msgstr ""
#: 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-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
#, fuzzy
@@ -896,7 +787,7 @@ msgid "Contact"
msgstr "_Other Organiser"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
msgid "Contact Editor"
msgstr ""
@@ -917,90 +808,84 @@ msgid "Full _Name..."
msgstr ""
#: 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
-msgid "Home"
-msgstr ""
-
-#: 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:28
-#: calendar/gui/e-itip-control.c:936
-#, fuzzy
-msgid "Location:"
-msgstr "Organisation"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
#, fuzzy
msgid "Mailing Address"
msgstr "Chile"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "Manager:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "Ni_ckname:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "Notes:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
msgid "Novell Groupwise"
msgstr ""
-#: 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
-msgid "Other"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "Office:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "PO Box:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "Personal Information"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
#, fuzzy
msgid "Profession:"
msgstr "Organisation"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "Spouse:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "State/Province:"
msgstr ""
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+msgid "Title:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:41
msgid "Wants to receive HTML mail"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
+msgid "Web Log:"
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.c:195
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
msgid "Work"
msgstr ""
@@ -1019,41 +904,34 @@ msgid "_File under:"
msgstr "Synchronising folder"
#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "_Where:"
msgstr ""
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
msgstr ""
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
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:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
#, 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.c:287
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard.c:174
@@ -2032,84 +1910,107 @@ msgstr ""
msgid "Zimbabwe"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
msgid "Jabber"
msgstr ""
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
msgid "Yahoo"
msgstr ""
-#: 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
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
msgid "MSN"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
msgid "ICQ"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
msgid "GroupWise"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
msgid "Source Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Target Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
#, fuzzy
msgid "Is New Contact"
msgstr "_Other Organiser"
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Writable Fields"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
#, fuzzy
msgid "Changed"
msgstr "Chile"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
msgid "This contact belongs to these categories:"
msgstr ""
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
msgid "Please select an image for this contact"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
msgid "No image"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
"\n"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "_Other Organiser"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2144,7 +2045,7 @@ msgid "_Edit Full"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
msgid "_Full Name:"
msgstr ""
@@ -2291,30 +2192,30 @@ msgstr ""
msgid "_Type an email address or drag a contact into the list below:"
msgstr ""
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
msgid "contact-list-editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
#: 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-addressbook-view.c:217
#: addressbook/gui/widgets/e-minicard-view.c:460
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
msgid "Book"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
msgid "Is New List"
msgstr ""
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
msgid "Contact List Editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
msgid "Save List as VCard"
msgstr ""
@@ -2357,120 +2258,120 @@ msgstr ""
msgid "Advanced Search"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
msgid "(map)"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
msgid "map"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
msgid "List Members"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
#, fuzzy
msgid "E-mail"
msgstr "Chile"
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
msgid "Organization"
msgstr "Organisation"
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
#, fuzzy
msgid "Position"
msgstr "Organisation"
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
msgid "Groupwise"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
msgid "Video Conferencing"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
msgid "Phone"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
msgid "Fax"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
msgid "work"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
msgid "WWW"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
msgid "Blog"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
msgid "Mobile Phone"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
msgid "personal"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
msgid "Note"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
msgid "Job Title"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
msgid "Email"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
msgid "Home page"
msgstr ""
#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
msgid "Success"
msgstr ""
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
msgid "Backend busy"
msgstr ""
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
msgid "Repository offline"
msgstr ""
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
#, 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
+#: addressbook/gui/widgets/eab-gui-util.c:53
#, fuzzy
msgid "No Self Contact defined"
msgstr "_Other Organiser"
@@ -2478,27 +2379,27 @@ 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
+#: addressbook/gui/widgets/eab-gui-util.c:56
msgid "Permission denied"
msgstr ""
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
msgid "Contact not found"
msgstr ""
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
msgid "Contact ID already exists"
msgstr ""
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
msgid "Protocol not supported"
msgstr ""
#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
#: 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
@@ -2511,68 +2412,64 @@ msgid "Cancelled"
msgstr ""
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
#, 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
+#: addressbook/gui/widgets/eab-gui-util.c:62
msgid "Authentication Failed"
msgstr ""
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
msgid "Authentication Required"
msgstr ""
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
msgid "TLS not Available"
msgstr ""
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
#, fuzzy
msgid "No such source"
msgstr "Synchronising folder failed: %s: %s"
#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
msgid "Other error"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
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
+#: addressbook/gui/widgets/eab-gui-util.c:97
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
+#: addressbook/gui/widgets/eab-gui-util.c:102
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."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: 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 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
+#: addressbook/gui/widgets/eab-gui-util.c:129
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -2580,7 +2477,7 @@ msgid ""
"the directory server preferences for this addressbook."
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
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"
@@ -2588,114 +2485,101 @@ msgid ""
"preferences for this addressbook."
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
msgid "The backend for this addressbook was unable to parse this query."
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
msgid "The backend for this addressbook refused to perform this query."
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
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
+#: addressbook/gui/widgets/eab-gui-util.c:169
msgid "Error adding list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
msgid "Error adding contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
msgid "Error removing list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
msgid "Error removing contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
#, 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
+#: addressbook/gui/widgets/eab-gui-util.c:300
#, c-format
msgid ""
"%s already exists\n"
"Do you want to overwrite it?"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
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
+#: addressbook/gui/widgets/eab-gui-util.c:365
msgid "card.vcf"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
msgid "list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
#, fuzzy
msgid "Move contact to"
msgstr "_Other Organiser"
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
#, fuzzy
msgid "Copy contact to"
msgstr "_Other Organiser"
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
#, fuzzy
msgid "Move contacts to"
msgstr "_Other Organiser"
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
#, fuzzy
msgid "Copy contacts to"
msgstr "_Other Organiser"
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
#, fuzzy
msgid "Select target addressbook."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
msgid "Multiple VCards"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
#, c-format
msgid "VCard for %s"
msgstr ""
@@ -2784,7 +2668,7 @@ 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-addressbook-view.c:231
#: addressbook/gui/widgets/e-minicard-view.c:467
#: addressbook/gui/widgets/e-minicard-view-widget.c:112
msgid "Query"
@@ -2802,142 +2686,134 @@ msgstr ""
msgid "Error modifying card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
msgid "Name begins with"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
msgid "Email begins with"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
msgid "Advanced..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
#, fuzzy
msgid "Address Book"
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:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
msgid "New Contact..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
msgid "New Contact List..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
msgid "Go to Folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
msgid "Import..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
msgid "Search for Contacts..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
#, fuzzy
msgid "Address Book Sources..."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
msgid "Pilot Settings..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
msgid "Send Message to Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
msgid "Print Envelope"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
#, fuzzy
msgid "Copy to Address Book..."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
#, fuzzy
msgid "Move to Address Book..."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
msgid "Current View"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr ""
@@ -3045,7 +2921,7 @@ msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
#: calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr ""
@@ -3182,13 +3058,13 @@ msgstr "Cannot initialise Evolution's mail component."
msgid "VCard (.vcf, .gcrd)"
msgstr ""
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
#, fuzzy
msgid "Print contacts"
msgstr "_Other Organiser"
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
#, fuzzy
msgid "Print contact"
msgstr "_Other Organiser"
@@ -3437,16 +3313,22 @@ 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
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
#, 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-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Could not close temporary folder: %s"
#: addressbook/tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
@@ -3464,7 +3346,7 @@ msgstr ""
msgid "Unnamed List"
msgstr ""
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
msgstr ""
@@ -3728,10 +3610,10 @@ msgid "Whether to show week numbers in date navigator"
msgstr ""
#: 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
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
msgid "Calendar"
msgstr ""
@@ -3748,7 +3630,7 @@ msgstr ""
#: 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
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
msgid "days"
msgstr ""
@@ -3896,24 +3778,24 @@ msgstr ""
msgid "Month View"
msgstr ""
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
msgid "Summary contains"
msgstr ""
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
msgid "Description contains"
msgstr ""
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
msgid "Comment contains"
msgstr ""
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
#, fuzzy
msgid "Location contains"
msgstr "Organisation"
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
msgid "Unmatched"
msgstr ""
@@ -3934,23 +3816,23 @@ msgstr ""
msgid "open_client(): %s"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
msgid "Audio Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
msgid "Message Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
msgid "Email Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
msgid "Program Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
msgid "Unknown Alarm Options"
msgstr ""
@@ -3986,7 +3868,7 @@ msgstr ""
msgid "With these arguments:"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
msgid "dialog1"
msgstr ""
@@ -3995,7 +3877,7 @@ msgid "extra times every"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
msgid "hours"
msgstr ""
@@ -4041,7 +3923,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
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr ""
@@ -4071,7 +3953,6 @@ msgid "hour(s)"
msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
msgid "minute(s)"
msgstr ""
@@ -4079,26 +3960,26 @@ msgstr ""
msgid "start of appointment"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
msgid "You must specify a location to get the calendar from."
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
#, c-format
msgid "The source location '%s' is not well-formed."
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
#, c-format
msgid "The source location '%s' is not a webcal source."
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
#, c-format
msgid "Source with name '%s' already exists in the selected group"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
#, c-format
msgid ""
"The group '%s' is remote. You must specify a location to get the calendar "
@@ -4120,55 +4001,32 @@ msgstr "_Other Organiser"
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
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
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
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
#, fuzzy
msgid "_Add Calendar"
msgstr "Organisation"
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
msgid "_Add Group"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Refresh:"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
msgid "_Type:"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
msgid "_URL:"
msgstr ""
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
msgid "weeks"
msgstr ""
@@ -4276,7 +4134,7 @@ msgid "Display"
msgstr "Chile"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
msgid "E_nable"
msgstr ""
@@ -4286,7 +4144,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
msgid "Friday"
msgstr ""
@@ -4300,7 +4158,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
msgid "Monday"
msgstr ""
@@ -4310,7 +4168,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr ""
@@ -4324,7 +4182,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr ""
@@ -4339,7 +4197,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr ""
@@ -4353,7 +4211,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
msgid "Tuesday"
msgstr ""
@@ -4363,7 +4221,7 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr ""
@@ -4396,7 +4254,7 @@ msgid "_Day begins:"
msgstr ""
#: 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
+#: mail/mail-config.glade.h:162 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
#: ui/evolution-message-composer.xml.h:43
@@ -4445,76 +4303,46 @@ msgstr ""
msgid "before every appointment"
msgstr ""
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
msgid "This task has been deleted."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
msgid "This journal entry has been deleted."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
msgid "This event has been changed."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
msgid "This task has been changed."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
msgid "This journal entry has been changed."
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr ""
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr ""
@@ -4553,7 +4381,7 @@ msgid "No summary"
msgstr ""
#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
#: composer/e-msg-composer.c:1193
msgid "Save as..."
msgstr ""
@@ -4607,99 +4435,51 @@ msgstr "Could not initialise Bonobo"
msgid "Destination is read only"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
msgid "The event could not be deleted due to a corba error"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
msgid "The task could not be deleted due to a corba error"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
msgid "The journal entry could not be deleted due to a corba error"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
msgid "The item could not be deleted due to a corba error"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
msgid "The event could not be deleted because permission was denied"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
msgid "The task could not be deleted because permission was denied"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
msgid "The journal entry could not be deleted because permission was denied"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
msgid "The item could not be deleted because permission was denied"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
msgid "The event could not be deleted due to an error"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
msgid "The task could not be deleted due to an error"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
msgid "The journal entry could not be deleted due to an error"
msgstr ""
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
msgid "The item could not be deleted due to an error"
msgstr ""
@@ -4833,11 +4613,11 @@ 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/dialogs/meeting-page.glade.h:4
#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4863,8 +4643,8 @@ msgstr ""
#. FIXME: need to disable for undeletable folders
#: calendar/gui/dialogs/meeting-page.c:655
#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
#: 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
@@ -4872,7 +4652,7 @@ msgid "_Delete"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr ""
@@ -4908,16 +4688,15 @@ msgid "Member"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
msgid "Status"
msgstr ""
@@ -4925,20 +4704,20 @@ msgstr ""
msgid "Add A_ttendee"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
#: calendar/gui/e-itip-control.glade.h:9
msgid "Organizer:"
msgstr "Organiser:"
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
msgid "_Change Organizer"
msgstr "_Change Organiser"
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr ""
-
#: calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
msgstr ""
@@ -5088,7 +4867,7 @@ msgid "_No recurrence"
msgstr ""
#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
msgid "_Remove"
msgstr ""
@@ -5120,52 +4899,21 @@ msgstr ""
msgid "year(s)"
msgstr ""
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr ""
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
#, fuzzy
msgid "Select destination"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
#, fuzzy
msgid "_Destination"
msgstr "Synchronising folder"
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
#, fuzzy
msgid "Task List"
msgstr "_Other Organiser"
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-
#: calendar/gui/dialogs/task-details-page.c:406
msgid "Completed date is wrong"
msgstr ""
@@ -5185,7 +4933,7 @@ msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:5
#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
msgid "High"
msgstr ""
@@ -5199,14 +4947,14 @@ msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
msgid "Low"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:8
#: 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
+#: mail/message-list.c:959
msgid "Normal"
msgstr ""
@@ -5264,8 +5012,8 @@ msgstr ""
#: 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
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr ""
@@ -5434,7 +5182,7 @@ msgstr "_Other Organiser"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
msgid "Status:"
msgstr ""
@@ -5518,12 +5266,12 @@ msgstr ""
msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
msgid "Updating objects"
msgstr ""
#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr ""
@@ -5533,15 +5281,15 @@ 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:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr ""
#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: 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
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
#: ui/evolution-tasks.xml.h:25
@@ -5549,24 +5297,24 @@ msgid "_Print..."
msgstr ""
#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
#: 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: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
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
msgid "_Copy"
msgstr ""
#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: 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
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
msgid "_Paste"
@@ -5634,70 +5382,70 @@ msgstr ""
msgid "Task sort"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
msgid "New Task"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
#, fuzzy
msgid "_Select Date..."
msgstr "Organisation"
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
#, fuzzy
msgid "Cop_y to Calendar..."
msgstr "Organisation"
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
#, fuzzy
msgid "Mo_ve to Calendar..."
msgstr "Cannot initialise Evolution's mail component."
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
msgid "Delete _All Occurrences"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr ""
@@ -5711,9 +5459,9 @@ 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-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
#: camel/camel-tcp-stream-openssl.c:631
@@ -5739,13 +5487,13 @@ 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-list-view.c:146 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
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr ""
@@ -5757,7 +5505,7 @@ msgstr ""
msgid "S"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
msgid "E"
msgstr ""
@@ -5823,403 +5571,408 @@ msgstr ""
msgid "%02i minute divisions"
msgstr ""
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
msgid "Yes. (Complex Recurrence)"
msgstr ""
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] ""
msgstr[1] ""
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] ""
msgstr[1] ""
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] ""
msgstr[1] ""
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
msgid " and "
msgstr ""
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
#, c-format
msgid "The %s day of "
msgstr ""
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
#, c-format
msgid "The %s %s of "
msgstr ""
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] ""
msgstr[1] ""
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] ""
msgstr[1] ""
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] ""
msgstr[1] ""
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
msgid ", ending on "
msgstr ""
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
msgid "<b>Starts:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
msgid "<b>Ends:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
msgid "<b>Completed:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
msgid "<b>Due:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
msgid "iCalendar Information"
msgstr ""
#. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
msgid "iCalendar Error"
msgstr ""
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
msgid "An unknown person"
msgstr ""
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
msgid "<i>None</i>"
msgstr ""
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+#, fuzzy
+msgid "Location:"
+msgstr "Organisation"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr ""
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
msgid "Choose an action:"
msgstr ""
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
msgid "Update"
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:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr ""
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
msgid "Accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
msgid "Tentatively accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
msgid "Decline"
msgstr ""
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
msgid "Send Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
msgid "Update respondent status"
msgstr ""
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
msgid "Send Latest Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr ""
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
msgid "Meeting Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
msgid "Meeting Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
msgid "Meeting Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
msgid "Meeting Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
msgid "Meeting Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
msgid "Meeting Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
msgid "Bad Meeting Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
msgid "Task Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
msgid "Task Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
msgid "Task Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
msgid "Task Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr ""
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
msgid "Task Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
msgid "Task Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
msgid "Bad Task Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
msgid "Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
msgid "Free/Busy Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
msgid "Free/Busy Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
msgid "Bad Free/Busy Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
msgid "The message does not appear to be properly formed"
msgstr ""
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
msgid "The message contains only unsupported requests."
msgstr ""
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
msgid "The attachment has no viewable calendar items"
msgstr ""
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
msgid "There was an error on the CORBA system\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
msgid "Object could not be found\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
#, 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:1865
+#: calendar/gui/e-itip-control.c:1858
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
msgid "Attendee status could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
msgid "The item could not be sent!\n"
msgstr ""
@@ -6260,74 +6013,74 @@ msgstr ""
msgid "date-start"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
msgid "Chair Persons"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
msgid "Required Participants"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
msgid "Optional Participants"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
msgid "Resources"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
msgid "Individual"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
#: calendar/gui/e-meeting-store.c:109
msgid "Group"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
#: calendar/gui/e-meeting-store.c:111
msgid "Resource"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
#: calendar/gui/e-meeting-store.c:113
msgid "Room"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
#: calendar/gui/e-meeting-store.c:142
msgid "Chair"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
msgid "Required Participant"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
#: calendar/gui/e-meeting-store.c:146
msgid "Optional Participant"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
#: calendar/gui/e-meeting-store.c:148
msgid "Non-Participant"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
msgid "Needs Action"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr ""
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
#: calendar/gui/e-meeting-store.c:208
msgid "Delegated"
msgstr ""
@@ -6344,20 +6097,25 @@ msgstr ""
msgid "No Information"
msgstr ""
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
#: calendar/gui/e-meeting-time-sel.c:440
msgid "_Options"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+msgid "Show _only working hours"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+msgid "Show _zoomed out"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+msgid "_Update free/busy"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:497
@@ -6373,19 +6131,19 @@ msgid ">_>"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+msgid "_All people and resources"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+msgid "All _people and one resource"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+msgid "_Required people"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+msgid "Required people and _one resource"
msgstr ""
#: calendar/gui/e-meeting-time-sel.c:593
@@ -6423,78 +6181,68 @@ msgstr "%d/%m/%Y"
msgid "Enter the password for %s"
msgstr ""
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
#, c-format
msgid ""
"Error on %s:\n"
" %s"
msgstr ""
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
#. FIXME Loading should be async
#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
#, c-format
msgid "Opening tasks at %s"
msgstr ""
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
#, c-format
msgid ""
"Error opening %s:\n"
"%s"
msgstr ""
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
msgid "Loading tasks"
msgstr ""
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
msgid "Expunging"
msgstr ""
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
#: 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/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 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
+#: calendar/gui/gnome-cal.c:1878
#, c-format
msgid "Loading appointments at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
#, c-format
msgid "Loading tasks at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
#, fuzzy, c-format
msgid "Opening %s"
msgstr "Synchronising folders"
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
msgid "Purging"
msgstr ""
@@ -6690,7 +6438,7 @@ msgid "On The Web"
msgstr ""
#. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr ""
@@ -6701,7 +6449,7 @@ msgid "Unable to migrate calendar `%s'"
msgstr "Could not close temporary folder: %s"
#. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
#, fuzzy, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Could not close temporary folder: %s"
@@ -6937,71 +6685,71 @@ msgstr ""
msgid "Print Setup"
msgstr ""
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
#, fuzzy
msgid "New Task List"
msgstr "_Other Organiser"
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
#, 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
+#: calendar/gui/tasks-component.c:410 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
+#: calendar/gui/tasks-component.c:457
msgid "Failed upgrading tasks."
msgstr ""
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
msgid "There is no calendar available for creating tasks"
msgstr ""
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
msgid ""
"Selected task list is read-only, events cannot be created. Please select a "
"read-write calendar."
msgstr ""
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
msgid "New task"
msgstr ""
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
msgid "_Task"
msgstr ""
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
msgid "Create a new task"
msgstr ""
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
#, fuzzy
msgid "New tasks group"
msgstr "_Other Organiser"
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
msgid "_Tasks Group"
msgstr ""
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
#, fuzzy
msgid "Create a new tasks group"
msgstr "_Other Organiser"
@@ -8759,12 +8507,12 @@ msgstr ""
msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr ""
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr ""
@@ -8778,11 +8526,15 @@ msgstr ""
msgid "Copying messages"
msgstr "Can not open message"
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
msgstr ""
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
#, fuzzy
msgid "Filtering new message(s)"
msgstr "Can not open message"
@@ -8815,15 +8567,15 @@ msgstr ""
msgid "(match-threads) requires a match type string"
msgstr ""
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
msgid "(match-threads) expects an array result"
msgstr ""
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
msgid "(match-threads) requires the folder set"
msgstr ""
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
#, c-format
msgid "Performing query on unknown header: %s"
msgstr ""
@@ -8853,7 +8605,8 @@ msgstr ""
#: 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
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr ""
@@ -9211,7 +8964,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:1212
+#: camel/providers/imap/camel-imap-store.c:1240
msgid "Bad authentication response from server."
msgstr ""
@@ -9577,40 +9330,40 @@ msgstr ""
msgid "export keys: unimplemented"
msgstr ""
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Can not get folder: Invalid operation on this store"
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
#, fuzzy, c-format
msgid "Cannot create folder `%s': folder exists"
msgstr "Can not get folder: %s: %s"
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Can not create folder: Invalid operation on this store"
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
#, 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
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Can not delete folder: %s: Invalid operation"
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Can not rename folder: %s: Invalid operation"
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
msgid "Trash"
msgstr ""
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr ""
@@ -9819,12 +9572,12 @@ msgstr ""
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "You can not copy messages from this rubbish bin."
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Can not delete folder: %s: No such folder"
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Can not rename folder: %s: No such folder"
@@ -9868,31 +9621,31 @@ msgstr "Cannot initialise Evolution's mail component."
msgid "Post Office Agent SOAP Port:"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
msgid "Novell GroupWise"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
msgid "For accessing Novell Groupwise servers"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
#: 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
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
msgid "Password"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
#: camel/providers/imap/camel-imap-provider.c:95
#: camel/providers/imapp/camel-imapp-provider.c:67
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
msgid "Checklist"
msgstr ""
@@ -10031,13 +9784,13 @@ msgid ""
msgstr ""
#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
#, c-format
msgid "IMAP server %s"
msgstr ""
#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
#, c-format
msgid "IMAP service for %s on %s"
msgstr ""
@@ -10047,7 +9800,7 @@ msgstr ""
#: 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/nntp/camel-nntp-store.c:209
#: camel/providers/pop3/camel-pop3-store.c:175
#: camel/providers/smtp/camel-smtp-transport.c:269
#: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10064,10 +9817,10 @@ 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/imap/camel-imap-store.c:845
#: 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/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
#: camel/providers/pop3/camel-pop3-store.c:192
msgid "Connection cancelled"
msgstr ""
@@ -10080,8 +9833,8 @@ msgid ""
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
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
#, fuzzy, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Could not close temporary folder: %s"
@@ -10090,7 +9843,7 @@ msgstr "Could not close temporary folder: %s"
#: 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:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
msgid "Unknown error"
msgstr ""
@@ -10116,8 +9869,8 @@ 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
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10195,12 +9948,12 @@ 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
+#: camel/providers/imap/camel-imap-store.c:3194
msgid "Operation cancelled"
msgstr ""
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr ""
@@ -10264,13 +10017,6 @@ msgstr ""
" %s"
#: 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
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -10280,15 +10026,15 @@ msgstr ""
" %s"
#: 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
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
msgid "No such message"
msgstr ""
#: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
msgid "This message is not currently available"
msgstr ""
@@ -10297,7 +10043,23 @@ msgstr ""
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -10356,43 +10118,43 @@ msgstr ""
msgid "For reading and storing mail on IMAP servers."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
#, 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:1242
+#: camel/providers/imap/camel-imap-store.c:1272
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
#: 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:1275
+#: camel/providers/imap/camel-imap-store.c:1305
#: 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:1289
+#: camel/providers/imap/camel-imap-store.c:1319
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10400,18 +10162,18 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
@@ -10419,7 +10181,7 @@ msgstr ""
msgid "Cannot create folder `%s': folder exists."
msgstr "Can not get folder: %s: %s"
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "Can not get folder: %s: %s"
@@ -10451,20 +10213,20 @@ msgid "Index message body data"
msgstr ""
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
#, c-format
msgid "~%s (%s)"
msgstr ""
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
#, fuzzy, c-format
msgid "mailbox:%s (%s)"
msgstr "Can not open mailbox: %s: %s\n"
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
#, c-format
msgid "%s (%s)"
msgstr ""
@@ -10520,7 +10282,7 @@ msgstr ""
#: 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-mbox-store.c:355
#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
@@ -10593,8 +10355,25 @@ msgstr ""
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Can not append message to maildir folder: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+" %s"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+" %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
msgid "Invalid message contents"
msgstr ""
@@ -10635,9 +10414,9 @@ msgstr ""
msgid "not a maildir directory"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr ""
@@ -10684,27 +10463,17 @@ msgstr ""
msgid "Cannot append message to mbox file: %s: %s"
msgstr "Can not append message to mbox file: %s: %s"
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-msgstr ""
-"Can not get message: %s from folder %s\n"
-" %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
msgid "The folder appears to be irrecoverably corrupted."
msgstr ""
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
msgstr ""
#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
#, fuzzy
msgid "Cannot create a folder by this name."
msgstr "Can not create folder lock on %s: %s"
@@ -10733,30 +10502,30 @@ msgstr ""
msgid "Folder `%s' is not empty. Not deleted."
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
#, fuzzy, c-format
msgid "Cannot create directory `%s': %s."
msgstr "Can not create folder lock on %s: %s"
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
#, fuzzy, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Can not get folder: %s: %s"
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
msgid "Folder already exists"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
msgid "The new folder name is illegal."
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
#, fuzzy, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
#, fuzzy, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Could not close temporary folder: %s"
@@ -10941,7 +10710,7 @@ msgid ""
msgstr ""
#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr ""
@@ -10959,18 +10728,10 @@ msgstr "Could not close temporary folder: %s"
msgid "Server rejected username/password"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: 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
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
#: camel/providers/pop3/camel-pop3-folder.c:433
#: camel/providers/pop3/camel-pop3-folder.c:494
#: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10981,62 +10742,51 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: 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: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:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
+msgid "Internal error: uid in invalid format: %s"
msgstr ""
-#: 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:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Synchronising \"%s\""
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
msgid "You cannot post NNTP messages while working offline!"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
#, fuzzy
msgid "You cannot copy messages from a NNTP folder!"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
#, fuzzy
msgid "Could not get group list from server."
msgstr "Could not close temporary folder: %s"
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
#, c-format
msgid "Unable to load grouplist file for %s: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
#, fuzzy, c-format
msgid "Unable to save grouplist file for %s: %s"
msgstr "Could not close temporary folder: %s"
@@ -11064,26 +10814,29 @@ msgid ""
"password."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:227
#, fuzzy, c-format
msgid "Could not read greeting from %s: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
#, c-format
msgid "USENET News via %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -11091,76 +10844,73 @@ msgid ""
"%s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
"newsgroup does not exist!"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
#, fuzzy
msgid "You cannot rename a folder in a News store."
msgstr "Can not create folder lock on %s: %s"
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, fuzzy, c-format
-msgid "No such folder: %s"
-msgstr "Synchronising folder failed: %s: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:268
+#: camel/providers/nntp/camel-nntp-store.c:1146
#, fuzzy, c-format
-msgid "Could not get group: %s"
+msgid "Cannot authenticate to server: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
#, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr ""
-"Can not get message: %s\n"
-" %s"
+msgid "Not connected."
+msgstr "_Other Organiser"
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Synchronising folder failed: %s: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
#, c-format
-msgid "NNTP Command failed: %s"
+msgid "%s: Scanning new messages"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:225
#, c-format
-msgid "%s: Scanning new messages"
+msgid "Unexpected server response from xover: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:328
#, c-format
-msgid "Unknown server response: %s"
+msgid "Unexpected server response from head: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
msgid "Use cancel"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
#, c-format
msgid "Operation failed: %s"
msgstr ""
@@ -11208,7 +10958,7 @@ msgstr ""
msgid "Disable support for all POP3 extensions"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
msgid "POP"
msgstr ""
@@ -11288,7 +11038,7 @@ msgid "No such folder `%s'."
msgstr ""
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
msgid "Sendmail"
msgstr ""
@@ -11340,7 +11090,7 @@ msgstr ""
msgid "Mail delivery via the sendmail program"
msgstr ""
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
msgid "SMTP"
msgstr ""
@@ -11623,19 +11373,19 @@ msgstr ""
msgid "%.0fG"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
msgid "attachment"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
msgid "Remove selected items from the attachment list"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
msgid "Add attachment..."
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
msgid "Attach a file to the message"
msgstr ""
@@ -11698,7 +11448,7 @@ msgstr "Can not open message"
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
msgid "Autogenerated"
msgstr ""
@@ -11832,17 +11582,17 @@ msgstr ""
#. mail-composer:no-attach primary
#: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
msgstr ""
#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
msgstr ""
#. 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."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
msgstr ""
#. mail-composer:attach-directory primary
@@ -11932,7 +11682,7 @@ msgstr "Could not close temporary folder: %s"
#. mail-composer:no-build-message secondary
#: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
msgstr ""
#. mail-composer:no-sig-file primary
@@ -11942,8 +11692,10 @@ msgid "Could not read signature file \"{0}\"."
msgstr "Could not close temporary folder: %s"
#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 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-composer:all-accounts-deleted primary
@@ -12346,11 +12098,11 @@ msgid "<b>Then</b>"
msgstr "Organisation"
#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
msgid "Select Folder"
msgstr ""
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
msgid " "
msgstr ""
@@ -12400,7 +12152,7 @@ msgstr ""
msgid "months"
msgstr ""
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
msgid "seconds"
msgstr ""
@@ -12432,20 +12184,20 @@ 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
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
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
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
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
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
msgid "Later"
msgstr ""
@@ -12498,253 +12250,6 @@ msgstr ""
msgid "outgoing"
msgstr ""
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr ""
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr ""
-
-#: 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 ""
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr ""
-
#: filter/rule-editor.c:285
msgid "Add Rule"
msgstr ""
@@ -12761,6 +12266,11 @@ msgstr ""
msgid "_Score Rules"
msgstr ""
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
#: filter/searchtypes.xml.h:1
msgid "Body contains"
msgstr ""
@@ -12840,13 +12350,13 @@ msgstr ""
msgid "-------- Forwarded Message --------"
msgstr ""
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
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
+#: mail/em-composer-utils.c:1505
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr ""
@@ -12886,8 +12396,8 @@ msgstr ""
msgid "Create New Folder"
msgstr ""
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr ""
@@ -12902,105 +12412,106 @@ msgstr "Synchronising folder"
msgid "Folder _name:"
msgstr ""
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
#, fuzzy, c-format
msgid "Moving folder %s"
msgstr "Synchronising \"%s\""
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
#, fuzzy, c-format
msgid "Copying folder %s"
msgstr "Synchronising \"%s\""
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
#, fuzzy, c-format
msgid "Moving messages into folder %s"
msgstr "Can not append message to mh folder: %s: %s"
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
#, fuzzy, c-format
msgid "Copying messages into folder %s"
msgstr "Can not append message to mh folder: %s: %s"
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
#, fuzzy
msgid "Cannot drop message(s) into toplevel store"
msgstr "You can not copy messages from this rubbish bin."
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 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
+#: mail/em-folder-tree.c:951 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
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
msgid "_Move"
msgstr ""
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
msgid "Cancel _Drag"
msgstr ""
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder"
msgstr ""
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
msgid "C_opy"
msgstr ""
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
#, fuzzy, c-format
msgid "Creating folder `%s'"
msgstr "Synchronising \"%s\""
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
#, fuzzy
msgid "Create folder"
msgstr "Synchronising folder"
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
#, fuzzy
msgid "Rename Folder"
msgstr "Synchronising folder"
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 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
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
msgid "_View"
msgstr ""
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
msgid "Open in _New Window"
msgstr ""
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
#, fuzzy
msgid "_New Folder..."
msgstr "Synchronising folders"
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
msgid "_Rename"
msgstr ""
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 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
+#: mail/mail-vfolder.c:888
msgid "VFolders"
msgstr ""
@@ -13014,19 +12525,19 @@ msgstr ""
msgid "Inbox"
msgstr ""
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
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
+#: mail/mail-component.c:554
msgid "Mail"
msgstr ""
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
#: ui/evolution-mail-message.xml.h:113
msgid "_Edit as New Message..."
msgstr ""
@@ -13039,17 +12550,17 @@ msgstr ""
msgid "_Reply to Sender"
msgstr ""
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr ""
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr ""
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
#: ui/evolution-mail-message.xml.h:114
msgid "_Forward"
msgstr ""
@@ -13102,6 +12613,10 @@ msgstr ""
msgid "_Copy to Folder..."
msgstr ""
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
#: mail/em-folder-view.c:932
msgid "Add Sender to Address_book"
msgstr ""
@@ -13151,12 +12666,12 @@ msgid "Filter on _Mailing List"
msgstr ""
#. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
msgid "Default"
msgstr ""
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
msgid "Print Message"
msgstr ""
@@ -13196,12 +12711,18 @@ msgstr ""
msgid "Bcc"
msgstr ""
+#: 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:1131
+msgid "Subject"
+msgstr ""
+
#: 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.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
msgid "Newsgroups"
msgstr ""
@@ -13381,7 +12902,7 @@ msgid ""
"practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
#, fuzzy
msgid "_View Certificate"
msgstr "Could not close temporary folder: %s"
@@ -13438,7 +12959,7 @@ msgstr ""
msgid "Once per month"
msgstr ""
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -13446,83 +12967,83 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
#, fuzzy, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "Can not get folder: %s: %s"
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
#, fuzzy, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
#, 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
+#: mail/em-migrate.c:2015
#, fuzzy, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
#, fuzzy, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr ""
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
#, fuzzy, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
#, fuzzy, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
msgstr ""
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
msgid "Save As..."
msgstr ""
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
#, c-format
msgid "untitled_image.%s"
msgstr ""
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
msgid "Set as _Background"
msgstr ""
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
msgid "_Reply to sender"
msgstr ""
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
msgid "_Open Link in Browser"
msgstr ""
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
msgid "Se_nd message to..."
msgstr ""
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
#, fuzzy
msgid "_Add to Addressbook"
msgstr "Cannot initialise Evolution's mail component."
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
#, c-format
msgid "Open in %s..."
msgstr ""
@@ -14081,7 +13602,7 @@ msgstr ""
msgid "Mail Accounts"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
msgid "Mail Preferences"
msgstr ""
@@ -14095,15 +13616,15 @@ 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:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
#: 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:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
msgid "Please wait"
msgstr ""
@@ -14123,22 +13644,24 @@ msgid "Elm"
msgstr ""
#: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
#, fuzzy
msgid "Destination folder:"
msgstr "Synchronising folder"
#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder to import into"
msgstr ""
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
#: mail/importers/mail-importer.c:226
#, c-format
msgid "Importing `%s'"
msgstr ""
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
#: mail/importers/mail-importer.c:140
#, fuzzy
msgid "Importing mailbox"
@@ -14279,15 +13802,15 @@ msgstr ""
msgid "%s License Agreement"
msgstr ""
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
msgid "_Host:"
msgstr ""
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
msgid "User_name:"
msgstr ""
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
msgid "_Path:"
msgstr ""
@@ -14350,37 +13873,37 @@ msgstr "_Other Organiser"
msgid ", %d unread"
msgstr ""
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
#, fuzzy
msgid "New Mail Message"
msgstr "Can not open message"
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
#, fuzzy
msgid "_Mail Message"
msgstr "Can not open message"
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
#, fuzzy
msgid "Compose a new mail message"
msgstr "Can not open message"
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
#, fuzzy
msgid "New Mail Folder"
msgstr "Synchronising folders"
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
#, fuzzy
msgid "Mail _Folder"
msgstr "Synchronising folder"
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
#, fuzzy
msgid "Create a new mail folder"
msgstr "Synchronising folder"
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
msgid "Failed upgrading Mail settings or folders."
msgstr ""
@@ -14392,7 +13915,7 @@ msgstr ""
msgid "Connecting to server..."
msgstr ""
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
msgid "Identity"
msgstr ""
@@ -14404,7 +13927,7 @@ msgid ""
msgstr ""
#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
msgid "Receiving Mail"
msgstr ""
@@ -14418,7 +13941,7 @@ msgstr ""
msgid "Please select among the following options"
msgstr ""
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
msgid "Sending Mail"
msgstr ""
@@ -14428,7 +13951,7 @@ msgid ""
"sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
msgid "Account Management"
msgstr ""
@@ -14441,231 +13964,235 @@ msgid ""
"purposes only."
msgstr ""
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
msgid " Ch_eck for Supported Types "
msgstr ""
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
msgid "<b>Preview</b>"
msgstr ""
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
msgid "<b>SSL is not supported in this build of evolution</b>"
msgstr ""
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
#, fuzzy
msgid "<b>S_ignatures</b>"
msgstr "Organisation"
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
#, fuzzy
msgid "<b>_Languages</b>"
msgstr "Organisation"
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Account Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Alerts</span>"
msgstr ""
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr ""
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Authentication</span>"
msgstr ""
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
msgid "<span weight=\"bold\">Checking for New Mail</span>"
msgstr ""
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr ""
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
msgid "<span weight=\"bold\">Configuration</span>"
msgstr ""
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr ""
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr ""
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr ""
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Filter Options</span>"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">General</span>"
msgstr ""
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr ""
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr ""
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
msgid "<span weight=\"bold\">Message Display</span>"
msgstr ""
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr ""
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr ""
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Options</span>"
msgstr ""
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr ""
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr ""
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Required Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr ""
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
msgid "<span weight=\"bold\">Security</span>"
msgstr ""
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr ""
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr ""
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
msgid "A_lso encrypt to self when sending encrypted mail"
msgstr ""
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
msgid "Account Editor"
msgstr ""
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
msgid "Add Ne_w Signature..."
msgstr ""
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
msgid "Add _Script"
msgstr ""
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr ""
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
msgid "Alway_s carbon-copy (cc) to:"
msgstr ""
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
msgid "Always _blind carbon-copy (bcc) to:"
msgstr ""
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
msgid "Always _sign outgoing messages when using this account"
msgstr ""
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
msgid "Always _trust keys in my keyring when encrypting"
msgstr ""
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
msgid "Attach original message"
msgstr ""
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr ""
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
msgid "Automatically _insert smiley images"
msgstr ""
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
msgid "Automatically check for _new mail every"
msgstr ""
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
msgid "Baltic (ISO-8859-4)"
msgstr ""
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
msgid "Beep w_hen new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
msgid "C_haracter set:"
msgstr ""
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
msgid "Ch_eck for Supported Types "
msgstr ""
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
msgstr ""
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
msgid "Check spelling while I _type"
msgstr ""
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
msgid "Checks incoming mail messages to be Junk"
msgstr ""
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
#, fuzzy
msgid "Color for _misspelled words:"
msgstr "Colours for display"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
#, fuzzy
msgid "Colors"
msgstr "C_lose"
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
msgid "Confirm _when expunging a folder"
msgstr ""
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -14675,360 +14202,356 @@ msgid ""
"Click \"Apply\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
msgid "De_fault"
msgstr ""
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
msgid "Default character e_ncoding:"
msgstr ""
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
msgid "Defaults"
msgstr ""
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
#, fuzzy
msgid "Do not quote original message"
msgstr "Can not open message"
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr ""
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr ""
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
#, fuzzy
msgid "Drafts _Folder:"
msgstr "Synchronising folder"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
msgid "Email Accounts"
msgstr ""
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
#, fuzzy
msgid "Email _Address:"
msgstr "Chile"
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
msgid "Empty trash folders on e_xit"
msgstr ""
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
msgid "Encry_ption certificate:"
msgstr ""
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
msgid "Evolution Account Assistant"
msgstr ""
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
msgid "Execute Command..."
msgstr ""
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
msgid "Fi_xed-width:"
msgstr ""
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
msgid "Font Properties"
msgstr ""
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
msgid "Format messages in _HTML"
msgstr ""
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
msgid "HTML Mail"
msgstr ""
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
msgid "Headers"
msgstr ""
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
msgid "Highlight _quotations with"
msgstr ""
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
msgid "IMAPv4 "
msgstr ""
#: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: mail/mail-config.glade.h:94
msgid "Inline"
msgstr ""
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
msgid "Kerberos "
msgstr ""
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
msgid "Mail Configuration"
msgstr ""
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
msgid "Mailbox location"
msgstr ""
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
msgid "Message Composer"
msgstr ""
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr ""
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
#, fuzzy
msgid "Or_ganization:"
msgstr "Organi_sation:"
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
msgid "PGP/GPG _Key ID:"
msgstr ""
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
msgid "Play sound file when new mail arri_ves"
msgstr ""
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr ""
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
msgid "Qmail maildir "
msgstr ""
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
#, fuzzy
msgid "Quote original message"
msgstr "Can not open message"
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
msgid "Quoted"
msgstr ""
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
msgid "Re_member password"
msgstr ""
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
msgid "Re_ply-To:"
msgstr ""
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
msgid "Receiving Email"
msgstr ""
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
msgid "Receiving Options"
msgstr ""
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
msgid "Remember _password"
msgstr ""
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
msgid "S_tandard Font:"
msgstr ""
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
msgid "Security"
msgstr ""
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
msgid "Select HTML fixed width font"
msgstr ""
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
msgid "Select HTML fixed width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
msgid "Select HTML variable width font"
msgstr ""
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
msgid "Select HTML variable width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
#, fuzzy
msgid "Select..."
msgstr "Organisation"
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
msgid "Sending Email"
msgstr ""
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
#, fuzzy
msgid "Sent _Messages Folder:"
msgstr "Synchronising folder"
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
msgid "Ser_ver requires authentication"
msgstr ""
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
msgid "Server _Type: "
msgstr ""
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
msgid "Si_gning certificate:"
msgstr ""
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
msgid "Signat_ure:"
msgstr ""
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
msgid "Signatures"
msgstr ""
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
msgid "Specify _filename:"
msgstr ""
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
msgid "Spell Checking"
msgstr ""
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
msgid "Standard Unix mbox"
msgstr ""
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
msgid "T_erminal Font:"
msgstr ""
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
msgid "T_ype: "
msgstr ""
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
"for display purposes only. "
msgstr ""
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
msgid ""
"This page allows you to configure spell checking behavior and language. The "
"list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
msgstr ""
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
msgid "V_ariable-width:"
msgstr ""
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
"Click \"Forward\" to begin. "
msgstr ""
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
msgid "_Add Signature"
msgstr ""
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
msgid "_Always load images from the Internet"
msgstr ""
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
msgid "_Digitally sign outgoing messages (by default)"
msgstr ""
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
msgid "_Do not notify me when new mail arrives"
msgstr ""
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
msgid "_Enable"
msgstr ""
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
msgid "_Encrypt outgoing messages (by default)"
msgstr ""
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
msgid "_Forward style:"
msgstr ""
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
msgid "_Load images if sender is in address book"
msgstr ""
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
msgid "_Make this my default account"
msgstr ""
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
msgid "_Mark messages as read after"
msgstr ""
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
msgid "_Never load images from the Internet"
msgstr ""
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr ""
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
msgid "_Prompt when sending messages with an empty subject line"
msgstr ""
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
msgid "_Reply style:"
msgstr ""
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
msgid "_Script:"
msgstr ""
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
msgid "_Show animated images"
msgstr ""
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
msgid "_Use Secure Connection (SSL):"
msgstr ""
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
msgid "_Use the same fonts as other applications"
msgstr ""
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
#, fuzzy
msgid "color"
msgstr "Colours"
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
msgid "description"
msgstr ""
@@ -15184,7 +14707,7 @@ msgstr ""
#. mail:camel-exception primary
#: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
msgstr ""
#. mail:camel-exception secondary
@@ -15240,11 +14763,6 @@ msgstr ""
msgid "Cannot save to directory \"{0}\"."
msgstr "Can not create folder lock on %s: %s"
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
#. mail:no-create-path primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
@@ -15266,12 +14784,6 @@ msgstr "Can not create folder lock on %s: %s"
msgid "Cannot create temporary save directory."
msgstr "Can not create folder lock on %s: %s"
-#. 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:no-write-path-exists secondary
#: mail/mail-errors.xml.h:104
msgid "File exists but cannot overwrite it."
@@ -15525,179 +15037,175 @@ msgstr ""
msgid "_Append"
msgstr ""
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
#, c-format
msgid "Pinging %s"
msgstr ""
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
msgid "Filtering Folder"
msgstr ""
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
msgid "Fetching Mail"
msgstr ""
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
#, fuzzy, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
#, c-format
msgid ""
"Failed to append to %s: %s\n"
"Appending to local `Sent' folder instead."
msgstr ""
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
#, fuzzy, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
#, c-format
msgid "Sending message %d of %d"
msgstr ""
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
#, fuzzy, c-format
msgid "Failed to send %d of %d messages"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
msgid "Complete."
msgstr ""
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
msgid "Saving message to folder"
msgstr ""
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
#, c-format
msgid "Moving messages to %s"
msgstr ""
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
#, c-format
msgid "Copying messages to %s"
msgstr ""
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
#, c-format
msgid "Scanning folders in \"%s\""
msgstr ""
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
msgid "Forwarded messages"
msgstr ""
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
#, c-format
msgid "Opening folder %s"
msgstr ""
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
#, c-format
msgid "Removing folder %s"
msgstr ""
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
#, c-format
msgid "Storing folder '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
#, c-format
msgid "Expunging and storing account '%s'"
msgstr ""
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
#, fuzzy, c-format
msgid "Storing account '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
msgid "Refreshing folder"
msgstr ""
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
#, c-format
msgid "Emptying trash in '%s'"
msgstr ""
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
msgid "Local Folders"
msgstr ""
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
#, c-format
msgid "Retrieving message %s"
msgstr ""
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
#, 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:1850
+#: mail/mail-ops.c:1849
#, 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:1900
+#: mail/mail-ops.c:1899
#, c-format
msgid ""
"Unable to create output file: %s\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
msgid "Saving attachment"
msgstr ""
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
#, c-format
msgid "Could not write data: %s"
msgstr ""
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
#, c-format
msgid "Disconnecting from %s"
msgstr ""
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
#, c-format
msgid "Reconnecting to %s"
msgstr ""
@@ -15761,24 +15269,24 @@ msgstr ""
msgid "Waiting..."
msgstr ""
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
msgid "User canceled operation."
msgstr ""
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
#, c-format
msgid "Enter Password for %s"
msgstr ""
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
msgid "Enter Password"
msgstr ""
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
msgid "_Remember this password"
msgstr ""
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
msgid "_Remember this password for the remainder of this session"
msgstr ""
@@ -15833,79 +15341,79 @@ msgstr "Synchronising \"%s\""
msgid "Updating vFolders for '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
msgid "vFolders"
msgstr ""
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
msgid "Edit VFolder"
msgstr ""
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
msgid "New VFolder"
msgstr ""
-#: mail/message-list.c:946
+#: mail/message-list.c:948
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:947
+#: mail/message-list.c:949
msgid "Seen"
msgstr ""
-#: mail/message-list.c:948
+#: mail/message-list.c:950
msgid "Answered"
msgstr ""
-#: mail/message-list.c:949
+#: mail/message-list.c:951
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:950
+#: mail/message-list.c:952
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:954
+#: mail/message-list.c:956
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:955
+#: mail/message-list.c:957
msgid "Lower"
msgstr ""
-#: mail/message-list.c:959
+#: mail/message-list.c:961
msgid "Higher"
msgstr ""
-#: mail/message-list.c:960
+#: mail/message-list.c:962
msgid "Highest"
msgstr ""
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
msgid "?"
msgstr ""
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
msgid "%b %d %l:%M %p"
msgstr ""
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
msgid "Generating message list"
msgstr ""
@@ -15962,6 +15470,10 @@ msgstr ""
msgid "No Response Necessary"
msgstr ""
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr ""
@@ -16059,44 +15571,48 @@ msgid ""
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
#, fuzzy
msgid "mail"
msgstr "Chile"
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
#, c-format
msgid "%ld KB"
msgstr ""
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
msgid "Uknown system error."
msgstr ""
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
msgid "Invalid arguments"
msgstr ""
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
msgid "Cannot register on OAF"
msgstr ""
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
msgid "Generic error"
msgstr ""
@@ -16144,7 +15660,7 @@ msgstr ""
msgid "Select importer"
msgstr ""
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
#, c-format
msgid "File %s does not exist"
msgstr ""
@@ -16170,56 +15686,57 @@ msgid ""
"Importing item 1."
msgstr ""
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
msgid "Automatic"
msgstr ""
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr ""
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "_Other Organiser"
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
msgid "Select a file"
msgstr ""
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
msgid "File _type:"
msgstr ""
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
msgid "Import data and settings from _older programs"
msgstr ""
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
msgid "Import a _single file"
msgstr ""
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
msgid "Starting Intelligent Importers"
msgstr ""
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
#, c-format
msgid "From %s:"
msgstr ""
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
#, c-format
msgid "No importer available for file %s"
msgstr ""
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
#, fuzzy
msgid "Unable to execute importer"
msgstr "Could not close temporary folder: %s"
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
msgid "_Import"
msgstr ""
@@ -16264,54 +15781,53 @@ msgstr ""
msgid "'.' and '..' are reserved folder names."
msgstr ""
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
msgid "Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
msgid "Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
msgid "Evolution is currently offline. Click on this button to work online."
msgstr ""
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
#, c-format
msgid "Switch to %s"
msgstr ""
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr ""
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
#, c-format
msgid "Error executing %s."
msgstr ""
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
msgid "Bug buddy is not installed."
msgstr ""
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
msgid "Bug buddy could not be run."
msgstr ""
-#: shell/e-shell-window-commands.c:171
-#, fuzzy
-msgid "About Evolution"
-msgstr "Can not initialise the Ximian Evolution shell."
+#: shell/e-shell-window-commands.c:323
+msgid "Groupware Suite"
+msgstr ""
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
msgid "_Work Online"
msgstr ""
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
msgid "_Work Offline"
msgstr ""
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
msgid "Work Offline"
msgstr ""
@@ -16324,32 +15840,6 @@ msgstr "Chile"
msgid "New"
msgstr ""
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
#: shell/evolution-test-component.c:140
#, fuzzy
msgid "New Test"
@@ -16656,32 +16146,32 @@ msgid ""
"Click help for details."
msgstr ""
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
msgid "Select a cert to import..."
msgstr ""
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
#, fuzzy
msgid "Certificate Name"
msgstr "Could not close temporary folder: %s"
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
#, fuzzy
msgid "Purposes"
msgstr "C_lose"
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
msgid "Serial Number"
msgstr ""
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
msgid "Expires"
msgstr ""
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
#, fuzzy
msgid "E-Mail Address"
msgstr "Chile"
@@ -16720,6 +16210,11 @@ msgid ""
" Subject: %s\n"
msgstr ""
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Could not close temporary folder: %s"
+
#: smime/gui/smime-ui.glade.h:1
msgid "<Not Part of Certificate>"
msgstr ""
@@ -16774,7 +16269,7 @@ msgid ""
"and its policy and procedures (if available)."
msgstr ""
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
#, fuzzy
msgid "Certificate"
msgstr "Could not close temporary folder: %s"
@@ -16796,19 +16291,23 @@ msgstr ""
msgid "Contact Certificates"
msgstr ""
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
msgstr ""
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
msgid "Dummy window only"
msgstr ""
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
msgid "Edit"
msgstr ""
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Could not close temporary folder: %s"
+
#: smime/gui/smime-ui.glade.h:24
msgid "Email Recipient Certificate"
msgstr ""
@@ -16843,254 +16342,262 @@ msgstr "Organisation"
msgid "SHA1 Fingerprint"
msgstr ""
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
msgid "SSL Client Certificate"
msgstr ""
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
msgid "SSL Server Certificate"
msgstr ""
#: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
msgstr ""
#: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
msgstr ""
#: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
msgstr ""
#: smime/gui/smime-ui.glade.h:40
-msgid "View"
+msgid "Trust this CA to identify web sites."
msgstr ""
#: smime/gui/smime-ui.glade.h:41
-#, fuzzy
-msgid "View Certificate"
-msgstr "Could not close temporary folder: %s"
+msgid "View"
+msgstr ""
#: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
msgstr ""
#: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
msgstr ""
#: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these people:"
msgstr ""
#: smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
+msgid "Your Certificates"
msgstr ""
#: smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
+msgid "_Edit CA Trust"
msgstr ""
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
msgid "%d/%m/%Y"
msgstr "%m/%d/%Y"
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+msgid "Sign"
+msgstr ""
+
+#: smime/lib/e-cert.c:425
+msgid "Encrypt"
+msgstr ""
+
+#: smime/lib/e-cert.c:530
msgid "Version"
msgstr ""
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
msgid "Version 1"
msgstr ""
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
msgid "Version 2"
msgstr ""
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
msgid "Version 3"
msgstr ""
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
msgid "C"
msgstr ""
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
msgid "CN"
msgstr ""
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
msgid "OU"
msgstr ""
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
msgid "O"
msgstr ""
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
msgid "L"
msgstr ""
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
msgid "DN"
msgstr ""
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
msgid "DC"
msgstr ""
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
msgid "ST"
msgstr ""
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
msgid "PKCS #1 RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
#, fuzzy
msgid "Certificate Key Usage"
msgstr "Could not close temporary folder: %s"
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
#, fuzzy
msgid "Netscape Certificate Type"
msgstr "Could not close temporary folder: %s"
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
msgid "Certificate Authority Key Identifier"
msgstr ""
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
msgid "UID"
msgstr ""
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
#, c-format
msgid "Object Identifier (%s)"
msgstr ""
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
msgid "Algorithm Identifier"
msgstr ""
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
msgid "Algorithm Parameters"
msgstr ""
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
msgid "Subject Public Key Info"
msgstr ""
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
msgid "Subject Public Key Algorithm"
msgstr ""
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
msgid "Subject's Public Key"
msgstr ""
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
msgid "Error: Unable to process extension"
msgstr ""
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
msgid "Object Signer"
msgstr ""
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
msgid "SSL Certificate Authority"
msgstr ""
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
msgid "Email Certificate Authority"
msgstr ""
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
msgid "Signing"
msgstr ""
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
msgid "Non-repudiation"
msgstr ""
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
msgid "Key Encipherment"
msgstr ""
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
msgid "Data Encipherment"
msgstr ""
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
msgid "Key Agreement"
msgstr ""
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
#, fuzzy
msgid "Certificate Signer"
msgstr "Could not close temporary folder: %s"
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
msgid "CRL Signer"
msgstr ""
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
#, fuzzy
msgid "Critical"
msgstr "Chile"
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
msgid "Not Critical"
msgstr ""
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
msgid "Extensions"
msgstr ""
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
#, c-format
msgid "%s = %s"
msgstr ""
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
#, fuzzy
msgid "Certificate Signature Algorithm"
msgstr "Could not close temporary folder: %s"
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
msgid "Issuer"
msgstr ""
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
msgid "Issuer Unique ID"
msgstr ""
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
msgid "Subject Unique ID"
msgstr ""
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
#, fuzzy
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
+#: smime/lib/e-cert-db.c:608
#, fuzzy
msgid "Certificate already exists"
msgstr "Could not close temporary folder: %s"
@@ -17237,7 +16744,7 @@ msgstr ""
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
#: 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
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
msgid "_Actions"
msgstr ""
@@ -17398,7 +16905,7 @@ msgstr "C_lose"
#: ui/evolution-contact-list-editor.xml.h:2
#: ui/evolution-mail-messagedisplay.xml.h:1
#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
msgid "Close"
msgstr ""
@@ -17411,7 +16918,7 @@ msgid "Delete this item"
msgstr ""
#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
msgid "Main toolbar"
msgstr ""
@@ -17454,7 +16961,7 @@ msgstr ""
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:44
#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
msgid "_File"
msgstr ""
@@ -17715,13 +17222,13 @@ msgstr ""
msgid "_Threaded Message List"
msgstr ""
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
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
+#: ui/evolution.xml.h:28
msgid "_Close"
msgstr ""
@@ -18120,7 +17627,7 @@ msgstr ""
msgid "_Quoted"
msgstr ""
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
msgid "_Tools"
msgstr ""
@@ -18417,107 +17924,118 @@ msgid "_Open Task"
msgstr ""
#: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr ""
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Can not initialise the Ximian Evolution shell."
#: ui/evolution.xml.h:2
msgid "Change Evolution's settings"
msgstr ""
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:6
#, fuzzy
msgid "Create a new window displaying this folder"
msgstr "Synchronising folder"
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
msgid "E_xit"
msgstr ""
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: ui/evolution.xml.h:9
msgid "Exit the program"
msgstr ""
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
msgid "Forget _Passwords"
msgstr ""
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
msgid "Forget remembered passwords so you will be prompted for them again"
msgstr ""
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
msgid "Import data from other programs"
msgstr ""
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
msgid "New _Window"
msgstr ""
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
msgid "Pi_lot Settings..."
msgstr ""
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
msgid "Send / Receive"
msgstr ""
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
msgid "Send queued items and retrieve new items"
msgstr ""
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
msgid "Set up Pilot configuration"
msgstr ""
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+msgid "Show information about Evolution"
msgstr ""
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
msgid "Submit Bug Report"
msgstr ""
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
msgid "Submit _Bug Report"
msgstr ""
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
msgid "Submit a bug report using Bug Buddy"
msgstr ""
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
#: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
+msgid "T_oolbar"
msgstr ""
#: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
msgstr ""
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Can not initialise the Ximian Evolution shell."
+
+#: ui/evolution.xml.h:30
msgid "_Help"
msgstr ""
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
msgid "_Import..."
msgstr ""
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
msgid "_New"
msgstr ""
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
msgid "_Quick Reference"
msgstr ""
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
msgid "_Send / Receive"
msgstr ""
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
msgid "_Window"
msgstr ""
@@ -18588,7 +18106,7 @@ msgid "With _Status"
msgstr ""
#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
msgid "UTC"
msgstr ""
@@ -18741,30 +18259,30 @@ msgstr ""
msgid "..."
msgstr ""
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
#, 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
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
#, fuzzy
msgid "Evolution Warning"
msgstr "Cannot initialise Evolution's mail component."
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
#, fuzzy
msgid "Evolution Information"
msgstr "Cannot initialise Evolution's mail component."
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
#, fuzzy
msgid "Evolution Query"
msgstr "Cannot initialise Evolution's mail component."
#. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
#, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18908,17 +18426,51 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
#, c-format
msgid "%s (...)"
msgstr ""
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
#, c-format
msgid "%s (%d%% complete)"
msgstr ""
#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Chile"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Could not get group: %s"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr ""
+#~ "Can not get message: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
#~ msgid "Address 2:"
#~ msgstr "Chile"