aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@src.gnome.org>2004-06-11 10:20:46 +0800
committerAdam Weinberger <adamw@src.gnome.org>2004-06-11 10:20:46 +0800
commitf1d2d8caa47470d301eef390b403e94600e444ba (patch)
treef6e08d85901e799c5a7e71a9e0d546d5eb6d3afa /po
parentf581a61e4a10320915a766530b9eb01ea4ee63ab (diff)
downloadgsoc2013-evolution-f1d2d8caa47470d301eef390b403e94600e444ba.tar
gsoc2013-evolution-f1d2d8caa47470d301eef390b403e94600e444ba.tar.gz
gsoc2013-evolution-f1d2d8caa47470d301eef390b403e94600e444ba.tar.bz2
gsoc2013-evolution-f1d2d8caa47470d301eef390b403e94600e444ba.tar.lz
gsoc2013-evolution-f1d2d8caa47470d301eef390b403e94600e444ba.tar.xz
gsoc2013-evolution-f1d2d8caa47470d301eef390b403e94600e444ba.tar.zst
gsoc2013-evolution-f1d2d8caa47470d301eef390b403e94600e444ba.zip
Updated Canadian English translation. Correct path error.
* en_CA.po: Updated Canadian English translation. * POTFILES.in: Correct path error. svn path=/trunk/; revision=26298
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog5
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/en_CA.po2195
3 files changed, 739 insertions, 1463 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 96130f9c4f..1aa42e3d6a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-10 Adam Weinberger <adamw@gnome.org>
+
+ * en_CA.po: Updated Canadian English translation.
+ * POTFILES.in: Correct path error.
+
2004-06-10 Rodney Dawes <dobey@novell.com>
* POTFILES.in: Update for removed files
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 82e624b448..7bd86fc446 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -353,7 +353,7 @@ shell/GNOME_Evolution_Test.server.in.in
shell/importer/import.glade
shell/importer/intelligent.c
shell/main.c
-shell/shell-errors.xml.h
+shell/shell-errors.xml
smime/gui/certificate-manager.c
smime/gui/certificate-viewer.c
smime/gui/component.c
diff --git a/po/en_CA.po b/po/en_CA.po
index 60a1543ad5..8cd9debdf2 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,20 +1,20 @@
# Canadian English translation of evolution 1.5.5.
# Copyright (C) 2004 Adam Weinberger and the GNOME Foundation
-# This file is distributed under the same license as the evolution package.
+# This file is distributed under the same licence as the evolution package.
# Maintainer: Adam Weinberger <adamw@FreeBSD.org>
#
msgid ""
msgstr ""
"Project-Id-Version: evolution 1.5.5\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
-"PO-Revision-Date: 2004-05-24 15:07-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-06-10 19:12-0700\n"
+"PO-Revision-Date: 2004-06-10 19:18-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"
-"Report-Msgid-Bugs-To: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
#: a11y/addressbook/ea-addressbook-view.c:94
#: a11y/addressbook/ea-addressbook-view.c:103
@@ -54,13 +54,13 @@ msgstr " card"
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1155
+#: addressbook/conduit/address-conduit.c:1156
msgid "Could not load addressbook"
msgstr "Could not load addressbook"
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1224
+#: addressbook/conduit/address-conduit.c:1227
msgid "Could not read pilot's Address application block"
msgstr "Could not read pilot's Address application block"
@@ -131,15 +131,19 @@ msgid "Migrating `%s':"
msgstr "Migrating `%s':"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#. On This Computer is always first and VFolders is always last
+#: addressbook/gui/component/addressbook-migrate.c:489
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+#: mail/mail-component.c:246 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "On This Computer"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:497
#: 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
@@ -148,19 +152,19 @@ msgid "Personal"
msgstr "Personal"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
msgid "On LDAP Servers"
msgstr "On LDAP Servers"
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
msgid "LDAP Servers"
msgstr "LDAP Servers"
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
msgid "Autocompletion Settings"
msgstr "Autocompletion Settings"
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -172,7 +176,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -182,7 +186,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -192,7 +196,7 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -212,7 +216,7 @@ msgid "New Address Book"
msgstr "New Address Book"
#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
#: 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
@@ -322,7 +326,6 @@ msgstr "Manage your S/MIME certificates here"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr "*"
@@ -389,12 +392,12 @@ msgid "Anonymously"
msgstr "Anonymously"
#: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:199
msgid "Basic"
msgstr "Basic"
#: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
+#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
#: smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "Details"
@@ -412,11 +415,10 @@ msgid "Email address"
msgstr "Email address"
#: addressbook/gui/component/ldap-config.glade.h:22
-#, fuzzy
msgid ""
"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"
+"Evolution will use this email address to authenticate you with the server."
#: addressbook/gui/component/ldap-config.glade.h:23
msgid "Find Possible Search Bases"
@@ -438,9 +440,8 @@ msgid "Only locations within starting point"
msgstr "Only locations within starting point"
#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
msgid "Search _base:"
-msgstr "Search base:"
+msgstr "Search _base:"
#: addressbook/gui/component/ldap-config.glade.h:28
msgid "Search base only"
@@ -455,17 +456,14 @@ msgid "Search scope:"
msgstr "Search scope:"
#: addressbook/gui/component/ldap-config.glade.h:31
-#, fuzzy
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"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."
+"server if your LDAP server supports SSL or TLS."
#: 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 insecure environment. For example, if you and your LDAP server "
@@ -473,25 +471,19 @@ msgid ""
"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"
-"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."
#: 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 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"
-"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. "
#: addressbook/gui/component/ldap-config.glade.h:34
msgid "Starting point and locations within it"
@@ -502,19 +494,16 @@ msgid "Supported Search Bases"
msgstr "Supported Search Bases"
#: 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 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."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
#: 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 directory tree. A search scope of \"sub\" will include all entries below "
@@ -522,11 +511,9 @@ msgid ""
"one level beneath your base."
msgstr ""
"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."
#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
@@ -537,13 +524,11 @@ msgstr ""
"\"."
#: addressbook/gui/component/ldap-config.glade.h:39
-#, fuzzy
msgid ""
"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"
+"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
#: addressbook/gui/component/ldap-config.glade.h:40
@@ -557,26 +542,22 @@ msgstr ""
"server."
#: 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. 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. "
+"list. It is for display purposes only. "
#: 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 "
"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."
+"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."
#: addressbook/gui/component/ldap-config.glade.h:43
msgid "Timeout:"
@@ -608,18 +589,16 @@ msgid "_Email address:"
msgstr "_Email address:"
#: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
msgid "_Find Possible Search Bases"
-msgstr "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:52
-#, fuzzy
msgid "_Log in:"
-msgstr "Login"
+msgstr "_Log in:"
#: addressbook/gui/component/ldap-config.glade.h:53
#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
@@ -631,18 +610,16 @@ msgid "_Port:"
msgstr "_Port:"
#: addressbook/gui/component/ldap-config.glade.h:55
-#, fuzzy
msgid "_Search scope:"
-msgstr "Search scope:"
+msgstr "_Search scope:"
#: addressbook/gui/component/ldap-config.glade.h:56
msgid "_Server:"
msgstr "_Server:"
#: addressbook/gui/component/ldap-config.glade.h:57
-#, fuzzy
msgid "_Timeout:"
-msgstr "Timeout:"
+msgstr "_Timeout:"
#: addressbook/gui/component/ldap-config.glade.h:58
msgid "_Use secure connection:"
@@ -806,7 +783,7 @@ msgstr "Company:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
#: 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.c:169
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
msgid "Contact"
@@ -864,9 +841,8 @@ msgid "Novell Groupwise"
msgstr "Novell Groupwise"
#: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
msgid "Office:"
-msgstr "Office"
+msgstr "Office:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "PO Box:"
@@ -881,9 +857,8 @@ msgid "Profession:"
msgstr "Profession:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
msgid "Spouse:"
-msgstr "Spouse"
+msgstr "Spouse:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:38
msgid "State/Province:"
@@ -895,16 +870,15 @@ msgstr "Title:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:40
msgid "Video Chat:"
-msgstr ""
+msgstr "Video Chat:"
#: 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
-#, fuzzy
msgid "Web Log:"
-msgstr "Web Page:"
+msgstr "Web Log:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
@@ -928,7 +902,7 @@ 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
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
msgid "_Where:"
msgstr "_Where:"
@@ -958,7 +932,7 @@ msgstr "Address"
#: 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:178
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard.c:174
@@ -1996,20 +1970,20 @@ msgstr "Writable Fields"
msgid "Changed"
msgstr "Changed"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2353
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:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2430
msgid "Please select an image for this contact"
msgstr "Please select an image for this contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2434
msgid "No image"
msgstr "No image"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2637
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2017,12 +1991,11 @@ msgstr ""
"The contact data is invalid:\n"
"\n"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:2665
msgid "Invalid contact."
-msgstr "%d contact"
+msgstr "Invalid contact."
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2724
msgid ""
"The contact cannot be saved to the selected address book. Do you want to "
"discard changes?"
@@ -2030,12 +2003,12 @@ 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:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+#: addressbook/gui/contact-editor/e-contact-editor.c:2728
+#: addressbook/gui/contact-editor/e-contact-editor.c:2752
msgid "_Discard"
msgstr "_Discard"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2747
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?"
@@ -2204,26 +2177,44 @@ msgid "\n"
msgstr "\n"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr "Add an email to the List"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "Insert email adresses from Adress Book"
+msgstr "Insert email addresses from Address Book"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
msgid "Members"
msgstr "Members"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Remove an email address from the List"
+msgstr "Remove an email address from the List"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+msgid "Select"
+msgstr "Select"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
msgid "_Hide addresses when sending mail to this list"
msgstr "_Hide addresses when sending mail to this list"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
msgid "_List name:"
msgstr "_List name:"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
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:9
-msgid "contact-list-editor"
-msgstr "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
#: addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2232,20 +2223,20 @@ msgstr "contact-list-editor"
msgid "Book"
msgstr "Book"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
msgid "Is New List"
msgstr "Is New List"
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Required Participants"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
msgid "Contact List Editor"
msgstr "Contact List Editor"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Save List as VCard"
-
#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
msgid "Changed Contact:"
msgstr "Changed Contact:"
@@ -2284,7 +2275,7 @@ msgstr ""
"in this folder. Would you like to add it anyway?"
#. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
#: widgets/misc/e-filter-bar.c:156
msgid "Advanced Search"
msgstr "Advanced Search"
@@ -2486,15 +2477,14 @@ msgstr ""
"an incorrect URI, or the LDAP server is unreachable."
#: 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 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."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
#: addressbook/gui/widgets/eab-gui-util.c:109
msgid ""
@@ -2758,97 +2748,97 @@ msgstr "Advanced..."
msgid "Type"
msgstr "Type"
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:535
msgid "Address Book"
msgstr "Address Book"
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:1099
+#: addressbook/gui/widgets/e-addressbook-view.c:2107
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard..."
msgstr "Save as VCard..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
msgid "New Contact..."
msgstr "New Contact..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
msgid "New Contact List..."
msgstr "New Contact List..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
msgid "Go to Folder..."
msgstr "Go to Folder..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
msgid "Import..."
msgstr "Import..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1093
msgid "Search for Contacts..."
msgstr "Search for Contacts..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
msgid "Address Book Sources..."
msgstr "Address Book Sources..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1096
msgid "Pilot Settings..."
msgstr "Pilot Settings..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "Forward Contact"
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1101
msgid "Send Message to Contact"
msgstr "Send Message to Contact"
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1102 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:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
msgid "Print Envelope"
msgstr "Print Envelope"
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
msgid "Copy to Address Book..."
msgstr "Copy to Address Book..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1109
msgid "Move to Address Book..."
msgstr "Move to Address Book..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "Cut"
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
#: 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:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1114
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "Paste"
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/e-calendar-view.c:1327
msgid "Current View"
msgstr "Current View"
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1692
#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr "Any Category"
@@ -3063,17 +3053,17 @@ msgstr "Card View"
msgid "GTK Tree View"
msgstr "GTK Tree View"
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
msgid "Reflow Test"
msgstr "Reflow Test"
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
#: 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:109
+#: addressbook/gui/widgets/test-reflow.c:122
msgid "This should test the reflow canvas item"
msgstr "This should test the reflow canvas item"
@@ -3386,22 +3376,22 @@ msgstr "Unnamed List"
msgid "Enter password"
msgstr "Enter password"
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
msgid "Split Multi-Day Events:"
msgstr "Split Multi-Day Events:"
-#: calendar/conduits/calendar/calendar-conduit.c:1313
+#: calendar/conduits/calendar/calendar-conduit.c:1330
#: calendar/conduits/todo/todo-conduit.c:849
msgid "Could not start wombat server"
msgstr "Could not start wombat server"
-#: calendar/conduits/calendar/calendar-conduit.c:1314
+#: calendar/conduits/calendar/calendar-conduit.c:1331
#: calendar/conduits/todo/todo-conduit.c:850
msgid "Could not start wombat"
msgstr "Could not start wombat"
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
msgid "Could not read pilot's Calendar application block"
msgstr "Could not read pilot's Calendar application block"
@@ -3656,8 +3646,8 @@ 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:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/gnome-cal.c:1827
#: camel/providers/groupwise/camel-gw-listener.c:311
#: camel/providers/groupwise/camel-gw-listener.c:334
msgid "Calendar"
@@ -3689,6 +3679,10 @@ 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
@@ -3914,10 +3908,6 @@ 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:48
-msgid "dialog1"
-msgstr "dialog1"
-
#: calendar/gui/dialogs/alarm-options.glade.h:12
msgid "extra times every"
msgstr "extra times every"
@@ -3927,7 +3917,7 @@ msgstr "extra times every"
msgid "hours"
msgstr "hours"
-#: calendar/gui/dialogs/alarm-page.c:802
+#: calendar/gui/dialogs/alarm-page.c:815
msgid "Action/Trigger"
msgstr "Action/Trigger"
@@ -3969,7 +3959,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:920 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "Summary:"
@@ -4181,7 +4171,7 @@ msgid "Free/Busy Publishing"
msgstr "Free/Busy Publishing"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1076
#: calendar/gui/e-itip-control.c:556
msgid "Friday"
msgstr "Friday"
@@ -4195,7 +4185,7 @@ msgid "Minutes"
msgstr "Minutes"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1072
#: calendar/gui/e-itip-control.c:552
msgid "Monday"
msgstr "Monday"
@@ -4205,7 +4195,7 @@ msgid "S_un"
msgstr "S_un"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1077
#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr "Saturday"
@@ -4219,7 +4209,7 @@ msgid "Show week _numbers in date navigator"
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/dialogs/recurrence-page.c:1078
#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr "Sunday"
@@ -4233,7 +4223,7 @@ msgid "T_hu"
msgstr "T_hu"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1075
#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr "Thursday"
@@ -4247,7 +4237,7 @@ msgid "Time format:"
msgstr "Time format:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1073
#: calendar/gui/e-itip-control.c:553
msgid "Tuesday"
msgstr "Tuesday"
@@ -4257,7 +4247,7 @@ msgid "W_eek starts:"
msgstr "W_eek starts:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1074
#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr "Wednesday"
@@ -4384,55 +4374,55 @@ msgstr "%s You have made changes. Forget those changes and update the editor?"
msgid "%s You have made no changes, update the editor?"
msgstr "%s You have made no changes, update the editor?"
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor.c:429
msgid "Could not update object"
msgstr "Could not update object"
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:937
msgid "Edit Appointment"
msgstr "Edit Appointment"
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:905
+#: calendar/gui/dialogs/comp-editor.c:942
#, c-format
msgid "Appointment - %s"
msgstr "Appointment - %s"
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
#, c-format
msgid "Task - %s"
msgstr "Task - %s"
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
#, c-format
msgid "Journal entry - %s"
msgstr "Journal entry - %s"
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:922
+#: calendar/gui/dialogs/comp-editor.c:958
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:1038
+#: calendar/gui/dialogs/comp-editor.c:1398
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
#: composer/e-msg-composer.c:1193
msgid "Save as..."
msgstr "Save as..."
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1501
+#: calendar/gui/dialogs/comp-editor.c:1536
+#: calendar/gui/dialogs/comp-editor.c:1562
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "Changes made to this item may be discarded if an update arrives"
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1586
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor-page.c:464
#, c-format
msgid "Validation error: %s"
msgstr "Validation error: %s"
@@ -4529,55 +4519,55 @@ msgstr "Delegate To:"
msgid "Enter Delegate"
msgstr "Enter Delegate"
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
msgid "Appointment"
msgstr "Appointment"
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:216
msgid "Reminder"
msgstr "Reminder"
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:223
msgid "Recurrence"
msgstr "Recurrence"
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:230
+#: calendar/gui/dialogs/event-editor.c:303
+#: calendar/gui/dialogs/event-editor.c:447
msgid "Scheduling"
msgstr "Scheduling"
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:237
+#: calendar/gui/dialogs/event-editor.c:306
+#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "Meeting"
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:490
msgid "Event with no start date"
msgstr "Event with no start date"
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:493
msgid "Event with no end date"
msgstr "Event with no end date"
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
msgid "Start date is wrong"
msgstr "Start date is wrong"
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:659
msgid "End date is wrong"
msgstr "End date is wrong"
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:682
msgid "Start time is wrong"
msgstr "Start time is wrong"
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:689
msgid "End time is wrong"
msgstr "End time is wrong"
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1296
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Unable to open the calendar '%s'."
@@ -4645,12 +4635,18 @@ 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: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
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: 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 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4675,9 +4671,9 @@ 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:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2585 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
@@ -4721,7 +4717,7 @@ msgid "Member"
msgstr "Member"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "RSVP"
@@ -4738,9 +4734,8 @@ msgid "Add A_ttendee"
msgstr "Add A_ttendee"
#: calendar/gui/dialogs/meeting-page.glade.h:3
-#, fuzzy
msgid "Add attendees from addressbook."
-msgstr "Add Sender to Address_book"
+msgstr "Add attendees from addressbook."
#: calendar/gui/dialogs/meeting-page.glade.h:5
#: calendar/gui/e-itip-control.glade.h:9
@@ -4821,51 +4816,51 @@ msgstr "All Instances"
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "This appointment contains recurrences that Evolution cannot edit."
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:844
msgid "Recurrence date is invalid"
msgstr "Recurrence date is invalid"
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:955
msgid "on"
msgstr "on"
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:1016
msgid "first"
msgstr "first"
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:1017
msgid "second"
msgstr "second"
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:1018
msgid "third"
msgstr "third"
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:1019
msgid "fourth"
msgstr "fourth"
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:1020
msgid "last"
msgstr "last"
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1043
msgid "Other Date"
msgstr "Other Date"
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1071
msgid "day"
msgstr "day"
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1208
msgid "on the"
msgstr "on the"
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1394
msgid "occurrences"
msgstr "occurrences"
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2364
msgid "Date/Time"
msgstr "Date/Time"
@@ -4930,15 +4925,15 @@ msgstr "week(s)"
msgid "year(s)"
msgstr "year(s)"
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:77
msgid "Select destination"
msgstr "Select destination"
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:98
msgid "_Destination"
msgstr "_Destination"
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:100
msgid "Task List"
msgstr "Task List"
@@ -4951,11 +4946,14 @@ msgstr "Completed date is wrong"
msgid "% _Complete"
msgstr "% _Complete"
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-component-preview.c:230
#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
msgid "Completed"
msgstr "Completed"
@@ -5018,17 +5016,17 @@ msgstr "_Status:"
msgid "_Web Page:"
msgstr "_Web Page:"
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:215
+#: calendar/gui/dialogs/task-editor.c:278
+#: calendar/gui/dialogs/task-editor.c:415
msgid "Assignment"
msgstr "Assignment"
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:489
msgid "Due date is wrong"
msgstr "Due date is wrong"
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:826
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Unable to open tasks in '%s'."
@@ -5039,7 +5037,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:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 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:"
@@ -5183,7 +5181,7 @@ msgstr "%s at %s"
msgid "%s for an unknown trigger type"
msgstr "%s for an unknown trigger type"
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
@@ -5203,7 +5201,7 @@ msgstr "Due Date:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
msgid "Status:"
msgstr "Status:"
@@ -5283,85 +5281,85 @@ msgstr "Free"
msgid "Busy"
msgstr "Busy"
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
msgid "Deleting selected objects"
msgstr "Deleting selected objects"
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
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:1293 calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "_Open"
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
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:1294 calendar/gui/e-calendar-view.c:1379
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
#: 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:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 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
msgid "_Print..."
msgstr "_Print..."
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
#: 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: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
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
msgid "_Copy"
msgstr "_Copy"
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: 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
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 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"
msgstr "_Paste"
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
msgid "_Assign Task"
msgstr "_Assign Task"
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
msgid "_Forward as iCalendar"
msgstr "_Forward as iCalendar"
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
msgid "_Mark as Complete"
msgstr "_Mark as Complete"
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
msgid "_Mark Selected Tasks as Complete"
msgstr "_Mark Selected Tasks as Complete"
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
msgid "_Delete Selected Tasks"
msgstr "_Delete Selected Tasks"
-#: calendar/gui/e-calendar-table.c:1353
+#: calendar/gui/e-calendar-table.c:1350
#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Click to add a task"
msgstr "Click to add a task"
@@ -5371,8 +5369,8 @@ msgstr "Click to add a task"
msgid "% Complete"
msgstr "% Complete"
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
msgid "Complete"
msgstr "Complete"
@@ -5401,67 +5399,75 @@ msgstr "Summary"
msgid "Task sort"
msgstr "Task sort"
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+msgid "Moving items"
+msgstr "Moving items"
+
+#: calendar/gui/e-calendar-view.c:1158
+msgid "Copying items"
+msgstr "Copying items"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
msgid "New _Appointment..."
msgstr "New _Appointment..."
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
msgid "New All Day _Event"
msgstr "New All Day _Event"
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
msgid "New Meeting"
msgstr "New Meeting"
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
msgid "New Task"
msgstr "New Task"
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
msgid "Select _Today"
msgstr "Select _Today"
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
msgid "_Select Date..."
msgstr "_Select Date..."
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "_Publish Free/Busy Information"
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
msgid "Cop_y to Calendar..."
msgstr "Cop_y to Calendar..."
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
msgid "Mo_ve to Calendar..."
msgstr "Mo_ve to Calendar..."
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
msgid "_Schedule Meeting..."
msgstr "_Schedule Meeting..."
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
msgid "_Forward as iCalendar..."
msgstr "_Forward as iCalendar..."
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
msgid "Delete this _Occurrence"
msgstr "Delete this _Occurrence"
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
msgid "Delete _All Occurrences"
msgstr "Delete _All Occurrences"
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
msgid "Go to _Today"
msgstr "Go to _Today"
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
msgid "_Go to Date..."
msgstr "_Go to Date..."
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "_Settings..."
@@ -5475,18 +5481,18 @@ 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:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
#: 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-gpg-context.c:1704 camel/camel-gpg-context.c:1755
#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1173
+#: camel/providers/imap4/camel-imap4-utils.c:293
#: camel/providers/smtp/camel-smtp-transport.c:172
#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
@@ -5540,12 +5546,20 @@ 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"
@@ -5563,19 +5577,23 @@ msgstr ""
"%s"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
#: calendar/gui/print.c:838
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
#: calendar/gui/print.c:840
msgid "pm"
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"
@@ -5583,6 +5601,9 @@ 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"
@@ -5658,37 +5679,32 @@ msgid ", ending on "
msgstr ", ending on "
#: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Starts:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Ends:</b> "
+msgid "Starts"
+msgstr "Starts"
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Completed:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr "Ends"
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Due:</b> "
+#: calendar/gui/e-itip-control.c:733
+msgid "Due"
+msgstr "Due"
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
msgid "iCalendar Information"
msgstr "iCalendar Information"
#. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: 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
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
msgid "An unknown person"
msgstr "An unknown person"
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -5696,305 +5712,301 @@ msgstr ""
"<br> Please review the following information, and then select an action from "
"the menu below."
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>None</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
msgid "Location:"
msgstr "Location:"
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 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:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "Tentatively Accepted"
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 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: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
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
msgid "Choose an action:"
msgstr "Choose an action:"
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
msgid "Update"
msgstr "Update"
-#: 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
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "OK"
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
msgid "Accept"
msgstr "Accept"
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
msgid "Decline"
msgstr "Decline"
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
msgid "Update respondent status"
msgstr "Update respondent status"
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 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:1185
+#: calendar/gui/e-itip-control.c:1198
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> has published meeting information."
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
msgid "Meeting Information"
msgstr "Meeting Information"
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
#, 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:1193
+#: calendar/gui/e-itip-control.c:1206
#, 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:1194
+#: calendar/gui/e-itip-control.c:1207
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
#, 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:1199
+#: calendar/gui/e-itip-control.c:1212
msgid "Meeting Update"
msgstr "Meeting Update"
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
#, 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:1204
+#: calendar/gui/e-itip-control.c:1217
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
#, 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:1212
+#: calendar/gui/e-itip-control.c:1225
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> has cancelled a meeting."
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
msgid "Meeting Cancellation"
msgstr "Meeting Cancellation"
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
#, 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:1228
+#: calendar/gui/e-itip-control.c:1241
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> has published task information."
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
msgid "Task Information"
msgstr "Task Information"
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
#, 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:1261
+#: calendar/gui/e-itip-control.c:1274
#, 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:1262
+#: calendar/gui/e-itip-control.c:1275
msgid "Task Proposal"
msgstr "Task Proposal"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
#, 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:1267
+#: calendar/gui/e-itip-control.c:1280
msgid "Task Update"
msgstr "Task Update"
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
#, 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:1272
+#: calendar/gui/e-itip-control.c:1285
msgid "Task Update Request"
msgstr "Task Update Request"
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
#, 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:1280
+#: calendar/gui/e-itip-control.c:1293
msgid "Task Reply"
msgstr "Task Reply"
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> has cancelled a task."
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
msgid "Task Cancellation"
msgstr "Task Cancellation"
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
#, 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:1316
+#: calendar/gui/e-itip-control.c:1329
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
#, 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:1321
+#: calendar/gui/e-itip-control.c:1334
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
#, 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:1326
+#: calendar/gui/e-itip-control.c:1339
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
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:1465
+#: calendar/gui/e-itip-control.c:1478
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
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:1528
+#: calendar/gui/e-itip-control.c:1541
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
msgid "Update complete\n"
msgstr "Update complete\n"
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
msgid "Object is invalid and cannot be updated\n"
msgstr "Object is invalid and cannot be updated\n"
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1831
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:1830
+#: calendar/gui/e-itip-control.c:1843
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:1849
+#: calendar/gui/e-itip-control.c:1862
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:1852
+#: calendar/gui/e-itip-control.c:1865
msgid "Object could not be found\n"
msgstr "Object could not be found\n"
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1868
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:1858
+#: calendar/gui/e-itip-control.c:1871
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1874
msgid "Attendee status could not be updated!\n"
msgstr "Attendee status could not be updated!\n"
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1905
msgid "Removal Complete"
msgstr "Removal Complete"
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
msgid "Item sent!\n"
msgstr "Item sent!\n"
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
msgid "The item could not be sent!\n"
msgstr "The item could not be sent!\n"
@@ -6039,11 +6051,6 @@ msgstr "date-start"
msgid "Chair Persons"
msgstr "Chair Persons"
-#: 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:61
msgid "Optional Participants"
msgstr "Optional Participants"
@@ -6120,28 +6127,24 @@ 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"
+msgstr "Add attendees from addressbook"
#: calendar/gui/e-meeting-time-sel.c:440
msgid "_Options"
msgstr "_Options"
#: calendar/gui/e-meeting-time-sel.c:457
-#, fuzzy
msgid "Show _only working hours"
-msgstr "Show _Only Working Hours"
+msgstr "Show _only working hours"
#: calendar/gui/e-meeting-time-sel.c:467
-#, fuzzy
msgid "Show _zoomed out"
-msgstr "Show _Zoomed Out"
+msgstr "Show _zoomed out"
#: calendar/gui/e-meeting-time-sel.c:482
-#, fuzzy
msgid "_Update free/busy"
-msgstr "_Update Free/Busy"
+msgstr "_Update free/busy"
#: calendar/gui/e-meeting-time-sel.c:497
msgid "_<<"
@@ -6156,24 +6159,20 @@ msgid ">_>"
msgstr ">_>"
#: calendar/gui/e-meeting-time-sel.c:547
-#, fuzzy
msgid "_All people and resources"
-msgstr "_All People and Resources"
+msgstr "_All people and resources"
#: calendar/gui/e-meeting-time-sel.c:556
-#, fuzzy
msgid "All _people and one resource"
-msgstr "All _People and One Resource"
+msgstr "All _people and one resource"
#: calendar/gui/e-meeting-time-sel.c:565
-#, fuzzy
msgid "_Required people"
-msgstr "_Required People"
+msgstr "_Required people"
#: calendar/gui/e-meeting-time-sel.c:574
-#, fuzzy
msgid "Required people and _one resource"
-msgstr "Required People and _One Resource"
+msgstr "Required people and _one resource"
#: calendar/gui/e-meeting-time-sel.c:593
msgid "Meeting _start time:"
@@ -6192,6 +6191,10 @@ 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
@@ -6200,6 +6203,10 @@ 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"
@@ -6210,7 +6217,7 @@ msgstr "%d/%m/%Y"
msgid "Enter the password for %s"
msgstr "Enter the password for %s"
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
#, c-format
msgid ""
"Error on %s:\n"
@@ -6219,39 +6226,30 @@ msgstr ""
"Error on %s:\n"
" %s"
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Loading tasks"
+
#. FIXME Loading should be async
#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:845
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Error opening %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Loading tasks"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
msgid "Expunging"
msgstr "Expunging"
-#: calendar/gui/e-tasks.c:1075
+#: calendar/gui/e-tasks.c:1088
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
@@ -6260,22 +6258,26 @@ msgstr "Expunging"
msgid "Tasks"
msgstr "Tasks"
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:704
+msgid "Updating query"
+msgstr "Updating query"
+
+#: calendar/gui/gnome-cal.c:2006
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
#, c-format
msgid "Loading tasks at %s"
msgstr "Loading tasks at %s"
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
msgid "Purging"
msgstr "Purging"
@@ -6735,7 +6737,7 @@ msgid_plural "%d tasks"
msgstr[0] "%d task"
msgstr[1] "%d tasks"
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
@@ -8460,69 +8462,69 @@ msgstr "Preparing folder '%s' for offline"
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
#: camel/camel-process.c:48
#, c-format
msgid "Failed to create pipe to '%s': %s"
msgstr "Failed to create pipe to '%s': %s"
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
#: camel/camel-process.c:90
#, c-format
msgid "Failed to create create child process '%s': %s"
msgstr "Failed to create create child process '%s': %s"
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Invalid message stream received from %s: %s"
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
msgid "Syncing folders"
msgstr "Syncing folders"
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Error parsing filter: %s: %s"
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Error executing filter: %s: %s"
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
msgid "Unable to open spool folder"
msgstr "Unable to open spool folder"
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
msgid "Unable to process spool folder"
msgstr "Unable to process spool folder"
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Getting message %d (%d%%)"
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
msgid "Cannot open message"
msgstr "Cannot open message"
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
#, c-format
msgid "Failed on message %d"
msgstr "Failed on message %d"
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
msgid "Syncing folder"
msgstr "Syncing folder"
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
#, c-format
msgid "Getting message %d of %d"
msgstr "Getting message %d of %d"
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
#, c-format
msgid "Failed at message %d of %d"
msgstr "Failed at message %d of %d"
@@ -8622,7 +8624,7 @@ msgstr "(match-threads) requires the folder set"
msgid "Performing query on unknown header: %s"
msgstr "Performing query on unknown header: %s"
-#: camel/camel-gpg-context.c:720
+#: camel/camel-gpg-context.c:722
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -8633,15 +8635,15 @@ msgstr ""
"\n"
"%s"
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
msgid "Failed to parse gpg userid hint."
msgstr "Failed to parse gpg userid hint."
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
msgid "Failed to parse gpg passphrase request."
msgstr "Failed to parse gpg passphrase request."
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -8650,28 +8652,28 @@ msgstr ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
-#: 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 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1440 camel/camel-gpg-context.c:1531
+#: camel/camel-gpg-context.c:1638 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."
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "Failed to unlock secret key: 3 bad passphrases given."
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Unexpected response from GnuPG: %s"
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
msgid "Failed to encrypt: No valid recipients specified."
msgstr "Failed to encrypt: No valid recipients specified."
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
#, c-format
msgid ""
"Failed to GPG %s: %s\n"
@@ -8682,58 +8684,58 @@ msgstr ""
"\n"
"%s"
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
#, c-format
msgid "Failed to GPG %s: %s\n"
msgstr "Failed to GPG %s: %s\n"
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
#, c-format
msgid "Could not generate signing data: %s"
msgstr "Could not generate signing data: %s"
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1703
+#: camel/camel-gpg-context.c:1754
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Failed to execute gpg: %s"
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1433
+#: camel/camel-gpg-context.c:1524 camel/camel-gpg-context.c:1547
+#: camel/camel-gpg-context.c:1631 camel/camel-gpg-context.c:1655
+#: camel/camel-gpg-context.c:1725 camel/camel-gpg-context.c:1776
msgid "Failed to execute gpg."
msgstr "Failed to execute gpg."
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
msgid "This is a digitally signed message part"
msgstr "This is a digitally signed message part"
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1409
#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
#: camel/camel-smime-context.c:739
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Cannot verify message signature: Incorrect message format"
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1416
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "Cannot verify message signature: could not create temp file: %s"
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1507
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Could not generate encrypting data: %s"
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1565
msgid "This is a digitally encrypted message part"
msgstr "This is a digitally encrypted message part"
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1662 camel/camel-smime-context.c:994
msgid "Encrypted content"
msgstr "Encrypted content"
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1681
msgid "Unable to parse message content"
msgstr "Unable to parse message content"
@@ -9543,7 +9545,7 @@ msgstr "Key usage does not support certificate signing"
msgid "Error in application verification"
msgstr "Error in application verification"
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
#, c-format
msgid ""
"Issuer: %s\n"
@@ -9556,11 +9558,11 @@ msgstr ""
"Fingerprint: %s\n"
"Signature: %s"
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
msgid "GOOD"
msgstr "GOOD"
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
msgid "BAD"
msgstr "BAD"
@@ -9584,7 +9586,7 @@ msgstr ""
"Do you wish to accept anyway?"
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -9599,7 +9601,7 @@ msgstr ""
"\n"
"Do you wish to accept?"
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -9608,7 +9610,7 @@ msgstr ""
"Certificate problem: %s\n"
"Issuer: %s"
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -9617,7 +9619,7 @@ msgstr ""
"Bad certificate domain: %s\n"
"Issuer: %s"
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -9626,7 +9628,7 @@ msgstr ""
"Certificate expired: %s\n"
"Issuer: %s"
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -9729,90 +9731,101 @@ msgstr ""
msgid "Checklist"
msgstr "Checklist"
-#: camel/providers/imap4/camel-imap4-command.c:629
+#: camel/providers/imap4/camel-imap4-command.c:531
+#: camel/providers/imap4/camel-imap4-command.c:538
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Failed sending command to IMAP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:637
#, c-format
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "Unexpected response from IMAP4 server %s: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:415
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Unexpected greeting from IMAP server %s."
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
#, c-format
msgid "Cannot select folder `%s': Invalid mailbox name"
msgstr "Cannot select folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-engine.c:421
+#: camel/providers/imap4/camel-imap4-engine.c:422
#, c-format
msgid "Cannot select folder `%s': Bad command"
msgstr "Cannot select folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "IMAP4 server %s unexpectedly disconnected: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:1145
+#: camel/providers/imap4/camel-imap4-engine.c:998
msgid "Got BYE response"
msgstr "Got BYE response"
-#: camel/providers/imap4/camel-imap4-folder.c:335
+#: camel/providers/imap4/camel-imap4-folder.c:422
#, c-format
msgid "Cannot sync flags to folder `%s': Unknown"
msgstr "Cannot sync flags to folder `%s': Unknown"
-#: camel/providers/imap4/camel-imap4-folder.c:341
+#: camel/providers/imap4/camel-imap4-folder.c:428
#, c-format
msgid "Cannot sync flags to folder `%s': Bad command"
msgstr "Cannot sync flags to folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-folder.c:476
+#: camel/providers/imap4/camel-imap4-folder.c:563
#, c-format
msgid "Cannot expunge folder `%s': Unknown"
msgstr "Cannot expunge folder `%s': Unknown"
-#: camel/providers/imap4/camel-imap4-folder.c:481
+#: camel/providers/imap4/camel-imap4-folder.c:568
#, c-format
msgid "Cannot expunge folder `%s': Bad command"
msgstr "Cannot expunge folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-folder.c:616
+#: camel/providers/imap4/camel-imap4-folder.c:703
#, c-format
msgid "Cannot get message %s from folder `%s': No such message"
msgstr "Cannot get message %s from folder `%s': No such message"
-#: camel/providers/imap4/camel-imap4-folder.c:621
+#: camel/providers/imap4/camel-imap4-folder.c:708
#, c-format
msgid "Cannot get message %s from folder `%s': Bad command"
msgstr "Cannot get message %s from folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-folder.c:746
+#: camel/providers/imap4/camel-imap4-folder.c:833
#, c-format
msgid "Cannot append message to folder `%s': Unknown error"
msgstr "Cannot append message to folder `%s': Unknown error"
-#: camel/providers/imap4/camel-imap4-folder.c:775
+#: camel/providers/imap4/camel-imap4-folder.c:862
#, c-format
msgid "Cannot append message to folder `%s': Bad command"
msgstr "Cannot append message to folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-folder.c:854
+#: camel/providers/imap4/camel-imap4-folder.c:941
#, c-format
msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
-#: camel/providers/imap4/camel-imap4-folder.c:858
+#: camel/providers/imap4/camel-imap4-folder.c:945
#, c-format
msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-#: camel/providers/imap4/camel-imap4-folder.c:866
+#: camel/providers/imap4/camel-imap4-folder.c:953
#, c-format
msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-folder.c:870
+#: camel/providers/imap4/camel-imap4-folder.c:957
#, c-format
msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
@@ -9852,20 +9865,20 @@ msgid ""
msgstr ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
-#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap4/camel-imap4-store.c:173
#: 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/imap4/camel-imap4-store.c:175
#: 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/imap4/camel-imap4-store.c:216
+#: camel/providers/imap4/camel-imap4-store.c:233
#: camel/providers/imap/camel-imap-store.c:551
#: camel/providers/imap/camel-imap-store.c:571
#: camel/providers/imapp/camel-imapp-store.c:231
@@ -9877,14 +9890,14 @@ msgstr "IMAP service for %s on %s"
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/imap4/camel-imap4-store.c:218
#: 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/imap4/camel-imap4-store.c:230
#: camel/providers/imap/camel-imap-store.c:568
#: camel/providers/imap/camel-imap-store.c:845
#: camel/providers/imapp/camel-imapp-store.c:228
@@ -9894,7 +9907,7 @@ msgstr "SSL unavailable"
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: camel/providers/imap4/camel-imap4-store.c:261
+#: camel/providers/imap4/camel-imap4-store.c:269
#, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
@@ -9903,14 +9916,14 @@ msgstr ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
-#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap4/camel-imap4-store.c:294
#: 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"
-#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap4/camel-imap4-store.c:295
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
@@ -9918,29 +9931,29 @@ msgstr "Failed to connect to IMAP server %s in secure mode: %s"
msgid "Unknown error"
msgstr "Unknown error"
-#: camel/providers/imap4/camel-imap4-store.c:373
+#: camel/providers/imap4/camel-imap4-store.c:381
#, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
msgstr ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-#: camel/providers/imap4/camel-imap4-store.c:418
+#: camel/providers/imap4/camel-imap4-store.c:426
#, c-format
msgid "%sPlease enter the IMAP password for %s on host %s"
msgstr "%sPlease enter the IMAP password for %s on host %s"
-#: camel/providers/imap4/camel-imap4-store.c:492
+#: camel/providers/imap4/camel-imap4-store.c:500
#, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "Cannot authenticate to IMAP server %s using %s"
-#: camel/providers/imap4/camel-imap4-store.c:723
+#: camel/providers/imap4/camel-imap4-store.c:731
#, c-format
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/imap4/camel-imap4-store.c:793
#: camel/providers/imap/camel-imap-store.c:1885
#: camel/providers/imap/camel-imap-store.c:2263
#, c-format
@@ -9949,70 +9962,85 @@ msgid ""
msgstr ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
-#: camel/providers/imap4/camel-imap4-store.c:826
+#: camel/providers/imap4/camel-imap4-store.c:837
#, c-format
msgid "Cannot create folder `%s': Invalid mailbox name"
msgstr "Cannot create folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:831
+#: camel/providers/imap4/camel-imap4-store.c:842
#, c-format
msgid "Cannot create folder `%s': Bad command"
msgstr "Cannot create folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:859
+#: camel/providers/imap4/camel-imap4-store.c:870
#, c-format
msgid "Cannot delete folder `%s': Special folder"
msgstr "Cannot delete folder `%s': Special folder"
-#: camel/providers/imap4/camel-imap4-store.c:891
+#: camel/providers/imap4/camel-imap4-store.c:903
#, c-format
msgid "Cannot delete folder `%s': Invalid mailbox name"
msgstr "Cannot delete folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:896
+#: camel/providers/imap4/camel-imap4-store.c:908
#, c-format
msgid "Cannot delete folder `%s': Bad command"
msgstr "Cannot delete folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:1037
+#: camel/providers/imap4/camel-imap4-store.c:928
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Cannot rename folder `%s' to `%s': Special folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:960
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:965
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Cannot rename folder `%s' to `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1171
#, c-format
msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:1039
+#: camel/providers/imap4/camel-imap4-store.c:1173
msgid "Bad command"
msgstr "Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap4/camel-imap4-store.c:1235
#, c-format
msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:1105
+#: camel/providers/imap4/camel-imap4-store.c:1240
#, c-format
msgid "Cannot subscribe to folder `%s': Bad command"
msgstr "Cannot subscribe to folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-store.c:1285
#, c-format
msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#: camel/providers/imap4/camel-imap4-store.c:1154
+#: camel/providers/imap4/camel-imap4-store.c:1290
#, c-format
msgid "Cannot unsubscribe from folder `%s': Bad command"
msgstr "Cannot unsubscribe from folder `%s': Bad command"
-#: camel/providers/imap4/camel-imap4-utils.c:85
+#: camel/providers/imap4/camel-imap4-utils.c:86
#, c-format
msgid "Unexpected token in response from IMAP server %s: "
msgstr "Unexpected token in response from IMAP server %s: "
-#: camel/providers/imap4/camel-imap4-utils.c:108
+#: camel/providers/imap4/camel-imap4-utils.c:109
msgid "No data"
msgstr "No data"
-#: camel/providers/imap4/camel-imap4-utils.c:291
+#: camel/providers/imap4/camel-imap4-utils.c:292
#, c-format
msgid "IMAP server %s unexpectedly disconnected: %s"
msgstr "IMAP server %s unexpectedly disconnected: %s"
@@ -10849,9 +10877,9 @@ msgstr "Internal error: uid in invalid format: %s"
#: camel/providers/nntp/camel-nntp-folder.c:331
#: camel/providers/nntp/camel-nntp-folder.c:373
#: camel/providers/nntp/camel-nntp-folder.c:375
-#, fuzzy, c-format
+#, c-format
msgid "Posting failed: %s"
-msgstr "Operation failed: %s"
+msgstr "Posting failed: %s"
#: camel/providers/nntp/camel-nntp-folder.c:393
msgid "You cannot post NNTP messages while working offline!"
@@ -10968,19 +10996,17 @@ 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-store.c:1118
-#, fuzzy
msgid "Authentication requested but not username provided"
-msgstr "Authentication required"
+msgstr "Authentication requested but no username provided"
#: camel/providers/nntp/camel-nntp-store.c:1146
-#, fuzzy, c-format
+#, c-format
msgid "Cannot authenticate to server: %s"
-msgstr "Cannot authenticate to IMAP server %s using %s"
+msgstr "Cannot authenticate to server: %s"
#: camel/providers/nntp/camel-nntp-store.c:1262
-#, fuzzy
msgid "Not connected."
-msgstr "No contacts"
+msgstr "Not connected."
#: camel/providers/nntp/camel-nntp-store.c:1311
#, c-format
@@ -10994,14 +11020,14 @@ msgid "%s: Scanning new messages"
msgstr "%s: Scanning new messages"
#: camel/providers/nntp/camel-nntp-summary.c:225
-#, fuzzy, c-format
+#, c-format
msgid "Unexpected server response from xover: %s"
-msgstr "Unexpected response from IMAP server: %s"
+msgstr "Unexpected server response from xover: %s"
#: camel/providers/nntp/camel-nntp-summary.c:328
-#, fuzzy, c-format
+#, c-format
msgid "Unexpected server response from head: %s"
-msgstr "Unexpected response from GnuPG: %s"
+msgstr "Unexpected server response from head: %s"
#: camel/providers/nntp/camel-nntp-summary.c:368
msgid "Use cancel"
@@ -11575,7 +11601,7 @@ msgstr[1] "<b>%d</b> Files Attached"
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr "Hide _Attachment Bar (drop attachments here)"
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3224
msgid "Show _Attachment Bar (drop attachments here)"
msgstr "Show _Attachment Bar (drop attachments here)"
@@ -11584,35 +11610,7 @@ msgstr "Show _Attachment Bar (drop attachments here)"
msgid "Compose a message"
msgstr "Compose a message"
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-
-#: composer/e-msg-composer.c:4284
+#: composer/e-msg-composer.c:4270
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11702,20 +11700,19 @@ msgstr "Attach file(s)"
#. mail-composer:no-attach primary
#: composer/mail-composer-errors.xml.h:2
-#, fuzzy
msgid "You cannot attach the file `{0}' to this message."
-msgstr "You cannot attach the file `${0}' to this message."
+msgstr "You cannot attach the file `{0}' to this message."
#. mail-composer:no-attach secondary
+#. mail:no-save-path secondary
#: 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
-#, 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."
+msgstr "The file `{0}' is not a regular file and cannot be sent in a message."
#. mail-composer:attach-directory primary
#: composer/mail-composer-errors.xml.h:8
@@ -11808,9 +11805,8 @@ msgstr "Could not create message."
#. mail-composer:no-build-message secondary
#: composer/mail-composer-errors.xml.h:34
-#, fuzzy
msgid "Because \"{0}\", you may need to select different mail options."
-msgstr "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
#: composer/mail-composer-errors.xml.h:36
@@ -11818,6 +11814,10 @@ msgid "Could not read signature file \"{0}\"."
msgstr "Could not read signature file \"{0}\"."
#. mail-composer:no-sig-file secondary
+#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
#: 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
@@ -11834,6 +11834,30 @@ msgstr "All accounts have been removed."
msgid "You need to configure an account before you can compose mail."
msgstr "You need to configure an account before you can compose mail."
+#. mail-composer:no-address-control primary
+#. mail-composer:no-editor-control primary
+#: composer/mail-composer-errors.xml.h:44
+#: composer/mail-composer-errors.xml.h:48
+msgid "Could not create composer window."
+msgstr "Could not create composer window."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:46
+msgid "Unable to activate the address selector control."
+msgstr "Unable to activate the address selector control."
+
+#: composer/mail-composer-errors.xml.h:50
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+
#: data/evolution.desktop.in.in.h:1
msgid "The Ximian Evolution Groupware Suite"
msgstr "The Ximian Evolution Groupware Suite"
@@ -11985,12 +12009,16 @@ 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"
@@ -12042,23 +12070,31 @@ 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"
@@ -12155,6 +12191,7 @@ 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."
@@ -12185,6 +12222,7 @@ 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."
@@ -12214,7 +12252,6 @@ 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"
@@ -12536,114 +12573,119 @@ 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:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2311
+#: mail/mail-component.c:719
msgid "Specify where to create the folder:"
msgstr "Specify where to create the folder:"
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
msgid "Create"
msgstr "Create"
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
msgid "Folder _name:"
msgstr "Folder _name:"
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree.c:841
#, c-format
msgid "Moving folder %s"
msgstr "Moving folder %s"
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:843
#, c-format
msgid "Copying folder %s"
msgstr "Copying folder %s"
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:850 mail/message-list.c:1561
#, c-format
msgid "Moving messages into folder %s"
msgstr "Moving messages into folder %s"
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:852 mail/message-list.c:1563
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copying messages into folder %s"
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:868
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "_Copy to Folder"
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
msgid "_Move to Folder"
msgstr "_Move to Folder"
-#: 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
+#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2098
+#: mail/em-folder-view.c:798 mail/message-list.c:1651
msgid "_Move"
msgstr "_Move"
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:963 mail/message-list.c:1653
msgid "Cancel _Drag"
msgstr "Cancel _Drag"
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2085 mail/em-folder-tree.c:2098
#: 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:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2085 mail/em-folder-view.c:812
msgid "C_opy"
msgstr "C_opy"
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2125
#, c-format
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2311 mail/mail-component.c:719
msgid "Create folder"
msgstr "Create folder"
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2500
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Rename the \"%s\" folder to:"
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2502
msgid "Rename Folder"
msgstr "Rename Folder"
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2573 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:37
msgid "_View"
msgstr "_View"
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2574
msgid "Open in _New Window"
msgstr "Open in _New Window"
+#: mail/em-folder-tree.c:2578
+msgid "_Copy..."
+msgstr "_Copy..."
+
+#: mail/em-folder-tree.c:2579
+msgid "_Move..."
+msgstr "_Move..."
+
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2583
msgid "_New Folder..."
msgstr "_New Folder..."
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Rename"
+#: mail/em-folder-tree.c:2586
+msgid "_Rename..."
+msgstr "_Rename..."
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Properties..."
+#: mail/em-folder-tree.c:2589 ui/evolution-mail-list.xml.h:27
+msgid "_Properties"
+msgstr "_Properties"
#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
#: mail/mail-vfolder.c:888
@@ -12666,8 +12708,8 @@ 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:508
-#: mail/mail-component.c:554
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:516
+#: mail/mail-component.c:569
msgid "Mail"
msgstr "Mail"
@@ -12801,20 +12843,20 @@ msgid "Filter on _Mailing List"
msgstr "Filter on _Mailing List"
#. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "Default"
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1800
msgid "Print Message"
msgstr "Print Message"
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2080
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2345
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
@@ -13208,7 +13250,7 @@ msgstr "This store does not support subscriptions, or they are not enabled."
msgid "Subscribed"
msgstr "Subscribed"
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
msgid "Folder"
msgstr "Folder"
@@ -14028,66 +14070,80 @@ msgstr "%s mailing list"
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: mail/mail-component.c:461
+#: mail/mail-component.c:469
#, c-format
msgid "%d deleted"
-msgstr "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d deleted"
+msgstr[1] "%d deleted"
-#: mail/mail-component.c:463
+#: mail/mail-component.c:471
#, c-format
msgid "%d junk"
-msgstr "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d junk"
+msgstr[1] "%d junk"
-#: mail/mail-component.c:486
+#: mail/mail-component.c:494
#, c-format
-msgid "%d drafts"
-msgstr "%d drafts"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d draft"
+msgstr[1] "%d drafts"
-#: mail/mail-component.c:488
+#: mail/mail-component.c:496
#, c-format
msgid "%d sent"
-msgstr "%d sent"
+msgid_plural "%d send"
+msgstr[0] "%d sent"
+msgstr[1] "%d sent"
-#: mail/mail-component.c:490
+#: mail/mail-component.c:498
#, c-format
msgid "%d unsent"
-msgstr "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d unsent"
+msgstr[1] "%d unsent"
-#: mail/mail-component.c:494
+#: mail/mail-component.c:502
#, c-format
msgid "%d total"
-msgstr "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
-#: mail/mail-component.c:496
+#: mail/mail-component.c:504
#, c-format
msgid ", %d unread"
-msgstr ", %d unread"
+msgid_plural ", %d unread"
+msgstr[0] ", %d unread"
+msgstr[1] ", %d unread"
-#: mail/mail-component.c:656
+#: mail/mail-component.c:671
msgid "New Mail Message"
msgstr "New Mail Message"
-#: mail/mail-component.c:657
+#: mail/mail-component.c:672
msgid "_Mail Message"
msgstr "_Mail Message"
-#: mail/mail-component.c:658
+#: mail/mail-component.c:673
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: mail/mail-component.c:664
+#: mail/mail-component.c:679
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: mail/mail-component.c:665
+#: mail/mail-component.c:680
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: mail/mail-component.c:666
+#: mail/mail-component.c:681
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: mail/mail-component.c:798
+#: mail/mail-component.c:813
msgid "Failed upgrading Mail settings or folders."
msgstr "Failed upgrading Mail settings or folders."
@@ -14420,7 +14476,7 @@ msgstr "Do not quote original message"
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "Don't sign _meeting requests (for Outlook compatibility)"
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74
msgid "Done"
msgstr "Done"
@@ -14791,7 +14847,6 @@ 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 "
@@ -14824,11 +14879,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"
@@ -14902,6 +14957,7 @@ 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."
@@ -14939,11 +14995,9 @@ msgstr ""
#. mail:camel-exception primary
#: mail/mail-errors.xml.h:57
-#, fuzzy
msgid "Your message with the subject \"{0}\" was not delivered."
-msgstr "Your message message, with the subject \"{0}\" was not delivered."
+msgstr "Your 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 "
@@ -14977,6 +15031,13 @@ 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
@@ -15000,6 +15061,8 @@ msgid "Cannot save to directory \"{0}\"."
msgstr "Cannot save to directory \"{0}\"."
#. 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}\"."
@@ -15036,6 +15099,7 @@ 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 "
@@ -15069,11 +15133,13 @@ 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."
@@ -15084,21 +15150,25 @@ 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}\"."
@@ -15114,6 +15184,7 @@ 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."
@@ -15210,7 +15281,6 @@ 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"
@@ -15230,7 +15300,6 @@ 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"
@@ -15250,7 +15319,6 @@ 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"
@@ -15515,24 +15583,24 @@ msgstr "Updating..."
msgid "Waiting..."
msgstr "Waiting..."
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
msgid "User canceled operation."
msgstr "User canceled operation."
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
#, c-format
msgid "Enter Password for %s"
msgstr "Enter Password for %s"
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
msgid "Enter Password"
msgstr "Enter Password"
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
msgid "_Remember this password"
msgstr "_Remember this password"
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
@@ -15659,7 +15727,7 @@ msgstr "%b %d %l:%M %p"
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
msgid "Generating message list"
msgstr "Generating message list"
@@ -15823,7 +15891,7 @@ msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:10
msgid "Toolbar is visible"
-msgstr ""
+msgstr "Toolbar is visible"
#: shell/apps_evolution_shell.schemas.in.in.h:11
msgid "Whether Evolution should start up in offline mode"
@@ -15831,7 +15899,7 @@ msgstr "Whether Evolution should start up in offline mode"
#: shell/apps_evolution_shell.schemas.in.in.h:12
msgid "Whether the toolbar should be visible."
-msgstr ""
+msgstr "Whether the toolbar should be visible."
#: shell/apps_evolution_shell.schemas.in.in.h:13
msgid "Whether to skip the development warning dialog"
@@ -15954,9 +16022,8 @@ msgid "Automatic"
msgstr "Automatic"
#: shell/e-shell-importer.c:626
-#, fuzzy
msgid "F_ilename:"
-msgstr "File name:"
+msgstr "F_ilename:"
#: shell/e-shell-importer.c:631
msgid "Select a file"
@@ -16084,27 +16151,22 @@ msgstr "Bug buddy is not installed."
msgid "Bug buddy could not be run."
msgstr "Bug buddy could not be run."
-#: shell/e-shell-window-commands.c:323
-#, fuzzy
+#: shell/e-shell-window-commands.c:322
msgid "Groupware Suite"
-msgstr "Groupwise"
+msgstr "Groupware Suite"
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
msgid "_Work Online"
msgstr "_Work Online"
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
msgid "_Work Offline"
msgstr "_Work Offline"
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
msgid "Work Offline"
msgstr "Work Offline"
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Checkbox"
-
#: shell/e-user-creatable-items-handler.c:691
msgid "New"
msgstr "New"
@@ -16121,96 +16183,6 @@ msgstr "_Test"
msgid "Create a new test item"
msgstr "Create a new test item"
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Active Connections</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Active Connections"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Click OK to close these connections and go offline"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "C_alendar:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "_Contacts:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Mail:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Tasks:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Folder _type:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Open Other User's Folder"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Account:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Folder Name:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_User:"
-
-#: shell/glade/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Evolution Setup Assistant"
-
-#: shell/glade/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "Importing Files"
-
-#: shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "Timezone "
-
-#: shell/glade/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Welcome"
-
-#: shell/glade/evolution-startup-wizard.glade.h:6
-msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-
-#: shell/glade/evolution-startup-wizard.glade.h:11
-msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-
#: shell/GNOME_Evolution_Shell.server.in.in.h:1
msgid "Evolution Shell"
msgstr "Evolution Shell"
@@ -16281,9 +16253,8 @@ 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
-#, no-c-format
+#, c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
"of the Evolution groupware suite.\n"
@@ -16366,88 +16337,6 @@ msgstr ""
"%s: --online and --offline cannot be used together.\n"
" Use %s --help for more information.\n"
-#. shell:upgrade-nospace primary
-#: shell/shell-errors.xml.h:2
-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 "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-
-#. shell:upgrade-failed primary
-#: shell/shell-errors.xml.h:8
-msgid ""
-"Upgrade from previous version failed:\n"
-"{0}"
-msgstr ""
-"Upgrade from previous version failed:\n"
-"{0}"
-
-#. shell:upgrade-failed secondary
-#: shell/shell-errors.xml.h:11
-msgid ""
-"{1}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{1}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-
-#: shell/shell-errors.xml.h:15
-msgid "Continue"
-msgstr "Continue"
-
-#. shell:noshell 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/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"
-"\n"
-"Click help for details"
-msgstr ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\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"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-
#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
#: smime/gui/certificate-manager.c:556
msgid "Select a cert to import..."
@@ -16595,7 +16484,7 @@ msgstr "Contact Certificates"
#: smime/gui/smime-ui.glade.h:20
msgid "Do not trust the authenticity of this certificate"
-msgstr ""
+msgstr "Do not trust the authenticity of this certificate"
#: smime/gui/smime-ui.glade.h:21
msgid "Dummy window only"
@@ -16606,9 +16495,8 @@ msgid "Edit"
msgstr "Edit"
#: smime/gui/smime-ui.glade.h:23
-#, fuzzy
msgid "Email Certificate Trust Settings"
-msgstr "Email Certificate Authority"
+msgstr "Email Certificate Trust Settings"
#: smime/gui/smime-ui.glade.h:24
msgid "Email Recipient Certificate"
@@ -16652,7 +16540,7 @@ msgstr "SSL Server Certificate"
#: smime/gui/smime-ui.glade.h:37
msgid "Trust the authenticity of this certificate"
-msgstr ""
+msgstr "Trust the authenticity of this certificate"
#: smime/gui/smime-ui.glade.h:38
msgid "Trust this CA to identify email users."
@@ -16690,7 +16578,7 @@ msgstr "Your Certificates"
#: smime/gui/smime-ui.glade.h:46
msgid "_Edit CA Trust"
-msgstr ""
+msgstr "_Edit CA Trust"
#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
msgid "%d/%m/%Y"
@@ -16698,14 +16586,12 @@ msgstr "%d/%m/%Y"
#. x509 certificate usage types
#: smime/lib/e-cert.c:424
-#, fuzzy
msgid "Sign"
-msgstr "Signing"
+msgstr "Sign"
#: smime/lib/e-cert.c:425
-#, fuzzy
msgid "Encrypt"
-msgstr "Encrypted"
+msgstr "Encrypt"
#: smime/lib/e-cert.c:530
msgid "Version"
@@ -16894,7 +16780,7 @@ msgid "Certificate Signature Value"
msgstr "Certificate Signature Value"
#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
+#: smime/lib/e-cert-db.c:612
msgid "Certificate already exists"
msgstr "Certificate already exists"
@@ -18211,18 +18097,16 @@ msgid "_Open Task"
msgstr "_Open Task"
#: ui/evolution.xml.h:1
-#, fuzzy
msgid "About Evolution..."
-msgstr "About Evolution"
+msgstr "About Evolution..."
#: ui/evolution.xml.h:2
msgid "Change Evolution's settings"
msgstr "Change Evolution's settings"
#: ui/evolution.xml.h:3
-#, fuzzy
msgid "Change the visibility of the toolbar"
-msgstr "Change the properties of this folder"
+msgstr "Change the visibility of the toolbar"
#: ui/evolution.xml.h:6
msgid "Create a new window displaying this folder"
@@ -18233,9 +18117,8 @@ msgid "E_xit"
msgstr "E_xit"
#: ui/evolution.xml.h:8
-#, fuzzy
msgid "Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+msgstr "Evolution _FAQ"
#: ui/evolution.xml.h:9
msgid "Exit the program"
@@ -18274,9 +18157,8 @@ msgid "Set up Pilot configuration"
msgstr "Set up Pilot configuration"
#: ui/evolution.xml.h:19
-#, fuzzy
msgid "Show information about Evolution"
-msgstr "Show information about Ximian Evolution"
+msgstr "Show information about Evolution"
#: ui/evolution.xml.h:20
msgid "Submit Bug Report"
@@ -18291,18 +18173,16 @@ msgid "Submit a bug report using Bug Buddy"
msgstr "Submit a bug report using Bug Buddy"
#: ui/evolution.xml.h:23
-#, fuzzy
msgid "T_oolbar"
-msgstr "Main toolbar"
+msgstr "T_oolbar"
#: ui/evolution.xml.h:24
msgid "Toggle whether we are working offline."
msgstr "Toggle whether we are working offline."
#: ui/evolution.xml.h:26
-#, fuzzy
msgid "_About Evolution..."
-msgstr "About Evolution"
+msgstr "_About Evolution..."
#: ui/evolution.xml.h:30
msgid "_Help"
@@ -18566,7 +18446,7 @@ msgid "Evolution Query"
msgstr "Evolution Query"
#. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
#, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18716,612 +18596,3 @@ 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:"
-
-#~ msgid "Could not find widget for a field: `%s'"
-#~ msgstr "Could not find widget for a field: `%s'"
-
-#~ msgid "Can not load URI"
-#~ msgstr "Can not load URI"
-
-#~ msgid "Learning junk and/or non junk message(s)"
-#~ msgstr "Learning junk and/or non junk message(s)"
-
-#~ msgid "Check _Incoming Mail"
-#~ msgstr "Check _Incoming Mail"
-
-#~ msgid "Use _Daemon"
-#~ msgstr "Use _Daemon"
-
-#~ msgid "_Local Tests Only"
-#~ msgstr "_Local Tests Only"
-
-#~ msgid "Working"
-#~ msgstr "Working"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Unknown error."
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Unknown error."
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "The error from the component system is:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "The error from the component system is:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "The error from the activation system is:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "The error from the activation system is:\n"
-#~ "%s"
-
-#~ msgid "Evolution Addressbook folder viewer"
-#~ msgstr "Evolution Addressbook folder viewer"
-
-#~ msgid "Address 2:"
-#~ msgstr "Address 2:"
-
-#~ msgid "Blog:"
-#~ msgstr "Blog:"
-
-#~ msgid "Evolution Calendar viewer"
-#~ msgstr "Evolution Calendar viewer"
-
-#~ msgid "Evolution Tasks viewer"
-#~ msgstr "Evolution Tasks viewer"
-
-#~ msgid "Could not initialize gnome-vfs"
-#~ msgstr "Could not initialize gnome-vfs"
-
-#~ msgid "Could not open the folder in '%s'"
-#~ msgstr "Could not open the folder in '%s'"
-
-#~ msgid "The URI that the calendar will display"
-#~ msgstr "The URI that the calendar will display"
-
-#~ msgid "The type of view to show"
-#~ msgstr "The type of view to show"
-
-#~ msgid "Display a message"
-#~ msgstr "Display a message"
-
-#~ msgid "Select source"
-#~ msgstr "Select source"
-
-#~ msgid "calendar"
-#~ msgstr "calendar"
-
-#~ msgid "task list"
-#~ msgstr "task list"
-
-#~ msgid "Calendar file could not be updated!\n"
-#~ msgstr "Calendar file could not be updated!\n"
-
-#~ msgid "The URI of the tasks folder to display"
-#~ msgstr "The URI of the tasks folder to display"
-
-#~ msgid "Could not load the tasks in `%s'"
-#~ msgstr "Could not load the tasks in `%s'"
-
-#~ msgid "Evolution Mail folder viewer"
-#~ msgstr "Evolution Mail folder viewer"
-
-#~ msgid "VFolder on Thread"
-#~ msgstr "VFolder on Thread"
-
-#~ msgid "Filter on Thread"
-#~ msgstr "Filter on Thread"
-
-#~ msgid "Failed to migrate pop3 uid caches: %s"
-#~ msgstr "Failed to migrate pop3 uid caches: %s"
-
-#~ msgid "Failed to migrate folder expand state: %s"
-#~ msgstr "Failed to migrate folder expand state: %s"
-
-#~ msgid "Failed to open store for `%s': %s"
-#~ msgstr "Failed to open store for `%s': %s"
-
-#~ msgid "S3kr3t 0pt10n"
-#~ msgstr "S3kr3t 0pt10n"
-
-#~ msgid "S3kr3t 0pt10n."
-#~ msgstr "S3kr3t 0pt10n."
-
-#~ msgid "URI of the mail source that the view will display"
-#~ msgstr "URI of the mail source that the view will display"
-
-#~ msgid ""
-#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
-#~ "d.\n"
-#~ "The data hasn't been deleted, but it will not be seen by this version of "
-#~ "Evolution.\n"
-#~ msgstr ""
-#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
-#~ "d.\n"
-#~ "The data hasn't been deleted, but it will not be seen by this version of "
-#~ "Evolution.\n"
-
-#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
-#~ msgstr "Cannot initialize the Ximian Evolution shell: %s"
-
-#~ msgid "_Resend..."
-#~ msgstr "_Resend..."