aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_CA.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_CA.po
parentdae1aa0ac0d5aa9e220f9de63b30f65ee0961665 (diff)
downloadgsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.gz
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.zst
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.zip
Merge from release branch.
svn path=/trunk/; revision=26178
Diffstat (limited to 'po/en_CA.po')
-rw-r--r--po/en_CA.po3113
1 files changed, 1525 insertions, 1588 deletions
diff --git a/po/en_CA.po b/po/en_CA.po
index 11c31fcebc..60a1543ad5 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 1.5.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-24 14:56-0700\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
"PO-Revision-Date: 2004-05-24 15:07-0700\n"
"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
"Language-Team: Canadian English <adamw@FreeBSD.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Report-Msgid-Bugs-To: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: a11y/addressbook/ea-addressbook-view.c:94
#: a11y/addressbook/ea-addressbook-view.c:103
@@ -68,13 +68,13 @@ msgstr "Could not read pilot's Address application block"
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: 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
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: 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 "%sEnter password for %s (user %s)"
@@ -119,34 +119,6 @@ msgstr "Create a new contacts group"
msgid "Failed upgrading Addressbook settings or folders."
msgstr "Failed upgrading Addressbook settings or folders."
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Failed to connect to LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Failed to authenticate with LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Could not perform query on Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "The server responded with no supported search bases"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "This server does not support LDAPv3 schema information"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Error retrieving schema information"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Server did not respond with valid schema information"
-
#: addressbook/gui/component/addressbook-migrate.c:68
#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
msgid "Migrating..."
@@ -159,20 +131,16 @@ msgid "Migrating `%s':"
msgstr "Migrating `%s':"
#. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: 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:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "On This Computer"
#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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:1013 mail/mail-config.c:78
#: mail/mail-config.glade.h:109
@@ -180,19 +148,19 @@ msgid "Personal"
msgstr "Personal"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
msgid "LDAP Servers"
msgstr "LDAP Servers"
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
msgid "Autocompletion Settings"
msgstr "Autocompletion Settings"
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -204,7 +172,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -214,7 +182,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -224,7 +192,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -234,41 +202,32 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your Pilot Sync data..."
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-
-#: 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 "Address book '%s' will be removed. Are you sure you want to continue?"
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
msgid "New Address Book"
msgstr "New Address Book"
-#: 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 "Delete"
-#: 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 "Properties..."
#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
#: calendar/gui/migration.c:373
msgid "Contacts"
@@ -347,10 +306,6 @@ msgid "Manage your S/MIME certificates here"
msgstr "Manage your S/MIME certificates here"
#: addressbook/gui/component/ldap-config.glade.h:1
-msgid " S_how Supported Bases "
-msgstr " S_how Supported Bases "
-
-#: 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
@@ -372,183 +327,150 @@ msgstr " S_how Supported Bases "
msgid "*"
msgstr "*"
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
msgid "1"
msgstr "1"
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
msgid "3268"
msgstr "3268"
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "5"
msgstr "5"
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "636"
msgstr "636"
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "<b>Authentication</b>"
msgstr "<b>Authentication</b>"
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Display</b>"
msgstr "<b>Display</b>"
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "<b>Downloading</b>"
msgstr "<b>Downloading</b>"
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
msgid "<b>Searching</b>"
msgstr "<b>Searching</b>"
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "<b>Server Information</b>"
msgstr "<b>Server Information</b>"
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
msgid "<b>Type:</b>"
msgstr "<b>Type:</b>"
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
msgid "Add Contacts Group"
msgstr "Add Contacts Group"
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
msgid "Address Book Properties"
msgstr "Address Book Properties"
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
#: mail/mail-config.glade.h:42
msgid "Always"
msgstr "Always"
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Anonymously"
msgstr "Anonymously"
-#: 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 "Basic"
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Connecting"
-
-#: 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 "Details"
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Distinguished _name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Distinguished name"
msgstr "Distinguished name"
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
msgid "Download limit:"
msgstr "Download limit:"
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
msgid "Email address"
msgstr "Email address"
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Email address:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution will use this DN to authenticate you with the server"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
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 ""
"Evolution will use this email address to authenticate you with the server"
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
msgid "Find Possible Search Bases"
msgstr "Find Possible Search Bases"
-#: 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:86 smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "General"
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
#: mail/mail-config.glade.h:102
msgid "Never"
msgstr "Never"
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "One"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
msgid "Only locations within starting point"
msgstr "Only locations within starting point"
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "S_earch scope: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Search base:"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
msgid "Search base only"
msgstr "Search base only"
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid "Search base:"
msgstr "Search base:"
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid "Search scope:"
msgstr "Search scope:"
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Searching"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
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 ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
"your LDAP server supports SSL or TLS."
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
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 ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -558,13 +480,12 @@ msgstr ""
"is already\n"
"secure."
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
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 ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -572,38 +493,33 @@ msgstr ""
"to security\n"
"exploits. "
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid "Starting point and locations within it"
msgstr "Starting point and locations within it"
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
msgid "Supported Search Bases"
msgstr "Supported Search Bases"
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
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 ""
"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."
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
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 ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -612,7 +528,7 @@ msgstr ""
"A search scope of \"one\" will only include the entries one level beneath "
"your base.\n"
-#: 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"
"\"."
@@ -620,17 +536,17 @@ msgstr ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
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 ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
"too large will slow down your address book."
-#: 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 "
@@ -640,136 +556,115 @@ msgstr ""
"setting this to \"Email Address\" requires anonymous access to your ldap "
"server."
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
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 ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
"It is for display purposes only. "
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
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."
+"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 ""
"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."
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "This option controls how long a search will be run."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
msgid "Timeout:"
msgstr "Timeout:"
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "U_se SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
msgid "Using distinguished name (DN)"
msgstr "Using distinguished name (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
msgid "Using email address"
msgstr "Using email address"
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr "Whenever Possible"
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
msgid "_Add Contacts Group"
msgstr "_Add Contacts Group"
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Display name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "_Download limit:"
msgstr "_Download limit:"
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "_Email address:"
msgstr "_Email address:"
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Find Possible Search Bases"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "_Log in method:"
msgstr "_Log in method:"
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login"
+
+#: 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 "_Name:"
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Port number:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
msgid "_Port:"
msgstr "_Port:"
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Search base:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Server name:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Search scope:"
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
msgid "_Server:"
msgstr "_Server:"
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Timeout (minutes):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Timeout:"
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
msgid "_Use secure connection:"
msgstr "_Use secure connection:"
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
msgid "cards"
msgstr "cards"
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: 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
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "minutes"
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: 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 "Select Contacts from Address Book"
-#: 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"
@@ -809,7 +704,7 @@ msgstr "Unnamed Contact"
#: 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 "Source"
@@ -874,9 +769,9 @@ msgid "<b>Work</b>"
msgstr "<b>Work</b>"
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: 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 "AIM"
@@ -910,15 +805,15 @@ msgid "Company:"
msgstr "Company:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: 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
msgid "Contact"
msgstr "Contact"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
msgid "Contact Editor"
msgstr "Contact Editor"
@@ -939,83 +834,81 @@ msgid "Full _Name..."
msgstr "Full _Name..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Home"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "Home Page:"
msgstr "Home Page:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Location:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "Mailing Address"
msgstr "Mailing Address"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "Manager:"
msgstr "Manager:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "Ni_ckname:"
msgstr "Ni_ckname:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "Notes:"
msgstr "Notes:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Other"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Office"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "PO Box:"
msgstr "PO Box:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "Personal Information"
msgstr "Personal information"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
msgid "Profession:"
msgstr "Profession:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Spouse"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "State/Province:"
msgstr "State/Province:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
msgid "Title:"
msgstr "Title:"
+#: 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 "Wants to receive HTML mail"
#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Webcam:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Web Page:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: 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:1012 mail/mail-config.c:77
#: mail/mail-config.glade.h:157
@@ -1035,17 +928,10 @@ msgid "_File under:"
msgstr "_File under:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
msgid "_Where:"
msgstr "_Where:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
#: addressbook/gui/contact-editor/eab-editor.c:315
msgid ""
"Are you sure you want\n"
@@ -1063,16 +949,16 @@ msgstr ""
"to delete this contact?"
#: 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
msgid "Address"
msgstr "Address"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: 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
@@ -2050,83 +1936,80 @@ msgstr "Zambia"
msgid "Zimbabwe"
msgstr "Zimbabwe"
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: 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 "Jabber"
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: 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 "Yahoo"
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: 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 "MSN"
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: 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 "ICQ"
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
msgid "GroupWise"
msgstr "GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Home"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Other"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
msgid "Source Book"
msgstr "Source Book"
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Target Book"
msgstr "Target Book"
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
msgid "Is New Contact"
msgstr "Is New Contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Writable Fields"
msgstr "Writable Fields"
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
msgid "Changed"
msgstr "Changed"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "Category editor not available."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
msgid "This contact belongs to these categories:"
msgstr "This contact belongs to these categories:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
msgid "No image"
msgstr "No image"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-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 ""
-"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?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2134,7 +2017,12 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d contact"
+
+#: 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?"
@@ -2142,12 +2030,19 @@ msgstr ""
"The contact cannot be saved to the selected address book. Do you want to "
"discard changes?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
msgid "_Discard"
msgstr "_Discard"
+#: 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 ""
+"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?"
+
#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
msgid "AOL Instant Messenger"
msgstr "AOL Instant Messenger"
@@ -2324,30 +2219,30 @@ msgstr "_List name:"
msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Type an email address or drag a contact into the list below:"
-#: 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 "contact-list-editor"
-#: 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 "Book"
-#: 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 "Is New List"
#. 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 "Contact List Editor"
-#: 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 "Save List as VCard"
@@ -2394,144 +2289,144 @@ msgstr ""
msgid "Advanced Search"
msgstr "Advanced Search"
-#: 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 "(map)"
-#: 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 "map"
-#: 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 "List Members"
-#: 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
msgid "E-mail"
msgstr "E-mail"
-#: 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 "Organization"
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "Position"
msgstr "Position"
-#: 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 "Groupwise"
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
msgid "Video Conferencing"
msgstr "Video Conferencing"
-#: 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 "Phone"
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
msgid "Fax"
msgstr "Fax"
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
msgid "work"
msgstr "work"
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
msgid "WWW"
msgstr "WWW"
-#: 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 "Blog"
-#: 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 "Mobile Phone"
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
msgid "personal"
msgstr "personal"
-#: 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 "Note"
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
msgid "Job Title"
msgstr "Job Title"
-#: 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 "Email"
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
msgid "Home page"
msgstr "Home page"
#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
msgid "Success"
msgstr "Success"
#. 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 "Backend busy"
#. 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 "Repository offline"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Address Book does not exist"
msgstr "Address Book does not exist"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
msgid "No Self Contact defined"
msgstr "No Self Contact defined"
#. 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 "Permission denied"
#. 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 "Contact not found"
#. 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 "Contact ID already exists"
#. 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 "Protocol not supported"
#. 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
@@ -2544,37 +2439,37 @@ msgid "Cancelled"
msgstr "Cancelled"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
msgid "Could not cancel"
msgstr "Could not cancel"
#. 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 "Authentication Failed"
#. 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 "Authentication Required"
#. 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 "TLS not Available"
#. 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
msgid "No such source"
msgstr "No such source"
#. 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 "Other error"
-#: 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."
@@ -2582,7 +2477,7 @@ msgstr ""
"We were unable to open this addressbook. Please check that the path exists "
"and that you have permission to access it."
-#: 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."
@@ -2590,17 +2485,18 @@ msgstr ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
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 ""
"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."
-#: 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."
@@ -2608,11 +2504,7 @@ msgstr ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Unable to open addressbook"
-
-#: 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"
@@ -2624,7 +2516,7 @@ msgstr ""
"Please make your search more specific or raise the result limit in\n"
"the directory server preferences for this addressbook."
-#: 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"
@@ -2636,49 +2528,45 @@ msgstr ""
"more specific or raise the time limit in the directory server\n"
"preferences for this addressbook."
-#: 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 "The backend for this addressbook was unable to parse this query."
-#: 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 "The backend for this addressbook refused to perform this query."
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
msgid "This query did not complete successfully."
msgstr "This query did not complete successfully."
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Do you want to save changes?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
msgid "Error adding list"
msgstr "Error adding list"
-#: 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 "Error adding contact"
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying list"
msgstr "Error modifying list"
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying contact"
msgstr "Error modifying contact"
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
msgid "Error removing list"
msgstr "Error removing list"
-#: 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 "Error removing contact"
-#: 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"
@@ -2687,7 +2575,7 @@ msgstr ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
#, c-format
msgid ""
"%s already exists\n"
@@ -2696,49 +2584,44 @@ msgstr ""
"%s already exists\n"
"Do you want to overwrite it?"
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
msgid "Overwrite"
msgstr "Overwrite"
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Error saving %s: %s"
-
#. 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 "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
msgid "list"
msgstr "list"
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
msgid "Move contact to"
msgstr "Move contact to"
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
msgid "Copy contact to"
msgstr "Copy contact to"
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
msgid "Move contacts to"
msgstr "Move contacts to"
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
msgid "Copy contacts to"
msgstr "Copy contacts to"
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
msgid "Select target addressbook."
msgstr "Select target addressbook."
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
msgid "Multiple VCards"
msgstr "Multiple VCards"
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
#, c-format
msgid "VCard for %s"
msgstr "VCard for %s"
@@ -2825,7 +2708,7 @@ msgstr[1] "%d contacts"
#: 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"
@@ -2843,141 +2726,130 @@ msgstr "Model"
msgid "Error modifying card"
msgstr "Error modifying card"
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
msgid "Name begins with"
msgstr "Name begins with"
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
msgid "Email begins with"
msgstr "Email begins with"
-#: 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 "Category is"
#. 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 "Any field contains"
-#: 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 "Advanced..."
-#: 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:250
+#: calendar/gui/e-meeting-list-view.c:227
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "Type"
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
msgid "Address Book"
msgstr "Address Book"
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: 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 "Save as VCard..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
msgid "New Contact..."
msgstr "New Contact..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
msgid "New Contact List..."
msgstr "New Contact List..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
msgid "Go to Folder..."
msgstr "Go to Folder..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
msgid "Import..."
msgstr "Import..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
msgid "Search for Contacts..."
msgstr "Search for Contacts..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
msgid "Address Book Sources..."
msgstr "Address Book Sources..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
msgid "Pilot Settings..."
msgstr "Pilot Settings..."
-#: 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 "Forward Contact"
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
msgid "Send Message to Contact"
msgstr "Send Message to Contact"
-#: 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 "Print"
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
msgid "Print Envelope"
msgstr "Print Envelope"
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
msgid "Copy to Address Book..."
msgstr "Copy to Address Book..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
msgid "Move to Address Book..."
msgstr "Move to Address Book..."
-#: 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 "Cut"
-#: 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 "Copy"
-#: 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 "Paste"
-#: 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 "Current View"
-#: 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 ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-
#. 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 "Any Category"
@@ -3083,7 +2955,7 @@ msgstr "Radio"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
#: calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "Role"
@@ -3191,17 +3063,17 @@ msgstr "Card View"
msgid "GTK Tree View"
msgstr "GTK Tree View"
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
msgid "Reflow Test"
msgstr "Reflow Test"
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
msgid "This should test the reflow canvas item"
msgstr "This should test the reflow canvas item"
@@ -3509,7 +3381,7 @@ msgstr "No filename provided."
msgid "Unnamed List"
msgstr "Unnamed List"
-#: 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 "Enter password"
@@ -3784,10 +3656,10 @@ msgid "Whether to show week numbers in date navigator"
msgstr "Whether to show week numbers in date navigator"
#: 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 "Calendar"
@@ -3807,7 +3679,7 @@ msgstr "Purge events older than"
#: 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 "days"
@@ -3817,10 +3689,6 @@ msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
#: calendar/gui/e-week-view-main-item.c:329
@@ -3957,23 +3825,23 @@ msgstr "Week View"
msgid "Month View"
msgstr "Month View"
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
msgid "Summary contains"
msgstr "Summary contains"
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
msgid "Description contains"
msgstr "Description contains"
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
msgid "Comment contains"
msgstr "Comment contains"
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
msgid "Location contains"
msgstr "Location contains"
-#: 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 "Unmatched"
@@ -3994,23 +3862,23 @@ msgstr "Permission denied to open the calendar"
msgid "open_client(): %s"
msgstr "open_client(): %s"
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
msgid "Audio Alarm Options"
msgstr "Audio Alarm Options"
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
msgid "Message Alarm Options"
msgstr "Message Alarm Options"
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
msgid "Email Alarm Options"
msgstr "Email Alarm Options"
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
msgid "Program Alarm Options"
msgstr "Program Alarm Options"
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
msgid "Unknown Alarm Options"
msgstr "Unknown Alarm Options"
@@ -4046,7 +3914,7 @@ msgstr "Send To:"
msgid "With these arguments:"
msgstr "With these arguments:"
-#: 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 "dialog1"
@@ -4055,7 +3923,7 @@ msgid "extra times every"
msgstr "extra times every"
#: 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 "hours"
@@ -4101,7 +3969,7 @@ msgstr "Send an email"
#: 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:921 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 "Summary:"
@@ -4131,7 +3999,6 @@ msgid "hour(s)"
msgstr "hour(s)"
#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
msgid "minute(s)"
msgstr "minute(s)"
@@ -4139,26 +4006,26 @@ msgstr "minute(s)"
msgid "start of appointment"
msgstr "start of appointment"
-#: 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 "You must specify a location to get the calendar from."
-#: 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 "The source location '%s' is not well-formed."
-#: 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 "The source location '%s' is not a webcal source."
-#: 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 "Source with name '%s' already exists in the selected group"
-#: 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 "
@@ -4179,51 +4046,31 @@ msgstr "Add Tasks Group"
msgid "C_olor:"
msgstr "C_olour:"
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: 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
-msgid "Remote"
-msgstr "Remote"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Task List Properties"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
msgid "_Add Calendar"
msgstr "_Add Calendar"
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
msgid "_Add Group"
msgstr "_Add Group"
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Refresh Interval:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
msgid "_Refresh:"
msgstr "_Refresh:"
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Source URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
msgid "_Type:"
msgstr "_Type:"
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
msgid "_URL:"
msgstr "_URL:"
-#: 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 "weeks"
@@ -4335,7 +4182,7 @@ msgstr "Free/Busy Publishing"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
msgid "Friday"
msgstr "Friday"
@@ -4349,7 +4196,7 @@ msgstr "Minutes"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
msgid "Monday"
msgstr "Monday"
@@ -4359,7 +4206,7 @@ msgstr "S_un"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr "Saturday"
@@ -4373,7 +4220,7 @@ msgstr "Show week _numbers in date navigator"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr "Sunday"
@@ -4387,7 +4234,7 @@ msgstr "T_hu"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr "Thursday"
@@ -4401,7 +4248,7 @@ msgstr "Time format:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
msgid "Tuesday"
msgstr "Tuesday"
@@ -4411,7 +4258,7 @@ msgstr "W_eek starts:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr "Wednesday"
@@ -4493,82 +4340,46 @@ msgstr "_Wed"
msgid "before every appointment"
msgstr "before every appointment"
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Are you sure you want to cancel and delete this meeting?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Are you sure you want to cancel and delete this task?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Are you sure you want to cancel and delete this journal entry?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "This event has been deleted."
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
msgid "This task has been deleted."
msgstr "This task has been deleted."
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
msgid "This journal entry has been deleted."
msgstr "This journal entry has been deleted."
-#: 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 "%s You have made changes. Forget those changes and close the editor?"
-#: 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 "%s You have made no changes, close the editor?"
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
msgid "This event has been changed."
msgstr "This event has been changed."
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
msgid "This task has been changed."
msgstr "This task has been changed."
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
msgid "This journal entry has been changed."
msgstr "This journal entry has been changed."
-#: 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 "%s You have made changes. Forget those changes and update the editor?"
-#: 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 "%s You have made no changes, update the editor?"
@@ -4606,7 +4417,7 @@ msgid "No summary"
msgstr "No summary"
#: 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 "Save as..."
@@ -4658,99 +4469,51 @@ msgstr "Could not open destination"
msgid "Destination is read only"
msgstr "Destination is read only"
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Are you sure you want to delete the appointment `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Are you sure you want to delete this untitled appointment?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Are you sure you want to delete the task `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Are you sure you want to delete this untitled task?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Are you sure you want to delete the journal entry `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Are you sure want to delete this untitled journal entry?"
-
-#: 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] "Are you sure you want to delete %d appointment?"
-msgstr[1] "Are you sure you want to delete %d appointments?"
-
-#: 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] "Are you sure you want to delete %d task?"
-msgstr[1] "Are you sure you want to delete %d tasks?"
-
-#: 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] "Are you sure you want to delete %d journal entry?"
-msgstr[1] "Are you sure you want to delete %d journal entries?"
-
-#: 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 "The event could not be deleted due to a corba error"
-#: 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 "The task could not be deleted due to a corba error"
-#: 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 "The journal entry could not be deleted due to a corba error"
-#: 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 "The item could not be deleted due to a corba error"
-#: 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 "The event could not be deleted because permission was denied"
-#: 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 "The task could not be deleted because permission was denied"
-#: 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 "The journal entry could not be deleted because permission was denied"
-#: 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 "The item could not be deleted because permission was denied"
-#: 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 "The event could not be deleted due to an error"
-#: 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 "The task could not be deleted due to an error"
-#: 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 "The journal entry could not be deleted due to an error"
-#: 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 "The item could not be deleted due to an error"
@@ -4882,13 +4645,8 @@ msgid "_Start time:"
msgstr "_Start time:"
#. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
#: 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:1571
@@ -4918,8 +4676,8 @@ msgstr "_Delegate To..."
#. 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:2562 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
@@ -4927,7 +4685,7 @@ msgid "_Delete"
msgstr "_Delete"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "Attendee"
@@ -4963,16 +4721,15 @@ msgid "Member"
msgstr "Member"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: 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 "RSVP"
#: calendar/gui/dialogs/meeting-page.etspec.h:10
#: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: 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 "Status"
@@ -4980,20 +4737,20 @@ msgstr "Status"
msgid "Add A_ttendee"
msgstr "Add A_ttendee"
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Add Sender to Address_book"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
#: calendar/gui/e-itip-control.glade.h:9
msgid "Organizer:"
msgstr "Organizer:"
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
msgid "_Change Organizer"
msgstr "_Change Organizer"
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Invite Others..."
-
#: calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
msgstr "<b>Calendar options</b>"
@@ -5141,7 +4898,7 @@ msgid "_No recurrence"
msgstr "_No recurrence"
#: 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 "_Remove"
@@ -5173,52 +4930,18 @@ msgstr "week(s)"
msgid "year(s)"
msgstr "year(s)"
-#: 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 ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Discard Changes"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Save Event"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
msgid "Select destination"
msgstr "Select destination"
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
msgid "_Destination"
msgstr "_Destination"
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
msgid "Task List"
msgstr "Task List"
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "The meeting information has been created. Send it?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "The meeting information has changed. Send an updated version?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "The task assignment information has been created. Send it?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "The task information has changed. Send an updated version?"
-
#: calendar/gui/dialogs/task-details-page.c:406
msgid "Completed date is wrong"
msgstr "Completed date is wrong"
@@ -5316,7 +5039,7 @@ msgstr "Con_fidential"
#: calendar/gui/dialogs/task-page.glade.h:6
#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: 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 "Description:"
@@ -5480,7 +5203,7 @@ msgstr "Due Date:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
msgid "Status:"
msgstr "Status:"
@@ -5564,12 +5287,12 @@ msgstr "Busy"
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
-#: 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 "Updating objects"
#: 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 "_Open"
@@ -5579,15 +5302,15 @@ msgid "Open _Web Page"
msgstr "Open _Web Page"
#: 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
+#: 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 "_Save As..."
#: 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
@@ -5595,15 +5318,15 @@ msgid "_Print..."
msgstr "_Print..."
#: 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 "C_ut"
#: 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:2555
+#: 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
@@ -5611,8 +5334,8 @@ msgid "_Copy"
msgstr "_Copy"
#: 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"
@@ -5678,67 +5401,67 @@ msgstr "Summary"
msgid "Task sort"
msgstr "Task sort"
-#: 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 "New _Appointment..."
-#: 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 "New All Day _Event"
-#: 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 "New Meeting"
-#: 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 "New Task"
-#: 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 "Select _Today"
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
msgid "_Select Date..."
msgstr "_Select Date..."
-#: 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 "_Publish Free/Busy Information"
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: 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 "Delete this _Occurrence"
-#: 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 "Delete _All Occurrences"
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
msgid "Go to _Today"
msgstr "Go to _Today"
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
msgid "_Go to Date..."
msgstr "_Go to Date..."
-#: 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 "_Settings..."
@@ -5752,9 +5475,9 @@ msgstr "Start Date"
#. 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:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 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
@@ -5780,13 +5503,13 @@ msgid "Assigned"
msgstr "Assigned"
#: 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: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 "Yes"
#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 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 "No"
@@ -5798,7 +5521,7 @@ msgstr "N"
msgid "S"
msgstr "S"
-#: 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 "E"
@@ -5817,20 +5540,12 @@ msgstr ""
"45.436845,125.862501"
#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5861,10 +5576,6 @@ msgstr "pm"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
@@ -5872,9 +5583,6 @@ msgstr "%A %d %B"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
@@ -5885,101 +5593,102 @@ msgstr "%d %b"
msgid "%02i minute divisions"
msgstr "%02i minute divisions"
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
msgstr[0] "Every day"
msgstr[1] "Every day"
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
msgstr[0] "Every week"
msgstr[1] "Every week"
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "Every week on "
msgstr[1] "Every week on "
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
msgid " and "
msgstr " and "
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
#, c-format
msgid "The %s day of "
msgstr "The %s day of "
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
#, c-format
msgid "The %s %s of "
msgstr "The %s %s of "
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
#, c-format
msgid "every month"
msgid_plural "every %d months"
msgstr[0] "every month"
msgstr[1] "every month"
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
msgstr[0] "Every year"
msgstr[1] "Every year"
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] "a total of %d time"
msgstr[1] " a total of %d times"
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
msgid ", ending on "
msgstr ", ending on "
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
msgid "<b>Starts:</b> "
msgstr "<b>Starts:</b> "
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
msgid "<b>Ends:</b> "
msgstr "<b>Ends:</b> "
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
msgid "<b>Completed:</b> "
msgstr "<b>Completed:</b> "
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
msgid "<b>Due:</b> "
msgstr "<b>Due:</b> "
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
msgid "iCalendar Information"
msgstr "iCalendar Information"
#. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: 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 "An unknown person"
-#: calendar/gui/e-itip-control.c:904
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:903
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -5987,301 +5696,305 @@ msgstr ""
"<br> Please review the following information, and then select an action from "
"the menu below."
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
msgid "<i>None</i>"
msgstr "<i>None</i>"
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Location:"
+
+#: 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 "Accepted"
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: 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 "Declined"
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: 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 "Choose an action:"
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
msgid "Update"
msgstr "Update"
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 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 "OK"
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
msgid "Accept"
msgstr "Accept"
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
msgid "Decline"
msgstr "Decline"
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
msgid "Update respondent status"
msgstr "Update respondent status"
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: calendar/gui/e-itip-control.c:1110 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 "Cancel"
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> has published meeting information."
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
msgid "Meeting Information"
msgstr "Meeting Information"
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> requests the presence of %s at a meeting."
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> requests your presence at a meeting."
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> wishes to add to an existing meeting."
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
msgid "Meeting Update"
msgstr "Meeting Update"
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> wishes to receive the latest meeting information."
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> has replied to a meeting request."
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> has cancelled a meeting."
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
msgid "Meeting Cancellation"
msgstr "Meeting Cancellation"
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: 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 "<b>%s</b> has sent an unintelligible message."
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> has published task information."
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
msgid "Task Information"
msgstr "Task Information"
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> requests %s to perform a task."
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> requests you perform a task."
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
msgid "Task Proposal"
msgstr "Task Proposal"
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> wishes to add to an existing task."
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
msgid "Task Update"
msgstr "Task Update"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> wishes to receive the latest task information."
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
msgid "Task Update Request"
msgstr "Task Update Request"
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> has replied to a task assignment."
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
msgid "Task Reply"
msgstr "Task Reply"
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> has cancelled a task."
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
msgid "Task Cancellation"
msgstr "Task Cancellation"
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> has published free/busy information."
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> requests your free/busy information."
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> has replied to a free/busy request."
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
msgid "The message does not appear to be properly formed"
msgstr "The message does not appear to be properly formed"
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
msgid "The attachment does not contain a valid calendar message"
msgstr "The attachment does not contain a valid calendar message"
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
msgid "Update complete\n"
msgstr "Update complete\n"
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: 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 "Attendee status can not be updated because the item no longer exists"
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "This response is not from a current attendee. Add as an attendee?"
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "Attendee status could not be updated because of an invalid status!\n"
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
msgid "There was an error on the CORBA system\n"
msgstr "There was an error on the CORBA system\n"
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
msgid "Object could not be found\n"
msgstr "Object could not be found\n"
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
msgid "You don't have the right permissions to update the calendar\n"
msgstr "You don't have the right permissions to update the calendar\n"
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
msgid "Attendee status could not be updated!\n"
msgstr "Attendee status could not be updated!\n"
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
msgid "Removal Complete"
msgstr "Removal Complete"
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
@@ -6322,74 +6035,74 @@ msgstr "date-end"
msgid "date-start"
msgstr "date-start"
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
msgid "Chair Persons"
msgstr "Chair Persons"
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
msgid "Required Participants"
msgstr "Required Participants"
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
msgid "Optional Participants"
msgstr "Optional Participants"
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
msgid "Resources"
msgstr "Resources"
-#: calendar/gui/e-meeting-list-view.c:141 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 "Individual"
-#: calendar/gui/e-meeting-list-view.c:142 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 "Group"
-#: calendar/gui/e-meeting-list-view.c:143 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 "Resource"
-#: calendar/gui/e-meeting-list-view.c:144 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 "Room"
-#: calendar/gui/e-meeting-list-view.c:155 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 "Chair"
-#: calendar/gui/e-meeting-list-view.c:156 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 "Required Participant"
-#: calendar/gui/e-meeting-list-view.c:157 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 "Optional Participant"
-#: calendar/gui/e-meeting-list-view.c:158 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 "Non-Participant"
-#: calendar/gui/e-meeting-list-view.c:180 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 "Needs Action"
-#: calendar/gui/e-meeting-list-view.c:183 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 "Tentative"
-#: calendar/gui/e-meeting-list-view.c:184 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 "Delegated"
@@ -6406,20 +6119,28 @@ msgstr "Out of Office"
msgid "No Information"
msgstr "No Information"
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Add Sender to Address_book"
+
#: calendar/gui/e-meeting-time-sel.c:440
msgid "_Options"
msgstr "_Options"
#: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
msgstr "Show _Only Working Hours"
#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
msgstr "Show _Zoomed Out"
#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
msgstr "_Update Free/Busy"
#: calendar/gui/e-meeting-time-sel.c:497
@@ -6435,19 +6156,23 @@ msgid ">_>"
msgstr ">_>"
#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
msgstr "_All People and Resources"
#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
msgstr "All _People and One Resource"
#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
msgstr "_Required People"
#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
msgstr "Required People and _One Resource"
#: calendar/gui/e-meeting-time-sel.c:593
@@ -6467,10 +6192,6 @@ msgstr "%A, %B %d, %Y"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
#: calendar/gui/e-meeting-time-sel.c:2093
#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6479,10 +6200,6 @@ msgstr "%a %d/%m/%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
@@ -6493,7 +6210,7 @@ msgstr "%d/%m/%Y"
msgid "Enter the password for %s"
msgstr "Enter the password for %s"
-#: 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"
@@ -6502,19 +6219,14 @@ msgstr ""
"Error on %s:\n"
" %s"
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "The task backend for '%s' has crashed."
-
#. 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 "Opening tasks at %s"
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
#, c-format
msgid ""
"Error opening %s:\n"
@@ -6523,52 +6235,47 @@ msgstr ""
"Error opening %s:\n"
"%s"
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
msgid "Loading tasks"
msgstr "Loading tasks"
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
msgid "Expunging"
msgstr "Expunging"
-#: 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 "Tasks"
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "The calendar backend for '%s' has crashed."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
msgid "Purging"
msgstr "Purging"
@@ -6765,7 +6472,7 @@ msgid "On The Web"
msgstr "On The Web"
#. 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 "Unable to migrate old settings from evolution/config.xmldb"
@@ -6776,7 +6483,7 @@ msgid "Unable to migrate calendar `%s'"
msgstr "Unable to migrate calendar `%s'"
#. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Unable to migrate tasks `%s'"
@@ -7012,43 +6719,43 @@ msgstr "Print Item"
msgid "Print Setup"
msgstr "Print Setup"
-#: 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 "Task List '%s' will be removed. Are you sure you want to continue?"
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
msgid "New Task List"
msgstr "New Task List"
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d task"
msgstr[1] "%d tasks"
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ", %d selected"
msgstr[1] ", %d selected"
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
msgid "Failed upgrading tasks."
msgstr "Failed upgrading tasks."
-#: 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 "Unable to open the task list '%s' for creating events and meetings"
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
msgid "There is no calendar available for creating tasks"
msgstr "There is no calendar available for creating tasks"
-#: 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."
@@ -7056,27 +6763,27 @@ msgstr ""
"Events cannot be created in a read-only calendar. Please select a read-write "
"calendar."
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
msgid "New task"
msgstr "New task"
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
msgid "_Task"
msgstr "_Task"
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
msgid "Create a new task"
msgstr "Create a new task"
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
msgid "New tasks group"
msgstr "New tasks group"
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
msgid "_Tasks Group"
msgstr "_Tasks Group"
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
msgid "Create a new tasks group"
msgstr "Create a new tasks group"
@@ -8902,15 +8609,15 @@ msgstr "(match-threads) not allowed inside match-all"
msgid "(match-threads) requires a match type string"
msgstr "(match-threads) requires a match type string"
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
msgid "(match-threads) expects an array result"
msgstr "(match-threads) expects an array result"
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
msgid "(match-threads) requires the folder set"
msgstr "(match-threads) requires the folder set"
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "Performing query on unknown header: %s"
@@ -8945,7 +8652,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:705
+#: 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 "Cancelled."
@@ -9322,7 +9030,7 @@ msgstr "The referenced credentials have expired."
#: 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:1243
+#: camel/providers/imap/camel-imap-store.c:1240
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
@@ -9682,40 +9390,40 @@ msgstr "import keys: unimplemented"
msgid "export keys: unimplemented"
msgstr "export keys: unimplemented"
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Cannot get folder: Invalid operation on this store"
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
#, c-format
msgid "Cannot create folder `%s': folder exists"
msgstr "Cannot create folder `%s': folder exists"
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Cannot create folder: Invalid operation on this store"
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Cannot create folder: %s: folder exists"
-#: camel/camel-store.c:391 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 "Cannot delete folder: %s: Invalid operation"
-#: camel/camel-store.c:441 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 "Cannot rename folder: %s: Invalid operation"
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
msgid "Trash"
msgstr "Trash"
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 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 "Junk"
@@ -9946,12 +9654,12 @@ msgstr "No such message %s in %s"
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Cannot copy or move messages into a Virtual Folder"
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Cannot 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 "Cannot rename folder: %s: No such folder"
@@ -10016,8 +9724,8 @@ msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"This option will connect to the IMAP server using a plaintext password."
-#: 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 "Checklist"
@@ -10145,23 +9853,23 @@ msgstr ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
#: 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 "IMAP server %s"
#: 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 "IMAP service for %s on %s"
#: camel/providers/imap4/camel-imap4-store.c:208
#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: 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
@@ -10170,18 +9878,18 @@ msgid "Could not connect to %s (port %d): %s"
msgstr "Could not connect to %s (port %d): %s"
#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
msgstr "SSL unavailable"
#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: 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 "Connection cancelled"
@@ -10196,8 +9904,8 @@ msgstr ""
"STARTTLS"
#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Failed to connect to IMAP server %s in secure mode: %s"
@@ -10206,7 +9914,7 @@ msgstr "Failed to connect to IMAP server %s in secure mode: %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:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
msgid "Unknown error"
msgstr "Unknown error"
@@ -10233,8 +9941,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1890
-#: camel/providers/imap/camel-imap-store.c:2268
+#: 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\""
@@ -10312,12 +10020,12 @@ msgstr "IMAP server %s unexpectedly disconnected: %s"
#: 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:3201
+#: camel/providers/imap/camel-imap-store.c:3194
msgid "Operation cancelled"
msgstr "Operation cancelled"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3204
+#: camel/providers/imap/camel-imap-store.c:3197
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %s"
@@ -10398,7 +10106,7 @@ msgstr "No such message"
#: camel/providers/imap/camel-imap-folder.c:2019
#: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
msgid "This message is not currently available"
msgstr "This message is not currently available"
@@ -10482,43 +10190,43 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "For reading and storing mail on IMAP servers."
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr "SSL/TLS extension not supported."
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr "SSL negotiations failed"
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not connect with command \"%s\": %s"
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1272
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP server %s does not support requested authentication type %s"
-#: camel/providers/imap/camel-imap-store.c:1285
+#: 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 "No support for authentication type %s"
-#: camel/providers/imap/camel-imap-store.c:1308
+#: 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 "%sPlease enter the IMAP password for %s@%s"
-#: camel/providers/imap/camel-imap-store.c:1322
+#: camel/providers/imap/camel-imap-store.c:1319
msgid "You didn't enter a password."
msgstr "You didn't enter a password."
-#: camel/providers/imap/camel-imap-store.c:1351
+#: camel/providers/imap/camel-imap-store.c:1348
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10529,18 +10237,18 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1872
-#: camel/providers/imap/camel-imap-store.c:2062
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: camel/providers/imap/camel-imap-store.c:1948
-#: camel/providers/imap/camel-imap-store.c:2329
+#: 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 "The parent folder is not allowed to contain subfolders"
-#: camel/providers/imap/camel-imap-store.c:2003
+#: 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
@@ -10548,7 +10256,7 @@ msgstr "The parent folder is not allowed to contain subfolders"
msgid "Cannot create folder `%s': folder exists."
msgstr "Cannot create folder `%s': folder exists."
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2274
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
@@ -10584,20 +10292,20 @@ msgid "Index message body data"
msgstr "Index message body data"
#. $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 "~%s (%s)"
#. /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
#, c-format
msgid "mailbox:%s (%s)"
msgstr "mailbox:%s (%s)"
#. 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 "%s (%s)"
@@ -10657,7 +10365,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"
@@ -10789,9 +10497,9 @@ msgstr "Could not delete folder `%s': %s"
msgid "not a maildir directory"
msgstr "not a maildir directory"
-#: 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 "Could not scan folder `%s': %s"
@@ -10848,7 +10556,7 @@ msgid "Message construction failed."
msgstr "Message construction failed."
#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
msgid "Cannot create a folder by this name."
msgstr "Cannot create a folder by this name."
@@ -10878,30 +10586,30 @@ msgstr "`%s' is not a regular file."
msgid "Folder `%s' is not empty. Not deleted."
msgstr "Folder `%s' is not empty. Not deleted."
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
#, c-format
msgid "Cannot create directory `%s': %s."
msgstr "Cannot create directory `%s': %s."
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Cannot create folder: %s: %s"
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
msgid "Folder already exists"
msgstr "Folder already exists"
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
msgid "The new folder name is illegal."
msgstr "The new folder name is illegal."
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
#, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "Could not rename `%s': `%s': %s"
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Could not rename '%s' to %s: %s"
@@ -11092,7 +10800,7 @@ msgstr ""
"Folder may be corrupt, copy saved in `%s'"
#: 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 "Please enter the NNTP password for %s@%s"
@@ -11109,18 +10817,10 @@ msgstr "Failed to send username to server"
msgid "Server rejected username/password"
msgstr "Server rejected username/password"
-#: 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 "User cancelled"
-
-#: 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
@@ -11129,60 +10829,49 @@ msgstr "User cancelled"
msgid "Cannot get message %s: %s"
msgstr "Cannot get message %s: %s"
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: 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 "User cancelled"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
#, c-format
msgid "Internal error: uid in invalid format: %s"
msgstr "Internal error: uid in invalid format: %s"
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Could not get article %s from NNTP server"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Posting not allowed by news server"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
#: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Failed to send newsgroups header: %s: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Error posting to newsgroup: %s: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Error reading response to posted message: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Error posting message: %s: message not posted"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Operation failed: %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 "You cannot post NNTP messages while working offline!"
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
msgid "You cannot copy messages from a NNTP folder!"
msgstr "You cannot copy messages from a NNTP folder!"
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
msgid "Could not get group list from server."
msgstr "Could not get group list from server."
-#: 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 "Unable to load grouplist file for %s: %s"
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
#, c-format
msgid "Unable to save grouplist file for %s: %s"
msgstr "Unable to save grouplist file for %s: %s"
@@ -11213,26 +10902,29 @@ msgstr ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
-#: 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 "NNTP Command failed: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
#, c-format
msgid "Could not read greeting from %s: %s"
msgstr "Could not read greeting from %s: %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 "NNTP server %s returned error code %d: %s"
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
#, c-format
msgid "USENET News via %s"
msgstr "USENET News via %s"
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Stream error"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -11243,7 +10935,7 @@ msgstr ""
"\n"
"%s"
-#: 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"
@@ -11253,7 +10945,7 @@ msgstr ""
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
-#: 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"
@@ -11263,58 +10955,59 @@ msgstr ""
"\n"
"newsgroup does not exist!"
-#: 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 "You cannot create a folder in a News store: subscribe instead."
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
msgid "You cannot rename a folder in a News store."
msgstr "You cannot rename a folder in a News store."
-#: 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 "You cannot remove a folder in a News store: unsubscribe instead."
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Connection error: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "No such folder: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Authentication required"
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Could not get group: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Cannot authenticate to IMAP server %s using %s"
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "Could not get messages: unspecified error"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "No contacts"
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP Command failed: %s"
+msgid "No such folder: %s"
+msgstr "No such folder: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Unknown server response: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Unexpected response from IMAP server: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Unexpected response from GnuPG: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
msgid "Use cancel"
msgstr "Use cancel"
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
@@ -11789,19 +11482,19 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: 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 "attachment"
-#: 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 "Remove selected items from the attachment list"
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
msgid "Add attachment..."
msgstr "Add attachment..."
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
msgid "Attach a file to the message"
msgstr "Attach a file to the message"
@@ -12009,17 +11702,19 @@ msgstr "Attach file(s)"
#. mail-composer:no-attach primary
#: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
msgstr "You cannot attach the file `${0}' to this message."
#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
#. 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."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
msgstr "The file `${0}' is not a regular file and cannot be sent in a message."
#. mail-composer:attach-directory primary
@@ -12113,7 +11808,8 @@ msgstr "Could not create message."
#. mail-composer:no-build-message secondary
#: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
msgstr "Because \"${0}\", you may need to select different mail options."
#. mail-composer:no-sig-file primary
@@ -12122,9 +11818,11 @@ msgid "Could not read signature file \"{0}\"."
msgstr "Could not read signature file \"{0}\"."
#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "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 "Because \"{1}\"."
#. mail-composer:all-accounts-deleted primary
#: composer/mail-composer-errors.xml.h:40
@@ -12287,16 +11985,12 @@ msgstr "Sync Categories:"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
@@ -12348,31 +12042,23 @@ msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
@@ -12469,7 +12155,6 @@ msgid "Missing file name."
msgstr "Missing file name."
#. filter:no-file secondary
-#. filter:bad-file secondary
#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
msgid "You must specify a file name."
msgstr "You must specify a file name."
@@ -12500,7 +12185,6 @@ msgid "Could not compile regular expression \"{1}\"."
msgstr "Could not compile regular expression \"{1}\"."
#. filter:no-name primary
-#. filter:no-name-vfolder primary
#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
msgid "Missing name."
msgstr "Missing name."
@@ -12530,6 +12214,7 @@ msgstr "Please choose another name."
msgid "No sources selected."
msgstr "No sources selected."
+#. filter:vfolder-no-source secondary
#: filter/filter-errors.xml.h:36
msgid ""
"You must specify at least one folder as a source.\n"
@@ -12643,8 +12328,8 @@ msgstr "with all local folders"
msgid "years"
msgstr "years"
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
msgid "Important"
msgstr "Important"
@@ -12708,252 +12393,6 @@ msgstr "incoming"
msgid "outgoing"
msgstr "outgoing"
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Adjust Score"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Assign Colour"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Assign Score"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Attachments"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Beep"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contains"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copy to Folder"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Date received"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Date sent"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Deleted"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "does not contain"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "does not end with"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "does not exist"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "does not return"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "does not sound like"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "does not start with"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Do Not Exist"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Draft"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "ends with"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Exist"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "exists"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expression"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Follow Up"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "is after"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "is before"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "is Flagged"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "is greater than"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "is less than"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "is not"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "is not Flagged"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Junk Test"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Mailing list"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Message Body"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Message Header"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Message is Junk"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Message is not Junk"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Move to Folder"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Pipe to Program"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Play Sound"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Read"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Recipients"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regex Match"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Replied to"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "returns"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "returns greater than"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "returns less than"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Run Program"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Sender"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Set Status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Size (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "sounds like"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Source Account"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Specific header"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "starts with"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Stop Processing"
-
-#: 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 "Subject"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Unset Status"
-
#: filter/rule-editor.c:285
msgid "Add Rule"
msgstr "Add Rule"
@@ -12970,6 +12409,11 @@ msgstr "Rule name"
msgid "_Score Rules"
msgstr "_Score Rules"
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
#: filter/searchtypes.xml.h:1
msgid "Body contains"
msgstr "Body contains"
@@ -13048,13 +12492,13 @@ msgstr "Signature(s)"
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
msgid "an unknown sender"
msgstr "an unknown sender"
#. 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 "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
@@ -13092,8 +12536,8 @@ msgstr "<click here to select a folder>"
msgid "Create New Folder"
msgstr "Create New Folder"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: 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 "Specify where to create the folder:"
@@ -13107,96 +12551,97 @@ msgstr "Create"
msgid "Folder _name:"
msgstr "Folder _name:"
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: 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 "_Copy to Folder"
-#: 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 "_Move to Folder"
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: 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 "_Move"
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: 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 "Select folder"
-#: 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 "C_opy"
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
#, c-format
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
msgid "Create folder"
msgstr "Create folder"
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Rename the \"%s\" folder to:"
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
msgid "Rename Folder"
msgstr "Rename Folder"
-#: mail/em-folder-tree.c:2550 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 "_View"
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
msgid "Open in _New Window"
msgstr "Open in _New Window"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
msgid "_New Folder..."
msgstr "_New Folder..."
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
msgid "_Rename"
msgstr "_Rename"
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "_Properties..."
@@ -13215,14 +12660,14 @@ msgstr "UNMATCHED"
msgid "Inbox"
msgstr "Inbox"
-#: 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 "Loading..."
#: 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:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
msgid "Mail"
msgstr "Mail"
@@ -13303,6 +12748,10 @@ msgstr "Mo_ve to Folder..."
msgid "_Copy to Folder..."
msgstr "_Copy to Folder..."
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
#: mail/em-folder-view.c:932
msgid "Add Sender to Address_book"
msgstr "Add Sender to Address_book"
@@ -13396,6 +12845,12 @@ msgstr "Cc"
msgid "Bcc"
msgstr "Bcc"
+#: 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 "Subject"
+
#: 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"
@@ -13598,7 +13053,7 @@ msgstr ""
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
msgid "_View Certificate"
msgstr "_View Certificate"
@@ -14325,15 +13780,15 @@ msgid "Evolution is importing your old Elm mail"
msgstr "Evolution is importing your old Elm mail"
#: 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 "Importing..."
#: 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 "Please wait"
@@ -14355,21 +13810,23 @@ msgid "Elm"
msgstr "Elm"
#: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
msgid "Destination folder:"
msgstr "Destination folder:"
#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder to import into"
msgstr "Select folder to import into"
-#: 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 "Importing `%s'"
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
#: mail/importers/mail-importer.c:140
msgid "Importing mailbox"
msgstr "Importing mailbox"
@@ -14571,66 +14028,66 @@ msgstr "%s mailing list"
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
#, c-format
msgid "%d deleted"
msgstr "%d deleted"
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
#, c-format
msgid "%d junk"
msgstr "%d junk"
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
#, c-format
msgid "%d drafts"
msgstr "%d drafts"
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
#, c-format
msgid "%d sent"
msgstr "%d sent"
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
#, c-format
msgid "%d unsent"
msgstr "%d unsent"
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
#, c-format
msgid "%d total"
msgstr "%d total"
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
#, c-format
msgid ", %d unread"
msgstr ", %d unread"
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
msgid "New Mail Message"
msgstr "New Mail Message"
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
msgid "_Mail Message"
msgstr "_Mail Message"
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
@@ -15334,6 +14791,7 @@ msgstr ""
msgid "Are you sure you want to send a message in HTML format?"
msgstr "Are you sure you want to send a message in HTML format?"
+#. mail:ask-send-html secondary
#: mail/mail-errors.xml.h:12
msgid ""
"Please make sure the following recipients are willing and able to receive "
@@ -15366,11 +14824,11 @@ msgstr ""
"an idea of the topic of your letter."
#. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
msgid "Are you sure you want to send a message with only BCC recipients?"
msgstr "Are you sure you want to send a message with only BCC recipients?"
+#. mail:ask-send-only-bcc-contact secondary
#: mail/mail-errors.xml.h:24
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
@@ -15444,7 +14902,6 @@ msgstr ""
"folder \"{0}\"?"
#. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
msgid "If you continue, you will not be able to recover these messages."
msgstr "If you continue, you will not be able to recover these messages."
@@ -15482,9 +14939,11 @@ msgstr ""
#. mail:camel-exception primary
#: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#, fuzzy
+msgid "Your message with the subject \"{0}\" was not delivered."
msgstr "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:camel-exception secondary
#: mail/mail-errors.xml.h:59
msgid ""
"The message was sent via the \"sendmail\" external application. Sendmail "
@@ -15518,13 +14977,6 @@ msgid "{0}."
msgstr "{0}."
#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15547,14 +14999,7 @@ msgstr "Error loading filter definitions."
msgid "Cannot save to directory \"{0}\"."
msgstr "Cannot save to directory \"{0}\"."
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
#. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
msgid "Cannot save to file \"{0}\"."
@@ -15570,15 +15015,6 @@ msgstr "Cannot create the save directory, because \"{1}\""
msgid "Cannot create temporary save directory."
msgstr "Cannot create temporary save directory."
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file 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 "Because \"{1}\"."
-
#. mail:no-write-path-exists secondary
#: mail/mail-errors.xml.h:104
msgid "File exists but cannot overwrite it."
@@ -15600,7 +15036,6 @@ msgid "Cannot delete system folder \"{0}\"."
msgstr "Cannot delete system folder \"{0}\"."
#. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
@@ -15634,13 +15069,11 @@ msgstr ""
"will be deleted permanently."
#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "Cannot rename \"{0}\" to \"{1}\"."
#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "A folder named \"{1}\" already exists. Please use a different name."
@@ -15651,25 +15084,21 @@ msgid "Because \"{2}\"."
msgstr "Because \"{2}\"."
#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "Cannot move folder \"{0}\" to \"{1}\"."
#. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
msgid "Cannot open source \"{2}\"."
msgstr "Cannot open source \"{2}\"."
#. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
msgid "Cannot open target \"{2}\"."
msgstr "Cannot open target \"{2}\"."
#. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15685,7 +15114,6 @@ msgid "Cannot open source \"{1}\""
msgstr "Cannot open source \"{1}\""
#. mail:account-incomplete primary
-#. mail:account-notunique primary
#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
msgid "Cannot save changes to account."
msgstr "Cannot save changes to account."
@@ -15782,6 +15210,7 @@ msgstr "Cannot add vFolder \"{0}\"."
msgid "vFolders automatically updated."
msgstr "vFolders automatically updated."
+#. mail:vfolder-updated secondary
#: mail/mail-errors.xml.h:196
msgid ""
"The following vFolder(s):\n"
@@ -15801,6 +15230,7 @@ msgstr ""
msgid "Mail filters automatically updated."
msgstr "Mail filters automatically updated."
+#. mail:filter-updated secondary
#: mail/mail-errors.xml.h:204
msgid ""
"The following filter rule(s):\n"
@@ -15820,6 +15250,7 @@ msgstr ""
msgid "Problem migrating old mail folder \"{0}\"."
msgstr "Problem migrating old mail folder \"{0}\"."
+#. mail:ask-migrate-existing secondary
#: mail/mail-errors.xml.h:212
msgid ""
"A non-empty folder at \"{1}\" already exists.\n"
@@ -15844,7 +15275,7 @@ msgstr "_Overwrite"
msgid "_Append"
msgstr "_Append"
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
#, c-format
msgid "Pinging %s"
msgstr "Pinging %s"
@@ -16284,6 +15715,10 @@ msgstr "Forward"
msgid "No Response Necessary"
msgstr "No Response Necessary"
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Read"
+
#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr "Reply"
@@ -16387,43 +15822,47 @@ msgstr ""
"List of paths for the folders to be synchronized to disk for offline usage"
#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
msgid "Whether Evolution should start up in offline mode"
msgstr "Whether Evolution should start up in offline mode"
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 "Whether to skip the development warning dialog"
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
msgid "mail"
msgstr "mail"
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Brought to you by"
-
-#: 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 "%ld KB"
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
msgid "Uknown system error."
msgstr "Uknown system error."
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
msgid "Invalid arguments"
msgstr "Invalid arguments"
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
msgid "Cannot register on OAF"
msgstr "Cannot register on OAF"
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
msgid "Configuration Database not found"
msgstr "Configuration Database not found"
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
msgid "Generic error"
msgstr "Generic error"
@@ -16482,7 +15921,7 @@ msgstr ""
msgid "Select importer"
msgstr "Select importer"
-#: 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 "File %s does not exist"
@@ -16510,31 +15949,32 @@ msgstr ""
"Importing %s\n"
"Importing item 1."
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
msgid "Automatic"
msgstr "Automatic"
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Filename:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "File name:"
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
msgid "Select a file"
msgstr "Select a file"
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
msgid "File _type:"
msgstr "File _type:"
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
msgid "Import data and settings from _older programs"
msgstr "Import data and settings from _older programs"
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
msgid "Import a _single file"
msgstr "Import a _single file"
-#: 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"
@@ -16542,25 +15982,25 @@ msgstr ""
"Please wait...\n"
"Scanning for existing setups"
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
msgid "Starting Intelligent Importers"
msgstr "Starting Intelligent Importers"
-#: 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 "From %s:"
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
#, c-format
msgid "No importer available for file %s"
msgstr "No importer available for file %s"
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
msgid "Unable to execute importer"
msgstr "Unable to execute importer"
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
msgid "_Import"
msgstr "_Import"
@@ -16610,53 +16050,54 @@ msgstr "Folder name cannot contain the character \"#\"."
msgid "'.' and '..' are reserved folder names."
msgstr "'.' and '..' are reserved folder names."
-#: 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 "Evolution is currently online. Click on this button to work offline."
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
msgid "Evolution is in the process of going offline."
msgstr "Evolution is in the process of going offline."
-#: 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 "Evolution is currently offline. Click on this button to work online."
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
#, c-format
msgid "Switch to %s"
msgstr "Switch to %s"
-#: 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 "The GNOME Pilot tools do not appear to be installed on this system."
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
#, c-format
msgid "Error executing %s."
msgstr "Error executing %s."
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
msgid "Bug buddy is not installed."
msgstr "Bug buddy is not installed."
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
msgid "Bug buddy could not be run."
msgstr "Bug buddy could not be run."
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "About Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
msgid "_Work Online"
msgstr "_Work Online"
-#: 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 "_Work Offline"
-#: 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 "Work Offline"
@@ -16840,8 +16281,9 @@ msgstr "Don't ask me again"
msgid "Evolution can import data from the following files:"
msgstr "Evolution can import data from the following files:"
+#. Preview/Alpha/Beta version warning message
#: shell/main.c:231
-#, c-format
+#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
"of the Evolution groupware suite.\n"
@@ -16929,6 +16371,7 @@ msgstr ""
msgid "Insufficient disk space for upgrade."
msgstr "Insufficient disk space for upgrade."
+#. shell:upgrade-nospace secondary
#: shell/shell-errors.xml.h:4
msgid ""
"Upgrading your data and settings will require upto {0} of disk space, but "
@@ -16943,6 +16386,7 @@ msgstr ""
"You will need to make more space available in your home directory before you "
"can continue."
+#. shell:upgrade-failed primary
#: shell/shell-errors.xml.h:8
msgid ""
"Upgrade from previous version failed:\n"
@@ -16951,6 +16395,7 @@ msgstr ""
"Upgrade from previous version failed:\n"
"{0}"
+#. shell:upgrade-failed secondary
#: shell/shell-errors.xml.h:11
msgid ""
"{1}\n"
@@ -16968,17 +16413,16 @@ msgid "Continue"
msgstr "Continue"
#. shell:noshell title
-#. shell:noshell-reason title
#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
msgid "Cannot start Evolution"
msgstr "Cannot start Evolution"
#. shell:noshell primary
-#. shell:noshell-reason primary
#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
msgid "Evolution can not start."
msgstr "Evolution cannot start."
+#. shell:noshell secondary
#: shell/shell-errors.xml.h:21
msgid ""
"Your system configuration does not match your Evolution configuration.\n"
@@ -16989,6 +16433,7 @@ msgstr ""
"\n"
"Click help for details"
+#. shell:noshell-reason secondary
#: shell/shell-errors.xml.h:29
msgid ""
"Your system configuration does not match your Evolution configuration:\n"
@@ -17003,30 +16448,30 @@ msgstr ""
"\n"
"Click help for details."
-#: 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 "Select a cert to import..."
-#: 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
msgid "Certificate Name"
msgstr "Certificate Name"
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
msgid "Purposes"
msgstr "Purposes"
-#: 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 "Serial Number"
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
msgid "Expires"
msgstr "Expires"
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
msgid "E-Mail Address"
msgstr "E-Mail Address"
@@ -17128,7 +16573,7 @@ msgstr ""
"Before trusting this CA for any purpose, you should examine its certificate "
"and its policy and procedures (if available)."
-#: 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
msgid "Certificate"
msgstr "Certificate"
@@ -17148,19 +16593,23 @@ msgstr "Common Name (CN)"
msgid "Contact Certificates"
msgstr "Contact Certificates"
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "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 "Dummy window only"
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
msgid "Edit"
msgstr "Edit"
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Email Certificate Authority"
+
#: smime/gui/smime-ui.glade.h:24
msgid "Email Recipient Certificate"
msgstr "Email Recipient Certificate"
@@ -17193,243 +16642,254 @@ msgstr "Organizational Unit (OU)"
msgid "SHA1 Fingerprint"
msgstr "SHA1 Fingerprint"
-#: 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 "SSL Client Certificate"
-#: 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 "SSL Server Certificate"
#: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
msgid "Trust this CA to identify email users."
msgstr "Trust this CA to identify email users."
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
msgid "Trust this CA to identify software developers."
msgstr "Trust this CA to identify software developers."
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
msgid "Trust this CA to identify web sites."
msgstr "Trust this CA to identify web sites."
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
msgid "View"
msgstr "View"
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "View Certificate"
-
#: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "You have been asked to trust a new Certificate Authority (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
msgid "You have certificates from these organizations that identify you:"
msgstr "You have certificates from these organizations that identify you:"
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr ""
"You have certificates on file that identify these certificate authorities:"
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
msgid "You have certificates on file that identify these people:"
msgstr "You have certificates on file that identify these people:"
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
msgid "Your Certificates"
msgstr "Your Certificates"
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
msgid "%d/%m/%Y"
msgstr "%d/%m/%Y"
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Signing"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Encrypted"
+
+#: smime/lib/e-cert.c:530
msgid "Version"
msgstr "Version"
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
msgid "Version 1"
msgstr "Version 1"
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
msgid "Version 2"
msgstr "Version 2"
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
msgid "Version 3"
msgstr "Version 3"
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr "PKCS #1 MD2 With RSA Encryption"
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr "PKCS #1 MD5 With RSA Encryption"
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "PKCS #1 SHA-1 With RSA Encryption"
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
msgid "C"
msgstr "C"
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
msgid "CN"
msgstr "CN"
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
msgid "OU"
msgstr "OU"
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
msgid "O"
msgstr "O"
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
msgid "L"
msgstr "L"
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
msgid "DN"
msgstr "DN"
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
msgid "DC"
msgstr "DC"
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
msgid "ST"
msgstr "ST"
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA Encryption"
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
msgid "Certificate Key Usage"
msgstr "Certificate Key Usage"
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
msgid "Netscape Certificate Type"
msgstr "Netscape Certificate Type"
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
msgid "Certificate Authority Key Identifier"
msgstr "Certificate Authority Key Identifier"
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
msgid "UID"
msgstr "UID"
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
#, c-format
msgid "Object Identifier (%s)"
msgstr "Object Identifier (%s)"
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
msgid "Algorithm Identifier"
msgstr "Algorithm Identifier"
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
msgid "Algorithm Parameters"
msgstr "Algorithm Parameters"
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
msgid "Subject Public Key Info"
msgstr "Subject Public Key Info"
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
msgid "Subject Public Key Algorithm"
msgstr "Subject Public Key Algorithm"
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
msgid "Subject's Public Key"
msgstr "Subject's Public Key"
-#: 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 "Error: Unable to process extension"
-#: 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 "Object Signer"
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
msgid "SSL Certificate Authority"
msgstr "SSL Certificate Authority"
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
msgid "Email Certificate Authority"
msgstr "Email Certificate Authority"
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
msgid "Signing"
msgstr "Signing"
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
msgid "Non-repudiation"
msgstr "Non-repudiation"
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
msgid "Key Encipherment"
msgstr "Key Encipherment"
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
msgid "Data Encipherment"
msgstr "Data Encipherment"
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
msgid "Key Agreement"
msgstr "Key Agreement"
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
msgid "Certificate Signer"
msgstr "Certificate Signer"
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
msgid "CRL Signer"
msgstr "CRL Signer"
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
msgid "Critical"
msgstr "Critical"
-#: 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 "Not Critical"
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
msgid "Extensions"
msgstr "Extensions"
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
msgid "Certificate Signature Algorithm"
msgstr "Certificate Signature Algorithm"
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
msgid "Issuer"
msgstr "Issuer"
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
msgid "Issuer Unique ID"
msgstr "Issuer Unique ID"
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
msgid "Subject Unique ID"
msgstr "Subject Unique ID"
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
@@ -17579,7 +17039,7 @@ msgstr "View the current contact"
#: 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 "_Actions"
@@ -17738,7 +17198,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 "Close"
@@ -17751,7 +17211,7 @@ msgid "Delete this item"
msgstr "Delete this item"
#: 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 "Main toolbar"
@@ -17794,7 +17254,7 @@ msgstr "Save this item to disk"
#: 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 "_File"
@@ -18052,13 +17512,13 @@ msgstr "_Invert Selection"
msgid "_Threaded Message List"
msgstr "_Threaded Message List"
-#: 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 "Close this window"
#: 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 "_Close"
@@ -18454,7 +17914,7 @@ msgstr "_Previous Message"
msgid "_Quoted"
msgstr "_Quoted"
-#: 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 "_Tools"
@@ -18751,106 +18211,120 @@ msgid "_Open Task"
msgstr "_Open Task"
#: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "About Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "About Evolution"
#: ui/evolution.xml.h:2
msgid "Change Evolution's settings"
msgstr "Change Evolution's settings"
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Change the properties of this folder"
+
+#: ui/evolution.xml.h:6
msgid "Create a new window displaying this folder"
msgstr "Create a new window displaying this folder"
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
msgid "E_xit"
msgstr "E_xit"
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
msgid "Exit the program"
msgstr "Exit the program"
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
msgid "Forget _Passwords"
msgstr "Forget _Passwords"
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
msgid "Forget remembered passwords so you will be prompted for them again"
msgstr "Forget remembered passwords so you will be prompted for them again"
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
msgid "Import data from other programs"
msgstr "Import data from other programs"
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
msgid "New _Window"
msgstr "New _Window"
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
msgid "Pi_lot Settings..."
msgstr "Pi_lot Settings..."
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
msgid "Send / Receive"
msgstr "Send / Receive"
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
msgid "Send queued items and retrieve new items"
msgstr "Send queued items and retrieve new items"
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
msgid "Set up Pilot configuration"
msgstr "Set up Pilot configuration"
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
msgstr "Show information about Ximian Evolution"
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
msgid "Submit Bug Report"
msgstr "Submit Bug Report"
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
msgid "Submit _Bug Report"
msgstr "Submit _Bug Report"
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
msgid "Submit a bug report using Bug Buddy"
msgstr "Submit a bug report using Bug Buddy"
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Toggle whether we are working offline."
-
#: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Main toolbar"
#: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Toggle whether we are working offline."
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "About Evolution"
+
+#: ui/evolution.xml.h:30
msgid "_Help"
msgstr "_Help"
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
msgid "_Import..."
msgstr "_Import..."
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
msgid "_New"
msgstr "_New"
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
msgid "_Quick Reference"
msgstr "_Quick Reference"
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
msgid "_Send / Receive"
msgstr "_Send / Receive"
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
msgid "_Window"
msgstr "_Window"
@@ -19242,6 +18716,469 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Failed to connect to LDAP server"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Failed to authenticate with LDAP server"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Could not perform query on Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "The server responded with no supported search bases"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "This server does not support LDAPv3 schema information"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Error retrieving schema information"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Server did not respond with valid schema information"
+
+#~ msgid ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+#~ msgstr ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+
+#~ msgid " S_how Supported Bases "
+#~ msgstr " S_how Supported Bases "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Connecting"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Distinguished _name:"
+
+#~ msgid "Email address:"
+#~ msgstr "Email address:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution will use this DN to authenticate you with the server"
+
+#~ msgid "One"
+#~ msgstr "One"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "S_earch scope: "
+
+#~ msgid "Searching"
+#~ msgstr "Searching"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "This option controls how long a search will be run."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "U_se SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Display name:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Port number:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Search base:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Server name:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Timeout (minutes):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#~ msgid "Webcam:"
+#~ msgstr "Webcam:"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Category editor not available."
+
+#~ msgid "Unable to open addressbook"
+#~ msgstr "Unable to open addressbook"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Do you want to save changes?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Error saving %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Calendar Properties"
+
+#~ msgid "Remote"
+#~ msgstr "Remote"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Task List Properties"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Refresh Interval:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Source URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Are you sure you want to cancel and delete this meeting?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Are you sure you want to cancel and delete this task?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Are you sure you want to cancel and delete this journal entry?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Are you sure you want to delete the appointment `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Are you sure you want to delete this untitled appointment?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Are you sure you want to delete the task `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Are you sure you want to delete this untitled task?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Are you sure you want to delete the journal entry `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Are you sure want to delete this untitled journal entry?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Are you sure you want to delete %d appointment?"
+#~ msgstr[1] "Are you sure you want to delete %d appointments?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Are you sure you want to delete %d task?"
+#~ msgstr[1] "Are you sure you want to delete %d tasks?"
+
+#~ 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] "Are you sure you want to delete %d journal entry?"
+#~ msgstr[1] "Are you sure you want to delete %d journal entries?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Invite Others..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Discard Changes"
+
+#~ msgid "Save Event"
+#~ msgstr "Save Event"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "The meeting information has been created. Send it?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "The meeting information has changed. Send an updated version?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "The task assignment information has been created. Send it?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "The task information has changed. Send an updated version?"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "The task backend for '%s' has crashed."
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "The calendar backend for '%s' has crashed."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Could not get article %s from NNTP server"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Posting not allowed by news server"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr "Failed to send newsgroups header: %s: message not posted"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Error posting to newsgroup: %s: message not posted"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Error reading response to posted message: message not posted"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Error posting message: %s: message not posted"
+
+#~ msgid "Stream error"
+#~ msgstr "Stream error"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Connection error: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Could not get group: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Could not get messages: unspecified error"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Unknown server response: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Because \"${1}\"."
+
+#~ msgid "Adjust Score"
+#~ msgstr "Adjust Score"
+
+#~ msgid "Assign Color"
+#~ msgstr "Assign Colour"
+
+#~ msgid "Assign Score"
+#~ msgstr "Assign Score"
+
+#~ msgid "Attachments"
+#~ msgstr "Attachments"
+
+#~ msgid "Beep"
+#~ msgstr "Beep"
+
+#~ msgid "contains"
+#~ msgstr "contains"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Copy to Folder"
+
+#~ msgid "Date received"
+#~ msgstr "Date received"
+
+#~ msgid "Date sent"
+#~ msgstr "Date sent"
+
+#~ msgid "Deleted"
+#~ msgstr "Deleted"
+
+#~ msgid "does not contain"
+#~ msgstr "does not contain"
+
+#~ msgid "does not end with"
+#~ msgstr "does not end with"
+
+#~ msgid "does not exist"
+#~ msgstr "does not exist"
+
+#~ msgid "does not return"
+#~ msgstr "does not return"
+
+#~ msgid "does not sound like"
+#~ msgstr "does not sound like"
+
+#~ msgid "does not start with"
+#~ msgstr "does not start with"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Do Not Exist"
+
+#~ msgid "Draft"
+#~ msgstr "Draft"
+
+#~ msgid "ends with"
+#~ msgstr "ends with"
+
+#~ msgid "Exist"
+#~ msgstr "Exist"
+
+#~ msgid "exists"
+#~ msgstr "exists"
+
+#~ msgid "Expression"
+#~ msgstr "Expression"
+
+#~ msgid "Follow Up"
+#~ msgstr "Follow Up"
+
+#~ msgid "is"
+#~ msgstr "is"
+
+#~ msgid "is after"
+#~ msgstr "is after"
+
+#~ msgid "is before"
+#~ msgstr "is before"
+
+#~ msgid "is Flagged"
+#~ msgstr "is Flagged"
+
+#~ msgid "is greater than"
+#~ msgstr "is greater than"
+
+#~ msgid "is less than"
+#~ msgstr "is less than"
+
+#~ msgid "is not"
+#~ msgstr "is not"
+
+#~ msgid "is not Flagged"
+#~ msgstr "is not Flagged"
+
+#~ msgid "Junk Test"
+#~ msgstr "Junk Test"
+
+#~ msgid "Mailing list"
+#~ msgstr "Mailing list"
+
+#~ msgid "Message Body"
+#~ msgstr "Message Body"
+
+#~ msgid "Message Header"
+#~ msgstr "Message Header"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Message is Junk"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Message is not Junk"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Move to Folder"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Pipe to Program"
+
+#~ msgid "Play Sound"
+#~ msgstr "Play Sound"
+
+#~ msgid "Recipients"
+#~ msgstr "Recipients"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regex Match"
+
+#~ msgid "Replied to"
+#~ msgstr "Replied to"
+
+#~ msgid "returns"
+#~ msgstr "returns"
+
+#~ msgid "returns greater than"
+#~ msgstr "returns greater than"
+
+#~ msgid "returns less than"
+#~ msgstr "returns less than"
+
+#~ msgid "Run Program"
+#~ msgstr "Run Program"
+
+#~ msgid "Sender"
+#~ msgstr "Sender"
+
+#~ msgid "Set Status"
+#~ msgstr "Set Status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Size (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "sounds like"
+
+#~ msgid "Source Account"
+#~ msgstr "Source Account"
+
+#~ msgid "Specific header"
+#~ msgstr "Specific header"
+
+#~ msgid "starts with"
+#~ msgstr "starts with"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Stop Processing"
+
+#~ msgid "Unset Status"
+#~ msgstr "Unset Status"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Brought to you by"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Filename:"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Do you want to trust \"%s\" for the following purposes?"
+
+#~ msgid "View Certificate"
+#~ msgstr "View Certificate"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "You have been asked to trust a new Certificate Authority (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "About Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_About Ximian Evolution..."
+
#~ msgid "Job title:"
#~ msgstr "Job title:"