aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_AU.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2004-04-03 00:33:55 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-04-03 00:33:55 +0800
commit5748693354eb261e91fd9648a0ae6cdbbfdefbd9 (patch)
tree3229ee1db67a670b275dd2043217fb1c809df88b /po/en_AU.po
parent8cc048dc72218fcd37c3a77297bf5a14bb7347bc (diff)
downloadgsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.gz
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.tar.zst
gsoc2013-evolution-5748693354eb261e91fd9648a0ae6cdbbfdefbd9.zip
bump version, requirements
2004-04-02 JP Rosevear <jpr@ximian.com> * configure.in: bump version, requirements svn path=/trunk/; revision=25301
Diffstat (limited to 'po/en_AU.po')
-rw-r--r--po/en_AU.po4351
1 files changed, 2238 insertions, 2113 deletions
diff --git a/po/en_AU.po b/po/en_AU.po
index cda37fc427..aa0f19209a 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2004-03-05 13:00-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
"PO-Revision-Date: 2000-10-22 16:19+0100\n"
"Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
"Language-Team: \n"
@@ -13,6 +13,43 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Cannot initialise Evolution's mail component."
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "have "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " cards"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " card"
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Cannot initialise Evolution's mail component."
+
#: addressbook/conduit/address-conduit.c:272
msgid "Default Sync Address:"
msgstr ""
@@ -94,82 +131,98 @@ msgstr ""
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:308
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/addressbook-component.c:313
+#: addressbook/gui/component/ldap-config.glade.h:25
#, fuzzy
msgid "New Address Book"
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/component/addressbook-component.c:309
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-#: calendar/gui/calendar-component.c:374 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:236
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-component.c:314
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
+#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
msgid "Delete"
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:310
-#: calendar/gui/calendar-component.c:375 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-component.c:315
+#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
msgid "Properties..."
msgstr ""
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
#, fuzzy
msgid "New Contact"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
#, fuzzy
msgid "_Contact"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
#, fuzzy
msgid "Create a new contact"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
#, fuzzy
msgid "New Contact List"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
#, fuzzy
msgid "Contact _List"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
#, fuzzy
msgid "Create a new contact list"
msgstr "_Other Organiser"
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/addressbook-config.c:407
msgid "Failed to connect to LDAP server"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
msgid "Failed to authenticate with LDAP server"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
msgid "Could not perform query on Root DSE"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
msgid "The server responded with no supported search bases"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
msgid "This server does not support LDAPv3 schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
msgid "Error retrieving schema information"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
msgid "Server did not respond with valid schema information"
msgstr ""
@@ -194,17 +247,17 @@ msgstr ""
#. create the local source group
#: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:163 mail/em-folder-tree-model.c:165
-#: mail/mail-component.c:201
+#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
+#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
+#: mail/mail-component.c:236
msgid "On This Computer"
msgstr ""
#. Create the default Person addressbook
#: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:434 calendar/gui/migration.c:511
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
-#: mail/mail-config.glade.h:88
+#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
+#: mail/mail-config.glade.h:106
msgid "Personal"
msgstr ""
@@ -249,54 +302,54 @@ msgstr ""
msgid "This query did not complete successfully."
msgstr ""
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:591
msgid ""
"We were unable to open this addressbook. Please check that the path exists "
"and that you have permission to access it."
msgstr ""
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:598
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
msgstr ""
-#: addressbook/gui/component/addressbook.c:606
+#: addressbook/gui/component/addressbook.c:603
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
"you want to use LDAP in Evolution you must compile the program from the CVS "
"sources after retrieving OpenLDAP from the link below."
msgstr ""
-#: addressbook/gui/component/addressbook.c:615
+#: addressbook/gui/component/addressbook.c:612
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
msgstr ""
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
msgid "Unable to open addressbook"
msgstr ""
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
msgid "Accessing LDAP Server anonymously"
msgstr ""
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
#, fuzzy
msgid "Failed to authenticate.\n"
msgstr "Could not close temporary folder: %s"
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr ""
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
msgid "UID of the contacts source that the view will display"
msgstr ""
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
msgid "The URI that the address book will display"
msgstr ""
@@ -319,16 +372,10 @@ msgid "URI for the folder last used in the select names dialog"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
msgid " S_how Supported Bases "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:2
#: addressbook/gui/component/select-names/select-names.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:2
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -343,62 +390,53 @@ msgstr ""
#: calendar/gui/dialogs/new-task-list.glade.h:1
#: calendar/gui/dialogs/task-page.glade.h:1
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
msgid "1:00"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "3268"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "389"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "5:00"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "636"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
#, fuzzy
msgid "Address Book Creation Assistant"
msgstr "Organisation"
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
#, fuzzy
msgid "Address Book Properties"
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
-msgid "Address Book Sources"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:40
msgid "Always"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "Anonymously"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:12
msgid ""
"Congratulations, you are\n"
"\t finished setting up this address book.\n"
@@ -406,51 +444,51 @@ msgid ""
"Please click the \"Apply\" button to save the settings you have entered here."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Connecting"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
msgid "Distinguished _name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
#, fuzzy
msgid "Email address:"
msgstr "Chile"
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:19
msgid "Evolution will use this DN to authenticate you with the server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:20
msgid ""
"Evolution will use this email address to authenticate you with the server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:21
#: calendar/gui/dialogs/calendar-setup.glade.h:10
msgid "Finished"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:22
#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
#: smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:23
#: calendar/gui/dialogs/calendar-setup.glade.h:12
msgid "Group:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:99
msgid "Never"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:26
msgid ""
"Now, you must specify how you want to connect to the LDAP server. The SSL "
"(Secure Sockets Layer)\n"
@@ -460,30 +498,26 @@ msgid ""
"these protocols."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid "One"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid "S_earch scope: "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
msgid "Searching"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if\n"
"your LDAP server supports SSL or TLS."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a \n"
@@ -494,7 +528,7 @@ msgid ""
"secure."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This \n"
@@ -503,7 +537,7 @@ msgid ""
"exploits. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:41
#: calendar/gui/dialogs/calendar-setup.glade.h:16
msgid ""
"Selecting this option will let you change Evolution's default settings for "
@@ -511,39 +545,39 @@ msgid ""
"searches, and for creating and editing contacts. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:43
msgid ""
"Specifying a\n"
"\t\t\t display name and group is the first step in setting\n"
"\t\t\t up an address book."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
#: calendar/gui/dialogs/calendar-setup.glade.h:20
msgid "Step 1: Folder Characteristics"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
msgid "Step 2: Server Information"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "Step 3: Connecting to Server"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "Step 4: Searching the Directory"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Sub"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "Supported Search Bases"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
msgid ""
"The options on this page control how many entries should be included in "
"your\n"
@@ -552,7 +586,7 @@ msgid ""
"need to change these options."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:55
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will \n"
@@ -560,7 +594,7 @@ msgid ""
"directory tree."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:57
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the \n"
@@ -570,7 +604,7 @@ msgid ""
"your base.\n"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
msgid ""
"This assistant will help you\n"
"\t create a new address book. \n"
@@ -580,41 +614,41 @@ msgid ""
"administrator if you need help finding this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:67
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:68
msgid ""
"This is the maximum number of entries to download. Setting this number to "
"be \n"
"too large will slow down your address book."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:70
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
"server."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:71
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list.\n"
"It is for display purposes only. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:73
#: calendar/gui/dialogs/calendar-setup.glade.h:34
msgid ""
"This is the name that will appear in your Evolution folder list. It is for "
"display purposes only. "
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:74
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. "
"A \n"
@@ -622,28 +656,28 @@ msgid ""
"what port you should specify."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:77
msgid "This option controls how long a search will be run."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid "U_se SSL/TLS:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
msgid "Using distinguished name (DN)"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid "Using email address"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:86 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:154
msgid "Whenever Possible"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:82
msgid ""
"You have decided to configure an LDAP server. The first step in doing this "
"is to provide its name and your\n"
@@ -651,60 +685,48 @@ msgid ""
"of this information."
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:84
#: calendar/gui/dialogs/calendar-setup.glade.h:37
msgid "_Display name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid "_Download limit:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:91
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:20
-msgid "_Edit"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "_Log in method:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
msgid "_Port number:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "_Search base:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
msgid "_Server name:"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "_Timeout (minutes):"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid "cards"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid "connecting-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
msgid "general-tab"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid "searching-tab"
msgstr ""
@@ -737,7 +759,7 @@ msgid "Send HTML Mail?"
msgstr ""
#: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/widgets/eab-popup-control.c:1001
msgid "Add to Contacts"
msgstr ""
@@ -753,7 +775,7 @@ msgstr ""
#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:216
+#: addressbook/gui/widgets/e-addressbook-view.c:222
msgid "Source"
msgstr ""
@@ -825,7 +847,8 @@ msgstr ""
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2061
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
msgid "Contact Editor"
msgstr ""
@@ -834,7 +857,7 @@ msgid "D_epartment:"
msgstr ""
#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
#: smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr ""
@@ -914,16 +937,27 @@ msgstr ""
#. FIXME: need to disable for undeletable folders
#: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:2237
-#: mail/em-folder-view.c:775 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
+#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
+#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: 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
msgid "_Delete"
msgstr ""
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr ""
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Home:"
msgstr ""
@@ -965,8 +999,8 @@ msgid "_Web page address:"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:251
-#: addressbook/gui/widgets/eab-contact-display.c:267
+#: addressbook/gui/widgets/eab-contact-display.c:316
+#: addressbook/gui/widgets/eab-contact-display.c:337
#, fuzzy
msgid "Address"
msgstr "Chile"
@@ -974,14 +1008,14 @@ msgstr "Chile"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:244
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard-label.c:164
#: addressbook/gui/widgets/e-minicard-view-widget.c:119
#: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard.c:173
msgid "Editable"
msgstr ""
@@ -1963,9 +1997,9 @@ msgid "Novell Groupwise"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2908
-#: addressbook/gui/widgets/eab-contact-display.c:245
-#: addressbook/gui/widgets/eab-contact-display.c:260
+#: addressbook/gui/contact-editor/e-contact-editor.c:2835
+#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:329
msgid "Jabber"
msgstr ""
@@ -1979,20 +2013,21 @@ msgid "MSN Messenger"
msgstr "Can not open message"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2911
-#: addressbook/gui/widgets/eab-contact-display.c:244
-#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+#: addressbook/gui/widgets/eab-contact-display.c:309
+#: addressbook/gui/widgets/eab-contact-display.c:328
msgid "ICQ"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
msgid "Service"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:758
+#: addressbook/gui/contact-editor/e-contact-editor.c:727
#: calendar/gui/dialogs/cal-prefs-dialog.c:426
+#: calendar/gui/e-cal-list-view.etspec.h:2
#, fuzzy
msgid "Location"
msgstr "Organisation"
@@ -2002,110 +2037,98 @@ msgid "Username"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2575
-#: addressbook/gui/contact-editor/e-contact-editor.c:2872
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
msgid "Home"
msgstr ""
#. red
#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2876
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
-#: mail/mail-config.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
+#: mail/mail-config.glade.h:155
msgid "Work"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2576
-#: addressbook/gui/contact-editor/e-contact-editor.c:2880
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
msgid "Other"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:209
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
msgid "Source Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:216
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
msgid "Target Book"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:154
+#: addressbook/gui/contact-editor/e-contact-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:189
+#: addressbook/gui/widgets/e-minicard.c:180
#, fuzzy
msgid "Contact"
msgstr "_Other Organiser"
-#: addressbook/gui/contact-editor/e-contact-editor.c:230
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
#, fuzzy
msgid "Is New Contact"
msgstr "_Other Organiser"
-#: addressbook/gui/contact-editor/e-contact-editor.c:237
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
msgid "Writable Fields"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
#, fuzzy
msgid "Changed"
msgstr "Chile"
-#: addressbook/gui/contact-editor/e-contact-editor.c:749
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
msgid "Account Name"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
msgid "Category editor not available."
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
msgid "This contact belongs to these categories:"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
msgid "Save Contact as VCard"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:1765
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1768
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2574
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
msgid "Business"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2907
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:2834
+#: addressbook/gui/widgets/eab-contact-display.c:307
+#: addressbook/gui/widgets/eab-contact-display.c:326
msgid "AIM"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2909
-#: addressbook/gui/widgets/eab-contact-display.c:247
-#: addressbook/gui/widgets/eab-contact-display.c:262
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+#: addressbook/gui/widgets/eab-contact-display.c:312
+#: addressbook/gui/widgets/eab-contact-display.c:331
msgid "Yahoo"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2910
-#: addressbook/gui/widgets/eab-contact-display.c:246
-#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+#: addressbook/gui/widgets/eab-contact-display.c:311
+#: addressbook/gui/widgets/eab-contact-display.c:330
msgid "MSN"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
msgid "GroupWise"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:3199
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr ""
@@ -2119,6 +2142,7 @@ msgid "_Edit Full"
msgstr ""
#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
msgid "_Full Name:"
msgstr ""
@@ -2126,6 +2150,18 @@ msgstr ""
msgid "E-_mail:"
msgstr ""
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
#: addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Address _2:"
msgstr ""
@@ -2229,23 +2265,26 @@ msgid "_Title:"
msgstr ""
#: addressbook/gui/contact-editor/im.glade.h:2
-msgid "Account name:"
+msgid "Add IM Account"
msgstr ""
#: addressbook/gui/contact-editor/im.glade.h:3
-msgid "Add IM Account"
+msgid "_Account name:"
msgstr ""
#: addressbook/gui/contact-editor/im.glade.h:4
-msgid "IM Service:"
+msgid "_IM Service:"
msgstr ""
#: addressbook/gui/contact-editor/im.glade.h:5
-#: calendar/gui/e-itip-control.c:947
#, fuzzy
-msgid "Location:"
+msgid "_Location:"
msgstr "Organisation"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr ""
+
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
msgid "Members"
msgstr ""
@@ -2266,25 +2305,26 @@ msgstr ""
msgid "contact-list-editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:147
-#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:209
+#: addressbook/gui/widgets/e-addressbook-view.c:215
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
#: addressbook/gui/widgets/e-minicard-view.c:460
msgid "Book"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
msgid "Is New List"
msgstr ""
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:248
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
msgid "Contact List Editor"
msgstr ""
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:466
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
msgid "Save List as VCard"
msgstr ""
@@ -2333,24 +2373,21 @@ msgid "No contacts"
msgstr "_Other Organiser"
#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
-msgid "1 contact"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:154
#, fuzzy, c-format
-msgid "%d contacts"
-msgstr "_Other Organiser"
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:223
+#: addressbook/gui/widgets/e-addressbook-view.c:229
#: addressbook/gui/widgets/e-minicard-view-widget.c:112
#: addressbook/gui/widgets/e-minicard-view.c:467
msgid "Query"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
msgid "Error getting book view"
msgstr ""
@@ -2362,133 +2399,132 @@ msgstr ""
msgid "Error modifying card"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
msgid "Name begins with"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
msgid "Email begins with"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:163
#: calendar/gui/cal-search-bar.c:54
msgid "Category is"
msgstr ""
#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:164
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
msgid "Advanced..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:236
#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:12
#: calendar/gui/e-meeting-list-view.c:249
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
#, fuzzy
msgid "Address Book"
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/e-addressbook-view.c:838
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-#: addressbook/gui/widgets/e-addressbook-view.c:2016
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2031
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
msgid "New Contact..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
msgid "New Contact List..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
msgid "Go to Folder..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
msgid "Import..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
msgid "Search for Contacts..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
#, fuzzy
msgid "Address Book Sources..."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
msgid "Pilot Settings..."
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
msgid "Send Message to Contact"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1061 calendar/gui/print.c:2481
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
msgid "Print Envelope"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
#, fuzzy
msgid "Copy to Address Book..."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
#, fuzzy
msgid "Move to Address Book..."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr ""
-#. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: calendar/gui/calendar-component.c:372
-#: calendar/gui/dialogs/copy-source-dialog.c:159
-#: calendar/gui/tasks-component.c:363 ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1078
-#: calendar/gui/e-cal-view.c:1269
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1248
msgid "Current View"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -2497,7 +2533,7 @@ msgid ""
msgstr ""
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:1622
#: calendar/gui/cal-search-bar.c:359
msgid "Any Category"
msgstr ""
@@ -2531,8 +2567,6 @@ msgid "Car Phone"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Categories"
msgstr ""
@@ -2541,7 +2575,7 @@ msgid "Company Phone"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:447 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
msgid "Email"
msgstr ""
@@ -2594,6 +2628,7 @@ msgid "Manager"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
msgid "Mobile Phone"
msgstr ""
@@ -2602,7 +2637,7 @@ msgid "Nickname"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:273
+#: addressbook/gui/widgets/eab-contact-display.c:347
msgid "Note"
msgstr ""
@@ -2611,7 +2646,7 @@ msgid "Office"
msgstr ""
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:240
+#: addressbook/gui/widgets/eab-contact-display.c:305
msgid "Organization"
msgstr "Organisation"
@@ -2667,17 +2702,17 @@ msgid "Web Site"
msgstr ""
#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:136
msgid "Width"
msgstr ""
#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:143
msgid "Height"
msgstr ""
#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:151
msgid "Has Focus"
msgstr ""
@@ -2721,84 +2756,87 @@ msgstr ""
msgid "Adapter"
msgstr ""
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
msgid "Selected"
msgstr ""
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
msgid "Has Cursor"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:117
+#: addressbook/gui/widgets/eab-contact-display.c:118
+#: addressbook/gui/widgets/eab-contact-display.c:180
msgid "(map)"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:127
+#: addressbook/gui/widgets/eab-contact-display.c:128
+#: addressbook/gui/widgets/eab-contact-display.c:190
msgid "map"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:423
+#: addressbook/gui/widgets/eab-contact-display.c:242
+#: addressbook/gui/widgets/eab-contact-display.c:498
msgid "List Members"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:233
+#: addressbook/gui/widgets/eab-contact-display.c:298
#, fuzzy
msgid "E-mail"
msgstr "Chile"
-#: addressbook/gui/widgets/eab-contact-display.c:238
-msgid "work"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:241
+#: addressbook/gui/widgets/eab-contact-display.c:306
#, fuzzy
msgid "Position"
msgstr "Organisation"
-#: addressbook/gui/widgets/eab-contact-display.c:243
-#: addressbook/gui/widgets/eab-contact-display.c:258
+#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:327
msgid "Groupwise"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:248
+#: addressbook/gui/widgets/eab-contact-display.c:313
msgid "Video Conferencing"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:249
+#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
msgid "Phone"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:250
+#: addressbook/gui/widgets/eab-contact-display.c:315
msgid "Fax"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:255
-msgid "personal"
+#: addressbook/gui/widgets/eab-contact-display.c:319
+msgid "work"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:264
+#: addressbook/gui/widgets/eab-contact-display.c:332
msgid "WWW"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:265
-#: addressbook/gui/widgets/eab-contact-display.c:482
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:557
msgid "Blog"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:443
+#: addressbook/gui/widgets/eab-contact-display.c:340
+msgid "personal"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:518
msgid "Job Title"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:474
+#: addressbook/gui/widgets/eab-contact-display.c:549
msgid "Home page"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
msgid "Success"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:48
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
#: camel/providers/pop3/camel-pop3-store.c:538
@@ -2806,154 +2844,154 @@ msgstr ""
msgid "Unknown error"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
msgid "Repository offline"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
msgid "Permission denied"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
msgid "Contact not found"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Contact ID already exists"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
msgid "Protocol not supported"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
#: calendar/gui/dialogs/task-details-page.glade.h:3
#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2350 camel/camel-service.c:728
+#: calendar/gui/print.c:2349 camel/camel-service.c:728
#: camel/camel-service.c:766 camel/camel-service.c:850
#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
#: camel/providers/pop3/camel-pop3-store.c:532
msgid "Cancelled"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
msgid "Authentication Failed"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
msgid "Authentication Required"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
msgid "TLS not Available"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
#, fuzzy
msgid "Address Book does not exist"
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
msgid "Other error"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
msgid "Do you want to save changes?"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
msgid "_Discard"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
msgid "Error adding list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:106
-#: addressbook/gui/widgets/eab-gui-util.c:524
+#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:525
msgid "Error adding contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
msgid "Error modifying list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
msgid "Error modifying contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
msgid "Error removing list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:125
-#: addressbook/gui/widgets/eab-gui-util.c:482
+#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:483
msgid "Error removing contact"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
#, c-format
msgid ""
"%s already exists\n"
"Do you want to overwrite it?"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
msgid "Overwrite"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
#, c-format
msgid "Error saving %s: %s"
msgstr ""
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
msgid "card.vcf"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
msgid "list"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
#, fuzzy
msgid "Move contact to"
msgstr "_Other Organiser"
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
#, fuzzy
msgid "Copy contact to"
msgstr "_Other Organiser"
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
#, fuzzy
msgid "Move contacts to"
msgstr "_Other Organiser"
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
#, fuzzy
msgid "Copy contacts to"
msgstr "_Other Organiser"
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
#, fuzzy
msgid "Select target addressbook."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
msgid "Multiple VCards"
msgstr ""
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
#, c-format
msgid "VCard for %s"
msgstr ""
@@ -2990,34 +3028,31 @@ msgstr ""
msgid "Querying Address Book..."
msgstr "Cannot initialise Evolution's mail component."
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
msgid "Edit Contact Info"
msgstr ""
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
msgid "Merge E-Mail Address"
msgstr ""
-#: addressbook/gui/widgets/eab-vcard-control.c:140
+#: addressbook/gui/widgets/eab-vcard-control.c:139
#, fuzzy, c-format
-msgid "and %d other contacts."
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
msgid "and one other contact."
-msgstr "_Other Organiser"
+msgid_plural "and %d other contacts."
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
msgid "Show Full VCard"
msgstr ""
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
msgid "Show Compact VCard"
msgstr ""
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
msgid "Save in addressbook"
msgstr ""
@@ -3170,7 +3205,7 @@ msgstr ""
msgid "Number of columns:"
msgstr ""
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23
msgid "Options"
msgstr ""
@@ -3349,7 +3384,7 @@ msgid "Unnamed List"
msgstr ""
#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
-#: smime/gui/component.c:44
+#: smime/gui/component.c:48
msgid "Enter password"
msgstr ""
@@ -3432,7 +3467,7 @@ msgid "Evolution's Tasks component"
msgstr "Cannot initialise Evolution's mail component."
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1134 calendar/gui/print.c:1820
+#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
#: calendar/importers/icalendar-importer.c:709
msgid "Tasks"
@@ -3479,24 +3514,24 @@ msgstr ""
msgid "_Edit appointment"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:903
+#: calendar/gui/alarm-notify/alarm-queue.c:906
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
msgid "Dismiss"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
msgid "Dismiss All"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
msgid "No description available."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3505,12 +3540,12 @@ msgid ""
"Ending at %s"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1082
-#: calendar/gui/alarm-notify/alarm-queue.c:1106
+#: calendar/gui/alarm-notify/alarm-queue.c:1089
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
msgid "Warning"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1086
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -3518,7 +3553,7 @@ msgid ""
"a normal reminder dialog box instead."
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1112
+#: calendar/gui/alarm-notify/alarm-queue.c:1119
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3529,7 +3564,7 @@ msgid ""
"Are you sure you want to run this program?"
msgstr ""
-#: calendar/gui/alarm-notify/alarm-queue.c:1126
+#: calendar/gui/alarm-notify/alarm-queue.c:1133
msgid "Do not ask me about this program again."
msgstr ""
@@ -3696,13 +3731,13 @@ msgstr ""
msgid "Location contains"
msgstr "Organisation"
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1100
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
msgid "Unmatched"
msgstr ""
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1599
-#: camel/providers/groupwise/camel-gw-listener.c:298
-#: camel/providers/groupwise/camel-gw-listener.c:322
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
+#: camel/providers/groupwise/camel-gw-listener.c:302
+#: camel/providers/groupwise/camel-gw-listener.c:326
msgid "Calendar"
msgstr ""
@@ -3718,7 +3753,7 @@ msgid "Purge events older than"
msgstr ""
#: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
msgid "days"
msgstr ""
@@ -3729,7 +3764,7 @@ msgstr ""
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1367 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr ""
@@ -3751,74 +3786,74 @@ msgstr "%m/%d/%Y"
msgid "%d %B"
msgstr ""
-#: calendar/gui/calendar-component.c:313
+#: calendar/gui/calendar-component.c:373
#, c-format
msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
#: calendar/gui/dialogs/calendar-setup.glade.h:13
msgid "New Calendar"
msgstr ""
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
msgid "New appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
msgid "_Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
msgid "Create a new appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
#, fuzzy
msgid "New meeting"
msgstr "Synchronising folders"
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
#, fuzzy
msgid "M_eeting"
msgstr "Organisation"
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
msgid "Create a new meeting request"
msgstr ""
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
msgid "New all day appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
msgid "All _Day Appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
msgid "Create a new all-day appointment"
msgstr ""
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
#, fuzzy
msgid "New calendar"
msgstr "Synchronising folder failed: %s: %s"
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
#, fuzzy
msgid "C_alendar"
msgstr "Organisation"
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
msgid "Create a new calendar"
msgstr ""
-#: calendar/gui/calendar-component.c:933
+#: calendar/gui/calendar-component.c:1013
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
msgid "There is no calendar available for creating events and meetings"
msgstr ""
@@ -3848,10 +3883,6 @@ msgstr ""
msgid "Month View"
msgstr ""
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr ""
-
#: calendar/gui/comp-editor-factory.c:408
msgid "Error while opening the calendar"
msgstr ""
@@ -3869,16 +3900,16 @@ msgstr ""
msgid "open_client(): %s"
msgstr ""
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
#, fuzzy, c-format
msgid "Could not open the folder in '%s'"
msgstr "Could not close temporary folder: %s"
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
msgid "The URI that the calendar will display"
msgstr ""
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
msgid "The type of view to show"
msgstr ""
@@ -3942,11 +3973,11 @@ msgstr ""
msgid "extra times every"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
msgid "hours"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
msgid "minutes"
msgstr ""
@@ -3969,11 +4000,11 @@ msgstr ""
msgid "Date/Time:"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:463
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
msgid "Display a message"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:459
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
msgid "Play a sound"
msgstr ""
@@ -3981,17 +4012,17 @@ msgstr ""
msgid "Reminders"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
msgid "Run a program"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:9
#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:938 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
#: calendar/gui/e-tasks.c:164
msgid "Summary:"
msgstr ""
@@ -4022,7 +4053,7 @@ msgid "hour(s)"
msgstr ""
#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:40
msgid "minute(s)"
msgstr ""
@@ -4032,8 +4063,8 @@ msgstr ""
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
-#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:876
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
+#: mail/em-composer-prefs.c:784 mail/em-composer-prefs.c:948
msgid "Enabled"
msgstr ""
@@ -4047,19 +4078,19 @@ msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.c:710
#: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
msgid "Disable"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.c:710
#: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:315
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
-#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
-#: mail/em-composer-prefs.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
+#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
+#: mail/em-composer-prefs.c:751 mail/em-composer-prefs.c:769
+#: mail/em-composer-prefs.c:793
msgid "Enable"
msgstr ""
@@ -4083,7 +4114,7 @@ msgstr ""
msgid "60 minutes"
msgstr ""
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
msgid "Alerts"
msgstr ""
@@ -4108,7 +4139,7 @@ msgid "Days"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:74
msgid "E_nable"
msgstr ""
@@ -4205,7 +4236,7 @@ msgid "Wednesday"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
msgid "Work Week"
msgstr ""
@@ -4250,7 +4281,6 @@ msgid "_Fri"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
msgid "_General"
msgstr ""
@@ -4341,7 +4371,7 @@ msgid ""
msgstr ""
#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
#, fuzzy
msgid "New Task List"
msgstr "_Other Organiser"
@@ -4483,28 +4513,28 @@ msgstr ""
msgid "%s You have made no changes, update the editor?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
#, c-format
msgid "Validation error: %s"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2259
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
msgid " to "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2263
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
msgid " (Completed "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2265
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
msgid "Completed "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2270
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
msgid " (Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2272
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
msgid "Due "
msgstr ""
@@ -4541,8 +4571,9 @@ msgstr ""
msgid "No summary"
msgstr ""
-#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1083
-#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
+#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
+#: composer/e-msg-composer.c:1153
msgid "Save as..."
msgstr ""
@@ -4556,35 +4587,20 @@ msgstr ""
msgid "Unable to use current version!"
msgstr ""
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
#, fuzzy
msgid "Could not open source"
msgstr "Could not close temporary folder: %s"
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
#, fuzzy
msgid "Could not open destination"
msgstr "Could not initialise Bonobo"
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
msgid "Destination is read only"
msgstr ""
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr ""
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "calendar"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-#, fuzzy
-msgid "task list"
-msgstr "_Other Organiser"
-
#: calendar/gui/dialogs/delete-comp.c:95
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4614,18 +4630,24 @@ msgstr ""
#: calendar/gui/dialogs/delete-comp.c:131
#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr ""
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:138
#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr ""
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/dialogs/delete-comp.c:141
+#: calendar/gui/dialogs/delete-comp.c:145
#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr ""
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] ""
+msgstr[1] ""
#: calendar/gui/dialogs/delete-error.c:52
msgid "The event could not be deleted due to a corba error"
@@ -4687,7 +4709,7 @@ msgstr ""
msgid "Enter Delegate"
msgstr ""
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2296
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
msgid "Appointment"
msgstr ""
@@ -4760,8 +4782,6 @@ msgstr "Organisation"
#: calendar/gui/dialogs/event-page.glade.h:6
#: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
msgid "Classification"
msgstr ""
@@ -4813,13 +4833,13 @@ msgstr ""
#. an empty string is the same as 'None'
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:784
-#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
-#: mail/mail-config.glade.h:80
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
+#: mail/mail-config.glade.h:100
#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
+#: 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
msgid "None"
msgstr ""
@@ -4876,13 +4896,13 @@ msgid "Member"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr ""
#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:9
#: calendar/gui/e-meeting-list-view.c:270
#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
#: mail/message-list.etspec.h:12
@@ -5056,7 +5076,7 @@ msgid "_No recurrence"
msgstr ""
#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:452
msgid "_Remove"
msgstr ""
@@ -5095,7 +5115,7 @@ msgid ""
"Do you wish to save your changes?"
msgstr ""
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
msgid "_Discard Changes"
msgstr ""
@@ -5103,6 +5123,27 @@ msgstr ""
msgid "Save Event"
msgstr ""
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+msgid "Select source"
+msgstr ""
+
+#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, c-format
+msgid "Select destination %s"
+msgstr ""
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "calendar"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+#, fuzzy
+msgid "task list"
+msgstr "_Other Organiser"
+
#: calendar/gui/dialogs/send-comp.c:57
msgid "The meeting information has been created. Send it?"
msgstr ""
@@ -5132,39 +5173,39 @@ msgstr ""
#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
-#: calendar/gui/print.c:2347
+#: calendar/gui/print.c:2346
msgid "Completed"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:5
#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:939
+#: mail/message-list.c:947
msgid "High"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:6
#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2344
+#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
msgid "In Progress"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:937
+#: mail/message-list.c:945
msgid "Low"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:938
+#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
msgid "Normal"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2340
msgid "Not Started"
msgstr ""
@@ -5179,7 +5220,7 @@ msgid "Undefined"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+msgid "_Date completed:"
msgstr ""
#: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5222,9 +5263,9 @@ msgstr ""
msgid "Con_fidential"
msgstr ""
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:993
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
msgid "Description:"
msgstr ""
@@ -5234,12 +5275,14 @@ msgid "Folder:"
msgstr "Synchronising folder"
#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
-msgstr ""
+#, fuzzy
+msgid "Sta_rt date:"
+msgstr "_Other Organiser"
#: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
-msgstr ""
+#, fuzzy
+msgid "_Due date:"
+msgstr "_Other Organiser"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
msgid "Authentication Credentials for HTTP Server"
@@ -5292,136 +5335,111 @@ msgstr ""
#: calendar/gui/e-alarm-list.c:395
#, c-format
-msgid "%d days"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr ""
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-alarm-list.c:411
+#: calendar/gui/e-alarm-list.c:400
#, c-format
-msgid "%d hours"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr ""
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-alarm-list.c:419
+#: calendar/gui/e-alarm-list.c:405
#, c-format
-msgid "%d minutes"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr ""
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-alarm-list.c:427
+#: calendar/gui/e-alarm-list.c:410
#, c-format
-msgid "%d seconds"
-msgstr ""
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr ""
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-alarm-list.c:467
-msgid "Send an email"
-msgstr ""
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
-#: calendar/gui/e-alarm-list.c:477
+#: calendar/gui/e-alarm-list.c:462
msgid "Unknown action to be performed"
msgstr ""
-#: calendar/gui/e-alarm-list.c:489
+#: calendar/gui/e-alarm-list.c:474
#, c-format
msgid "%s %s before the start of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:492
+#: calendar/gui/e-alarm-list.c:477
#, c-format
msgid "%s %s after the start of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:497
+#: calendar/gui/e-alarm-list.c:482
#, c-format
msgid "%s at the start of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:506
+#: calendar/gui/e-alarm-list.c:491
#, c-format
msgid "%s %s before the end of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:509
+#: calendar/gui/e-alarm-list.c:494
#, c-format
msgid "%s %s after the end of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:514
+#: calendar/gui/e-alarm-list.c:499
#, c-format
msgid "%s at the end of the appointment"
msgstr ""
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
#, c-format
msgid "%s at %s"
msgstr ""
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
#, c-format
msgid "%s for an unknown trigger type"
msgstr ""
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
+#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
msgid "Public"
msgstr ""
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
#: calendar/gui/e-calendar-table.c:370
msgid "Private"
msgstr ""
-#: calendar/gui/e-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
#: calendar/gui/e-calendar-table.c:371
msgid "Confidential"
msgstr ""
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
msgstr ""
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-cal-list-view.etspec.h:3
msgid "Start Date"
msgstr ""
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4
+#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
msgid "Summary"
msgstr ""
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-#, fuzzy
-msgid "color"
-msgstr "Colours"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr ""
-
#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
msgid "Free"
msgstr ""
@@ -5454,250 +5472,262 @@ msgid ""
"45.436845,125.862501"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr ""
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr ""
#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
#: calendar/gui/e-meeting-list-view.c:144
#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
#: camel/camel-gpg-context.c:1665 camel/camel-gpg-context.c:1716
#: camel/camel-tcp-stream-openssl.c:631
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2112
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
+#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
msgid "Unknown"
msgstr ""
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
msgid "Recurring"
msgstr ""
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
msgid "Assigned"
msgstr ""
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
+#: calendar/gui/e-calendar-table.c:413
+msgid "0%"
msgstr ""
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
+#: calendar/gui/e-calendar-table.c:414
+msgid "10%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
+#: calendar/gui/e-calendar-table.c:415
+msgid "20%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
+#: calendar/gui/e-calendar-table.c:416
+msgid "30%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
+#: calendar/gui/e-calendar-table.c:417
+msgid "40%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
+#: calendar/gui/e-calendar-table.c:418
+msgid "50%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1082 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
+#: calendar/gui/e-calendar-table.c:419
+msgid "60%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:1046
-#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
+#: calendar/gui/e-calendar-table.c:420
+msgid "70%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
+#: calendar/gui/e-calendar-table.c:421
+msgid "80%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
+#: calendar/gui/e-calendar-table.c:422
+msgid "90%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
+#: calendar/gui/e-calendar-table.c:423
+msgid "100%"
msgstr ""
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1078
-#: mail/em-folder-view.c:750 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+msgid "Deleting selected objects"
msgstr ""
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
-#: mail/em-folder-view.c:752 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:126
-msgid "_Save As..."
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
msgstr ""
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
+#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
msgstr ""
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
-#: mail/em-folder-tree.c:2230 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
+#: calendar/gui/e-calendar-table.c:1041
+msgid "Open _Web Page"
msgstr ""
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
+#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
+#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
+#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
msgstr ""
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
+#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
msgstr ""
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
+#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
+#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+msgid "_Copy"
msgstr ""
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
+#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
+#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
+#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
msgstr ""
-#: calendar/gui/e-calendar-table.c:413
-msgid "0%"
+#: calendar/gui/e-calendar-table.c:1053
+msgid "_Assign Task"
msgstr ""
-#: calendar/gui/e-calendar-table.c:414
-msgid "10%"
+#: calendar/gui/e-calendar-table.c:1054
+msgid "_Forward as iCalendar"
msgstr ""
-#: calendar/gui/e-calendar-table.c:415
-msgid "20%"
+#: calendar/gui/e-calendar-table.c:1055
+msgid "_Mark as Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:416
-msgid "30%"
+#: calendar/gui/e-calendar-table.c:1056
+msgid "_Mark Selected Tasks as Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:417
-msgid "40%"
+#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
+msgid "_Delete Selected Tasks"
msgstr ""
-#: calendar/gui/e-calendar-table.c:418
-msgid "50%"
+#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Click to add a task"
msgstr ""
-#: calendar/gui/e-calendar-table.c:419
-msgid "60%"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:420
-msgid "70%"
+#: 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:602
+msgid "Complete"
msgstr ""
-#: calendar/gui/e-calendar-table.c:421
-msgid "80%"
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Completion date"
msgstr ""
-#: calendar/gui/e-calendar-table.c:422
-msgid "90%"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
+msgstr "_Other Organiser"
-#: calendar/gui/e-calendar-table.c:423
-msgid "100%"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Priority"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1038
-msgid "Open _Web Page"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "_Other Organiser"
-#: calendar/gui/e-calendar-table.c:1050
-msgid "_Assign Task"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Task sort"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1051
-msgid "_Forward as iCalendar"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
msgstr ""
-#: calendar/gui/e-calendar-table.c:1052
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1053
-msgid "_Mark Selected Tasks as Complete"
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1058 calendar/gui/e-calendar-table.c:1076
-msgid "_Delete Selected Tasks"
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
msgstr ""
-#: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
-msgid "Click to add a task"
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr ""
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Organisation"
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:597
-msgid "Complete"
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Organisation"
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:12
-msgid "Priority"
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Task sort"
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
msgstr ""
#. strftime format of a weekday, a date and a time, 24-hour.
@@ -5727,26 +5757,26 @@ msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1350
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
msgid "%A %d %B"
msgstr ""
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1383
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:604 calendar/gui/e-week-view.c:334
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
#: calendar/gui/print.c:838
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:607 calendar/gui/e-week-view.c:337
+#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
#: calendar/gui/print.c:840
msgid "pm"
msgstr ""
@@ -5755,416 +5785,413 @@ msgstr ""
msgid "Yes. (Complex Recurrence)"
msgstr ""
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, c-format
msgid "Every day"
-msgstr ""
+msgid_plural "Every %d days"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:607
#, c-format
-msgid "Every %d days"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:611
msgid "Every week"
-msgstr ""
+msgid_plural "Every %d weeks"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:609
#, c-format
-msgid "Every %d weeks"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:616
msgid "Every week on "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr ""
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
msgid " and "
msgstr ""
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
#, c-format
msgid "The %s day of "
msgstr ""
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
#, c-format
msgid "The %s %s of "
msgstr ""
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, c-format
msgid "every month"
-msgstr ""
+msgid_plural "every %d months"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:648
#, c-format
-msgid "every %d months"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:662
msgid "Every year"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr ""
+msgid_plural "Every %d years"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:659
#, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:668
msgid ", ending on "
msgstr ""
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
msgid "<b>Starts:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
msgid "<b>Ends:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
msgid "<b>Completed:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
msgid "<b>Due:</b> "
msgstr ""
-#: calendar/gui/e-itip-control.c:786 calendar/gui/e-itip-control.c:839
+#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
msgid "iCalendar Information"
msgstr ""
#. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
msgid "iCalendar Error"
msgstr ""
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:886
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:914
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
msgid "An unknown person"
msgstr ""
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:904
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr ""
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
msgid "<i>None</i>"
msgstr ""
+#: calendar/gui/e-itip-control.c:930
+#, fuzzy
+msgid "Location:"
+msgstr "Organisation"
+
#. write status
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-tasks.c:199
+#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
msgid "Status:"
msgstr ""
-#: calendar/gui/e-itip-control.c:966 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:970 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr ""
-#: calendar/gui/e-itip-control.c:974 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr ""
-#: calendar/gui/e-itip-control.c:1033 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1087 calendar/gui/e-itip-control.c:1100
-#: calendar/gui/e-itip-control.c:1113 calendar/gui/e-itip-control.c:1126
+#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
msgid "Choose an action:"
msgstr ""
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
msgid "Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1035 calendar/gui/e-itip-control.c:1066
-#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1102
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
+#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
#: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr ""
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
msgid "Accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
msgid "Tentatively accept"
msgstr ""
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
msgid "Decline"
msgstr ""
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
msgid "Send Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
msgid "Update respondent status"
msgstr ""
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
msgid "Send Latest Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1127 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:394 mail/mail-send-recv.c:446
-#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr ""
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1186
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
msgid "Meeting Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1209
+#: calendar/gui/e-itip-control.c:1192
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1194
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
msgid "Meeting Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1199
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
msgid "Meeting Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1204
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
msgid "Meeting Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1212
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
msgid "Meeting Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1220
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
msgid "Meeting Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1245 calendar/gui/e-itip-control.c:1313
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1331
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
msgid "Bad Meeting Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1254
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
msgid "Task Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1260
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1262
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
msgid "Task Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1267
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
msgid "Task Update"
msgstr ""
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1272
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
msgid "Task Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1280
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr ""
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
msgid "Task Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1288
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
msgid "Task Cancellation"
msgstr ""
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
msgid "Bad Task Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1316
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
msgid "Free/Busy Information"
msgstr ""
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1321
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
msgid "Free/Busy Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr ""
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
msgid "Free/Busy Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
msgid "Bad Free/Busy Message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1424
+#: calendar/gui/e-itip-control.c:1407
msgid "The message does not appear to be properly formed"
msgstr ""
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
msgid "The message contains only unsupported requests."
msgstr ""
-#: calendar/gui/e-itip-control.c:1514
+#: calendar/gui/e-itip-control.c:1497
msgid "The attachment does not contain a valid calendar message"
msgstr ""
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
msgid "The attachment has no viewable calendar items"
msgstr ""
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
msgid "Calendar file could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
msgid "Update complete\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1807 calendar/gui/e-itip-control.c:1879
+#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
-#: calendar/gui/e-itip-control.c:1823 calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
msgid "Object is invalid and cannot be updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1833
+#: calendar/gui/e-itip-control.c:1816
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1828
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1847
msgid "There was an error on the CORBA system\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
msgid "Object could not be found\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
#, fuzzy
msgid "You don't have the right permissions to update the calendar\n"
msgstr "Could not close temporary folder: %s"
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
msgid "Attendee status updated\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
msgid "Attendee status could not be updated!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
msgid "Removal Complete"
msgstr ""
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1978
+#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
msgid "Item sent!\n"
msgstr ""
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:1982
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
msgid "The item could not be sent!\n"
msgstr ""
@@ -6299,7 +6326,7 @@ msgstr "%a %d/%m/%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
@@ -6383,12 +6410,12 @@ msgstr ""
msgid "Web Page:"
msgstr ""
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2179
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
#, c-format
msgid "Click to open %s"
msgstr ""
-#: calendar/gui/e-tasks.c:769 calendar/gui/gnome-cal.c:1916
+#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
#, c-format
msgid ""
"Error on %s:\n"
@@ -6396,7 +6423,7 @@ msgid ""
msgstr ""
#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:788 calendar/gui/gnome-cal.c:1937
+#: calendar/gui/e-tasks.c:792
#, c-format
msgid ""
"The task backend for\n"
@@ -6404,58 +6431,60 @@ msgid ""
" has crashed."
msgstr ""
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
#, c-format
msgid "Opening tasks at %s"
msgstr ""
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
#, c-format
msgid ""
"Error opening %s:\n"
"%s"
msgstr ""
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
msgid "Loading tasks"
msgstr ""
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
msgid "Completing tasks..."
msgstr ""
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
msgid "Deleting selected objects..."
msgstr ""
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
msgid "Expunging"
msgstr ""
-#: calendar/gui/gnome-cal.c:1751
+#: calendar/gui/gnome-cal.c:1760
#, c-format
-msgid "Loading tasks at %s"
+msgid "Loading appointments at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1779
#, c-format
-msgid "Loading appointments at %s"
+msgid "Loading tasks at %s"
msgstr ""
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1799
#, fuzzy, c-format
msgid "Opening %s"
msgstr "Synchronising folders"
-#: calendar/gui/gnome-cal.c:1945
+#: calendar/gui/gnome-cal.c:1928
#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1940
+#, c-format
+msgid "The task backend for '%s' has crashed."
msgstr ""
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
msgid "Purging"
msgstr ""
@@ -6476,44 +6505,46 @@ msgid "February"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
+msgid "January"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:6
-msgid "January"
+msgid "July"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:7
-msgid "July"
+msgid "June"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:8
-msgid "June"
+msgid "March"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:9
-msgid "March"
+msgid "May"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:10
-msgid "May"
+msgid "November"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:11
-msgid "November"
+msgid "October"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:12
-msgid "October"
-msgstr ""
+#, fuzzy
+msgid "Select Date"
+msgstr "_Other Organiser"
#: calendar/gui/goto-dialog.glade.h:13
msgid "September"
msgstr ""
#: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr ""
+#, fuzzy
+msgid "_Select Today"
+msgstr "Organisation"
#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
#: calendar/gui/itip-utils.c:351
@@ -6595,7 +6626,7 @@ msgid "Birthdays & Anniversaries"
msgstr ""
#. Create the Webcal source group
-#: calendar/gui/migration.c:442
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
msgid "On The Web"
msgstr ""
@@ -6752,81 +6783,81 @@ msgid "Sa"
msgstr ""
#. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
msgid "Selected day (%a %b %d %Y)"
msgstr ""
-#: calendar/gui/print.c:1940 calendar/gui/print.c:1944
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
msgid "%a %b %d"
msgstr ""
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
msgid "%a %d %Y"
msgstr ""
-#: calendar/gui/print.c:1945 calendar/gui/print.c:1947
-#: calendar/gui/print.c:1948
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
msgid "%a %b %d %Y"
msgstr ""
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
#, c-format
msgid "Selected week (%s - %s)"
msgstr ""
#. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
msgid "Selected month (%b %Y)"
msgstr ""
#. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
msgid "Selected year (%Y)"
msgstr ""
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
msgid "Task"
msgstr ""
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
#, c-format
msgid "Status: %s"
msgstr ""
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
#, c-format
msgid "Priority: %s"
msgstr ""
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
#, c-format
msgid "Percent Complete: %i"
msgstr ""
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
#, c-format
msgid "URL: %s"
msgstr ""
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
#, c-format
msgid "Categories: %s"
msgstr ""
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
msgid "Contacts: "
msgstr ""
-#: calendar/gui/print.c:2560 calendar/gui/print.c:2646
-#: calendar/gui/print.c:2738 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
msgid "Print Preview"
msgstr ""
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
msgid "Print Item"
msgstr ""
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
msgid "Print Setup"
msgstr ""
@@ -6835,39 +6866,39 @@ msgstr ""
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr ""
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
msgid "New task"
msgstr ""
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
msgid "_Task"
msgstr ""
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
msgid "Create a new task"
msgstr ""
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
#, fuzzy
msgid "New task list"
msgstr "_Other Organiser"
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
#, fuzzy
msgid "_Task List"
msgstr "_Other Organiser"
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
#, fuzzy
msgid "Create a new task list"
msgstr "_Other Organiser"
-#: calendar/gui/tasks-component.c:634
+#: calendar/gui/tasks-component.c:636
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr ""
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
msgid "There is no calendar available for creating tasks"
msgstr ""
@@ -8507,7 +8538,7 @@ msgstr ""
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -8515,7 +8546,7 @@ msgid ""
"reconnect to the network."
msgstr ""
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
#, c-format
msgid ""
"Could not open `%s':\n"
@@ -8523,7 +8554,7 @@ msgid ""
"Changes made to this folder will not be resynchronized."
msgstr ""
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
msgid "Resynchronizing with server"
msgstr ""
@@ -8540,7 +8571,7 @@ msgstr ""
msgid "Preparing folder '%s' for offline"
msgstr "Synchronising \"%s\""
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
msgid "You must be working online to complete this operation"
msgstr ""
@@ -8653,31 +8684,35 @@ msgstr ""
msgid "Performing query on unknown header: %s"
msgstr ""
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr ""
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr ""
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
msgid "Moving messages"
msgstr ""
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
#, fuzzy
msgid "Copying messages"
msgstr "Can not open message"
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1589
+msgid "Learning junk and/or non junk message(s)"
+msgstr ""
+
+#: camel/camel-folder.c:1618
#, fuzzy
msgid "Filtering new message(s)"
msgstr "Can not open message"
@@ -8707,7 +8742,8 @@ msgstr ""
#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-send-recv.c:593
+#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697
+#: mail/mail-send-recv.c:598
msgid "Cancelled."
msgstr ""
@@ -9064,7 +9100,7 @@ msgstr ""
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1197
msgid "Bad authentication response from server."
msgstr ""
@@ -9252,7 +9288,7 @@ msgstr ""
msgid "Signer: %s <%s>: %s\n"
msgstr ""
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Can not get folder: Invalid operation on this store"
@@ -9261,21 +9297,22 @@ msgstr "Can not get folder: Invalid operation on this store"
msgid "Cannot create folder `%s': folder exists"
msgstr "Can not get folder: %s: %s"
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Can not create folder: Invalid operation on this store"
-#: camel/camel-store.c:381 camel/camel-vee-store.c:351
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Can not delete folder: %s: Invalid operation"
-#: camel/camel-store.c:779 mail/mail-ops.c:1120
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
msgid "Trash"
msgstr ""
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1124
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
+#: ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr ""
@@ -9484,17 +9521,17 @@ msgstr ""
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "You can not copy messages from this rubbish bin."
-#: camel/camel-vee-store.c:365
+#: camel/camel-vee-store.c:368
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Can not delete folder: %s: No such folder"
-#: camel/camel-vee-store.c:378
+#: camel/camel-vee-store.c:381
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Can not rename folder: %s: Invalid operation"
-#: camel/camel-vee-store.c:386
+#: camel/camel-vee-store.c:389
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Can not rename folder: %s: No such folder"
@@ -9528,51 +9565,51 @@ msgstr ""
msgid "Automatically synchronize remote mail locally"
msgstr ""
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "Cannot initialise Evolution's mail component."
+
#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
+msgid "Post Office Agent SOAP Port:"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-#, fuzzy
-msgid "Search base:"
-msgstr "_Other Organiser"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
msgid "Novell GroupWise"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
msgid "For accessing Novell Groupwise servers"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:97
#: camel/providers/imap/camel-imap-provider.c:93
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
msgid "Password"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
#: camel/providers/imap/camel-imap-provider.c:95
#: camel/providers/imapp/camel-imapp-provider.c:67
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
-#: camel/providers/groupwise/camel-gw-listener.c:299
-#: camel/providers/groupwise/camel-gw-listener.c:323
+#: camel/providers/groupwise/camel-gw-listener.c:303
+#: camel/providers/groupwise/camel-gw-listener.c:327
msgid "Checklist"
msgstr ""
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:2888
+#: camel/providers/imap/camel-imap-store.c:3024
msgid "Operation cancelled"
msgstr ""
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2891
+#: camel/providers/imap/camel-imap-store.c:3027
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr ""
@@ -9628,14 +9665,14 @@ msgstr ""
msgid "Scanning for changed messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1917
+#: camel/providers/imap/camel-imap-folder.c:1924
#, fuzzy, c-format
msgid "Unable to retrieve message: %s"
msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-maildir-folder.c:224
#: camel/providers/local/camel-maildir-folder.c:233
@@ -9651,25 +9688,25 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1971
#: camel/providers/local/camel-maildir-folder.c:211
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mh-folder.c:200
msgid "No such message"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1971
-#: camel/providers/imap/camel-imap-folder.c:2567
+#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2601
#: camel/providers/nntp/camel-nntp-folder.c:205
msgid "This message is not currently available"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2231
-#: camel/providers/imap/camel-imap-folder.c:2301
+#: camel/providers/imap/camel-imap-folder.c:2265
+#: camel/providers/imap/camel-imap-folder.c:2335
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:2605
+#: camel/providers/imap/camel-imap-folder.c:2639
msgid "Could not find message body in FETCH response."
msgstr ""
@@ -9741,18 +9778,18 @@ msgstr ""
msgid "For reading and storing mail on IMAP servers."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
#, c-format
msgid "IMAP server %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:480
+#: camel/providers/imap/camel-imap-store.c:426
#, c-format
msgid "IMAP service for %s on %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:601
-#: camel/providers/imap/camel-imap-store.c:621
+#: camel/providers/imap/camel-imap-store.c:546
+#: camel/providers/imap/camel-imap-store.c:566
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:140
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -9762,14 +9799,14 @@ msgstr ""
msgid "Could not connect to %s (port %d): %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:603
+#: camel/providers/imap/camel-imap-store.c:548
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:618
-#: camel/providers/imap/camel-imap-store.c:850
+#: camel/providers/imap/camel-imap-store.c:563
+#: camel/providers/imap/camel-imap-store.c:800
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:137
#: camel/providers/nntp/camel-nntp-store.c:155
@@ -9777,49 +9814,49 @@ msgstr ""
msgid "Connection cancelled"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap/camel-imap-store.c:715
+#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:665
#, fuzzy, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/imap/camel-imap-store.c:685
+#: camel/providers/imap/camel-imap-store.c:635
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:716
+#: camel/providers/imap/camel-imap-store.c:666
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
#, fuzzy, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1227
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1237
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1260
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1317
+#: camel/providers/imap/camel-imap-store.c:1274
msgid "You didn't enter a password."
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1346
+#: camel/providers/imap/camel-imap-store.c:1303
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -9827,32 +9864,33 @@ msgid ""
"\n"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1693
-#: camel/providers/imap/camel-imap-store.c:1845
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
#, c-format
msgid "No such folder %s"
msgstr ""
-#: camel/providers/imap/camel-imap-store.c:1786
+#: camel/providers/imap/camel-imap-store.c:1801
+#: camel/providers/imap/camel-imap-store.c:2090
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1825
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:234
+#: camel/providers/local/camel-mh-store.c:236
#, fuzzy, c-format
msgid "Cannot create folder `%s': folder exists."
msgstr "Can not get folder: %s: %s"
-#: camel/providers/imap/camel-imap-store.c:2046
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:2058
+#: camel/providers/imap/camel-imap-store.c:2102
#, fuzzy, c-format
msgid "Unknown parent folder: %s"
msgstr "Can not get folder: %s: %s"
-#: camel/providers/imap/camel-imap-store.c:2094
+#: camel/providers/imap/camel-imap-store.c:2152
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
@@ -9883,20 +9921,20 @@ msgid "Index message body data"
msgstr ""
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:389
#, c-format
msgid "~%s (%s)"
msgstr ""
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:396
#, fuzzy, c-format
msgid "mailbox:%s (%s)"
msgstr "Can not open mailbox: %s: %s\n"
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:400
#, c-format
msgid "%s (%s)"
msgstr ""
@@ -9952,7 +9990,7 @@ msgstr ""
#: camel/providers/local/camel-local-store.c:138
#: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:355
+#: camel/providers/local/camel-mbox-store.c:356
#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
@@ -10001,8 +10039,8 @@ msgstr ""
msgid "Could not delete folder index file `%s': %s"
msgstr ""
-#: camel/providers/local/camel-local-store.c:417
-#: camel/providers/local/camel-mbox-store.c:319
+#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-mbox-store.c:320
#, fuzzy, c-format
msgid "Could not delete folder meta file `%s': %s"
msgstr "Could not close temporary folder: %s"
@@ -10032,14 +10070,14 @@ msgstr ""
#: camel/providers/local/camel-maildir-store.c:107
#: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:202
+#: camel/providers/local/camel-mh-store.c:204
#, fuzzy, c-format
msgid "Cannot get folder `%s': %s"
msgstr "Can not get folder: %s: %s"
#: camel/providers/local/camel-maildir-store.c:111
#: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:209
+#: camel/providers/local/camel-mh-store.c:211
#, fuzzy, c-format
msgid "Cannot get folder `%s': folder does not exist."
msgstr "Can not get folder: %s: %s"
@@ -10058,7 +10096,7 @@ msgstr "Can not delete folder: %s: Invalid operation"
#: camel/providers/local/camel-maildir-store.c:173
#: camel/providers/local/camel-maildir-store.c:211
-#: camel/providers/local/camel-mh-store.c:258
+#: camel/providers/local/camel-mh-store.c:260
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr ""
@@ -10067,28 +10105,28 @@ msgstr ""
msgid "not a maildir directory"
msgstr ""
-#: camel/providers/local/camel-maildir-store.c:375
+#: camel/providers/local/camel-maildir-store.c:336
#: camel/providers/local/camel-spool-store.c:286
#: camel/providers/local/camel-spool-store.c:316
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr ""
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "Can not open maildir directory path: %s: %s"
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
msgid "Checking folder consistency"
msgstr ""
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
msgid "Checking for new messages"
msgstr ""
-#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-maildir-summary.c:735
#: camel/providers/local/camel-mbox-summary.c:369
#: camel/providers/local/camel-mbox-summary.c:542
#: camel/providers/local/camel-mbox-summary.c:633
@@ -10136,7 +10174,7 @@ msgid "Message construction failed: Corrupt mailbox?"
msgstr ""
#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
#, fuzzy
msgid "Cannot create a folder by this name."
msgstr "Can not create folder lock on %s: %s"
@@ -10165,30 +10203,30 @@ msgstr ""
msgid "Folder `%s' is not empty. Not deleted."
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
#, fuzzy, c-format
msgid "Cannot create directory `%s': %s."
msgstr "Can not create folder lock on %s: %s"
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
#, fuzzy, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Can not get folder: %s: %s"
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
msgid "Folder already exists"
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
msgid "The new folder name is illegal."
msgstr ""
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
#, fuzzy, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
#, fuzzy, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Could not close temporary folder: %s"
@@ -10232,7 +10270,7 @@ msgstr ""
msgid "Could not close temp folder: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2192
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
#, c-format
msgid "Could not rename folder: %s"
msgstr ""
@@ -10275,12 +10313,12 @@ msgstr ""
msgid "Cannot append message to mh folder: %s: %s"
msgstr "Can not append message to mh folder: %s: %s"
-#: camel/providers/local/camel-mh-store.c:217
+#: camel/providers/local/camel-mh-store.c:219
#, fuzzy, c-format
msgid "Could not create folder `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/local/camel-mh-store.c:229
+#: camel/providers/local/camel-mh-store.c:231
#, fuzzy, c-format
msgid "Cannot get folder `%s': not a directory."
msgstr "Can not get folder: %s: %s"
@@ -10550,46 +10588,46 @@ msgstr "Can not create folder lock on %s: %s"
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
#, c-format
msgid "Connection error: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
#, fuzzy, c-format
msgid "No such folder: %s"
msgstr "Synchronising folder failed: %s: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
#, fuzzy, c-format
msgid "Could not get group: %s"
msgstr "Could not close temporary folder: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
msgid "Could not get messages: unspecificed error"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
#, c-format
msgid "NNTP Command failed: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:434
-#: camel/providers/nntp/camel-nntp-summary.c:539
+#: camel/providers/nntp/camel-nntp-summary.c:438
+#: camel/providers/nntp/camel-nntp-summary.c:543
#, c-format
msgid "%s: Scanning new messages"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
#, c-format
msgid "Unknown server response: %s"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
msgid "Use cancel"
msgstr ""
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
#, c-format
msgid "Operation failed: %s"
msgstr ""
@@ -10636,7 +10674,7 @@ msgstr ""
msgid "Disable support for all POP3 extensions"
msgstr ""
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
msgid "POP"
msgstr ""
@@ -10716,7 +10754,7 @@ msgid "No such folder `%s'."
msgstr ""
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
msgid "Sendmail"
msgstr ""
@@ -10768,12 +10806,12 @@ msgstr ""
msgid "Mail delivery via the sendmail program"
msgstr ""
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
msgid "SMTP"
msgstr ""
#: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr ""
#: camel/providers/smtp/camel-smtp-transport.c:174
@@ -10892,11 +10930,11 @@ msgstr ""
#: camel/providers/smtp/camel-smtp-transport.c:358
#, c-format
-msgid "STARTTLS request timed out: %s"
+msgid "STARTTLS command failed: %s"
msgstr ""
#: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
+msgid "STARTTLS command failed"
msgstr ""
#: camel/providers/smtp/camel-smtp-transport.c:476
@@ -10928,154 +10966,152 @@ msgid "SMTP mail delivery via %s"
msgstr ""
#: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Can not encrypt this message: no recipients specified"
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
msgid "Cannot send message: sender address not valid."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:696
msgid "Sending message"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
msgid "Cannot send message: no recipients defined."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
#, fuzzy
msgid "Cannot send message: one or more invalid recipients"
msgstr "Can not encrypt this message: no recipients specified"
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
msgid "SMTP Greeting"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:943
#, c-format
-msgid "HELO request timed out: %s"
+msgid "HELO command failed: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+msgid "HELO command failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
msgid "SMTP Authentication"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
msgid "Error creating SASL authentication object."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
#, c-format
-msgid "AUTH request timed out: %s"
+msgid "AUTH command failed: %s"
msgstr ""
#: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
+msgid "AUTH command failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
msgid "Bad authentication response from server.\n"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1152
+#: camel/providers/smtp/camel-smtp-transport.c:1153
#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+msgid "MAIL FROM command failed: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+msgid "MAIL FROM command failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1194
#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+msgid "RCPT TO command failed: %s: mail not sent"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
#, c-format
msgid "RCPT TO <%s> failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1257
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
#, c-format
-msgid "DATA request timed out: %s: mail not sent"
+msgid "DATA command failed: %s: mail not sent"
msgstr ""
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-msgid "DATA response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+msgid "DATA command failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1368
#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
+msgid "RSET command failed: %s"
msgstr ""
#: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
+msgid "RSET command failed"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1427
+#: camel/providers/smtp/camel-smtp-transport.c:1407
#, c-format
-msgid "QUIT request timed out: %s"
+msgid "QUIT command failed: %s"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+msgid "QUIT command failed"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
#, c-format
msgid "%.0fK"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
#, c-format
msgid "%.0fM"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
#, c-format
msgid "%.0fG"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:301 mail/em-utils.c:1476
+#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
msgid "attachment"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:452
+#: composer/e-msg-composer-attachment-bar.c:453
msgid "Remove selected items from the attachment list"
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
msgid "Add attachment..."
msgstr ""
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
msgid "Attach a file to the message"
msgstr ""
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
#, c-format
msgid "Cannot attach file %s: %s"
msgstr ""
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr ""
@@ -11097,19 +11133,19 @@ msgstr ""
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:308
msgid "You need to configure an account before you can compose mail."
msgstr ""
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
msgid "Posting destination"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
msgid "Choose folders to post the message to."
msgstr ""
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
msgid "Click here for the address book"
msgstr ""
@@ -11120,45 +11156,45 @@ msgstr ""
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: composer/e-msg-composer-hdrs.c:572
+#: composer/e-msg-composer-hdrs.c:577
msgid "Reply-To:"
msgstr ""
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
msgid "From:"
msgstr ""
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
msgid "Subject:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
msgid "To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
msgid "Enter the recipients of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
msgid "Cc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:603
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
msgid "Bcc:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:607
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -11167,11 +11203,11 @@ msgstr ""
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
msgid "Post To:"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
msgid "Click here to select folders to post to"
msgstr ""
@@ -11179,83 +11215,83 @@ msgstr ""
msgid "Attach file(s)"
msgstr ""
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:662
msgid ""
"Cannot sign outgoing message: No signing certificate set for from account"
msgstr ""
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
#, fuzzy
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for from "
"account"
msgstr "Can not encrypt this message: no plaintext to encrypt"
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
#, c-format
msgid ""
"Error while reading file %s:\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
msgid "File exists, overwrite?"
msgstr ""
-#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
+#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
#, c-format
msgid "Error saving file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
#, c-format
msgid "Error loading file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
#, c-format
msgid "Error accessing file: %s"
msgstr ""
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
msgid "Unable to retrieve message from editor"
msgstr ""
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
#, c-format
msgid ""
"Unable to seek on file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
#, c-format
msgid ""
"Unable to truncate file: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
"%s"
msgstr ""
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
#, c-format
msgid ""
"Error autosaving message: %s\n"
" %s"
msgstr ""
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1401
msgid ""
"Ximian Evolution has found unsaved messages from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -11264,48 +11300,53 @@ msgid ""
msgstr ""
#: composer/e-msg-composer.c:1567
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Can not open message"
+
+#: composer/e-msg-composer.c:1574
msgid "Warning: Modified Message"
msgstr ""
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
msgid "Open file"
msgstr ""
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+msgid "Autogenerated"
msgstr ""
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
-msgid "Autogenerated"
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
msgstr ""
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2316
#, c-format
msgid "<b>%d</b> File Attached"
msgid_plural "<b>%d</b> Files Attached"
msgstr[0] ""
msgstr[1] ""
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr ""
-#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
msgid "Show _Attachment Bar (drop attachments here)"
msgstr ""
-#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3053
-#: composer/e-msg-composer.c:3054
+#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
+#: composer/e-msg-composer.c:3123
msgid "Compose a message"
msgstr ""
-#: composer/e-msg-composer.c:3083
+#: composer/e-msg-composer.c:3152
msgid ""
"Could not create composer window:\n"
"Unable to activate address selector control."
msgstr ""
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:3181
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component.\n"
@@ -11313,13 +11354,13 @@ msgid ""
"of gtkhtml and libgtkhtml installed.\n"
msgstr ""
-#: composer/e-msg-composer.c:3216
+#: composer/e-msg-composer.c:3285
msgid ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
msgstr ""
-#: composer/e-msg-composer.c:4237
+#: composer/e-msg-composer.c:4290
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11435,21 +11476,21 @@ msgid ""
"do?"
msgstr ""
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
msgstr ""
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:251
msgid "Overwrite file?"
msgstr ""
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
msgid "Remember this password"
msgstr ""
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
msgid "Remember this password for the remainder of this session"
msgstr ""
@@ -11532,13 +11573,13 @@ msgstr ""
#. strptime format for time of day, without seconds,
#. in 12-hour format.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr ""
#. strptime format for time of day, without seconds 24-hour format.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
msgstr ""
@@ -11547,119 +11588,106 @@ msgstr ""
msgid "%I %p"
msgstr ""
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, c-format
msgid "1 second ago"
-msgstr ""
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:74
#, c-format
-msgid "%d seconds ago"
-msgstr ""
-
-#: filter/filter-datespec.c:66
msgid "1 minute ago"
-msgstr ""
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:75
#, c-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: filter/filter-datespec.c:67
msgid "1 hour ago"
-msgstr ""
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:76
#, c-format
-msgid "%d hours ago"
-msgstr ""
-
-#: filter/filter-datespec.c:68
msgid "1 day ago"
-msgstr ""
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:77
#, c-format
-msgid "%d days ago"
-msgstr ""
-
-#: filter/filter-datespec.c:69
msgid "1 week ago"
-msgstr ""
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:78
#, c-format
-msgid "%d weeks ago"
-msgstr ""
-
-#: filter/filter-datespec.c:70
msgid "1 month ago"
-msgstr ""
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:79
#, c-format
-msgid "%d months ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
msgid "1 year ago"
-msgstr ""
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr ""
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
msgid "You must choose a date."
msgstr ""
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
msgid "<click here to select a date>"
msgstr ""
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
msgid "now"
msgstr ""
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:297
#, fuzzy
msgid "%d-%b-%Y"
msgstr "%m/%d/%Y"
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
msgid "Select a time to compare against"
msgstr ""
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+msgid "_Filter Rules"
msgstr ""
#: filter/filter-file.c:166
msgid "You must specify a file name."
msgstr ""
-#: filter/filter-file.c:184
+#: filter/filter-file.c:185
#, c-format
msgid "File '%s' does not exist or is not a regular file."
msgstr ""
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
msgid "Choose a file"
msgstr ""
#. and now for the action area
#: filter/filter-filter.c:491
-msgid "Then"
-msgstr ""
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "Organisation"
#: filter/filter-folder.c:153
msgid "You must specify a folder."
msgstr ""
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:505
-#: mail/mail-account-gui.c:1098
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: mail/mail-account-gui.c:1153
msgid "Select Folder"
msgstr ""
@@ -11671,23 +11699,23 @@ msgid ""
msgstr ""
#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:63 mail/mail-config.glade.h:66
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
msgid "Important"
msgstr ""
#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
msgid "To Do"
msgstr ""
#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
-#: mail/mail-config.glade.h:70
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
msgid "Later"
msgstr ""
-#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
msgid "Test"
msgstr ""
@@ -11695,48 +11723,53 @@ msgstr ""
msgid "You must name this filter."
msgstr ""
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr ""
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
+msgstr "_Other Organiser"
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
msgid "Untitled"
msgstr ""
-#: filter/filter-rule.c:772
-msgid "If"
+#: filter/filter-rule.c:779
+msgid "<b>If</b>"
msgstr ""
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
msgid "Execute actions"
msgstr ""
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
msgid "if all criteria are met"
msgstr ""
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
msgid "if any criteria are met"
msgstr ""
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
msgid "incoming"
msgstr ""
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
msgid "outgoing"
msgstr ""
#: filter/filter.glade.h:1
-msgid "Compare against"
+msgid " "
msgstr ""
#: filter/filter.glade.h:2
-msgid "Edit Filters"
+msgid "<b>_Filter Rules</b>"
msgstr ""
#: filter/filter.glade.h:3
-msgid "Edit VFolders"
+msgid "<b>vFolder Sources</b>"
+msgstr ""
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
msgstr ""
#: filter/filter.glade.h:5
@@ -11744,80 +11777,68 @@ msgid "Incoming"
msgstr ""
#: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:7
msgid ""
"The message's date will be compared against\n"
"12:00am of the date specified."
msgstr ""
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
msgid ""
"The message's date will be compared against\n"
"a time relative to when filtering occurs."
msgstr ""
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
msgid ""
"The message's date will be compared against\n"
"the current time when filtering occurs."
msgstr ""
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
msgid "a time relative to the current time"
msgstr ""
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
msgid "ago"
msgstr ""
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
msgid "months"
msgstr ""
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
msgid "seconds"
msgstr ""
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
msgid "specific folders only"
msgstr ""
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
msgid "the current time"
msgstr ""
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
msgid "the time you specify"
msgstr ""
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr ""
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
msgid "weeks"
msgstr ""
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
msgid "with all active remote folders"
msgstr ""
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
msgid "with all local and active remote folders"
msgstr ""
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
msgid "with all local folders"
msgstr ""
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
msgid "years"
msgstr ""
@@ -11951,7 +11972,7 @@ msgstr ""
msgid "Junk Test"
msgstr "Cannot initialise Evolution's mail component."
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:783
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr ""
@@ -11981,7 +12002,7 @@ msgid "Move to Folder"
msgstr ""
#: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
+msgid "Pipe to Program"
msgstr ""
#: filter/libfilter-i18n.h:45
@@ -12016,21 +12037,21 @@ msgstr ""
msgid "returns less than"
msgstr ""
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: filter/libfilter-i18n.h:53
+msgid "Run Program"
msgstr ""
-#: filter/libfilter-i18n.h:54
-msgid "Sender"
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
msgstr ""
#: filter/libfilter-i18n.h:55
-msgid "Set Status"
+msgid "Sender"
msgstr ""
#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
+msgid "Set Status"
msgstr ""
#: filter/libfilter-i18n.h:57
@@ -12057,9 +12078,9 @@ msgstr ""
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1484
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
+#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
#: smime/lib/e-cert.c:1079
msgid "Subject"
msgstr ""
@@ -12068,17 +12089,13 @@ msgstr ""
msgid "Unset Status"
msgstr ""
-#: filter/rule-context.c:682 filter/rule-editor.c:243 filter/rule-editor.c:328
-#: mail/mail-vfolder.c:1007
+#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:1008
#, c-format
msgid "Rule name '%s' is not unique, choose another."
msgstr ""
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr ""
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
msgid "Add Rule"
msgstr ""
@@ -12090,8 +12107,8 @@ msgstr ""
msgid "Rule name"
msgstr ""
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+msgid "_Score Rules"
msgstr ""
#: filter/searchtypes.xml.h:1
@@ -12126,15 +12143,20 @@ msgstr ""
msgid "Subject does not contain"
msgstr ""
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Synchronising folder"
+
#: filter/vfolder-rule.c:215
msgid "You must name this vfolder."
msgstr ""
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
msgid "You need to to specify at least one folder as a source."
msgstr ""
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
msgid "VFolder source"
msgstr ""
@@ -12188,8 +12210,8 @@ msgstr ""
msgid "Evolution Mail preferences control"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:826
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
#: mail/importers/pine-importer.c:473
msgid "Mail"
msgstr ""
@@ -12198,53 +12220,49 @@ msgstr ""
msgid "Mail Accounts"
msgstr ""
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
msgid "Mail Preferences"
msgstr ""
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
msgid "Are you sure you want to delete this account?"
msgstr ""
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
msgid "Don't delete"
msgstr ""
#. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
msgid "[Default]"
msgstr ""
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
msgid "Account name"
msgstr ""
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
msgid "Protocol"
msgstr ""
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
-#: mail/mail-config.c:1252
+#: mail/em-composer-prefs.c:338 mail/em-composer-prefs.c:461
+#: mail/mail-config.c:1048
msgid "Unnamed"
msgstr ""
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
msgid "You must specify a valid script name."
msgstr ""
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr ""
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
msgid "Language(s)"
msgstr ""
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
+#: mail/em-composer-prefs.c:1000
+msgid "Add signature script"
msgstr ""
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
msgid "Signature(s)"
msgstr ""
@@ -12289,7 +12307,7 @@ msgid ""
"Would you like to use the default drafts folder?"
msgstr ""
-#: mail/em-folder-browser.c:133
+#: mail/em-folder-browser.c:138
msgid "Create _Virtual Folder From Search..."
msgstr ""
@@ -12321,398 +12339,427 @@ msgstr "Can not open message"
msgid "<click here to select a folder>"
msgstr ""
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
msgid "Create New Folder"
msgstr ""
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1950
-#: mail/mail-component.c:597
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/mail-component.c:638
#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
msgid "Specify where to create the folder:"
msgstr ""
-#: mail/em-folder-selector.c:267
+#: mail/em-folder-selector.c:303
#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
msgid "Folder _name:"
msgstr ""
-#: mail/em-folder-tree-model.c:167 mail/em-folder-tree-model.c:169
-#: mail/mail-vfolder.c:855
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:856
msgid "VFolders"
msgstr ""
-#: mail/em-folder-tree-model.c:177 mail/em-folder-tree-model.c:179
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
msgid "UNMATCHED"
msgstr ""
#. Inbox is always first
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
msgid "Inbox"
msgstr ""
-#: mail/em-folder-tree-model.c:458 mail/em-folder-tree-model.c:741
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
msgid "Loading..."
msgstr ""
-#: mail/em-folder-tree.c:831
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: mail/em-folder-tree.c:904
#, fuzzy
msgid "Cannot drop message(s) into toplevel store"
msgstr "You can not copy messages from this rubbish bin."
-#: mail/em-folder-tree.c:1798
+#: mail/em-folder-tree.c:1950
#, fuzzy, c-format
msgid "Cannot move folder `%s': illegal operation"
msgstr "Can not rename folder: %s: Invalid operation"
-#: mail/em-folder-tree.c:1827 mail/em-folder-tree.c:1915
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
#, c-format
msgid "%s"
msgstr ""
-#: mail/em-folder-tree.c:1843 mail/em-folder-tree.c:1856
-#: mail/em-folder-view.c:660 mail/em-folder-view.c:674
+#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
+#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
#: mail/importers/evolution-mbox-importer.c:119
msgid "Select folder"
msgstr ""
-#: mail/em-folder-tree.c:1950 mail/mail-component.c:597
+#: mail/em-folder-tree.c:2035
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Synchronising \"%s\""
+
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
#, fuzzy
msgid "Create folder"
msgstr "Synchronising folder"
-#: mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2347
#, fuzzy, c-format
msgid "Could not delete folder: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-folder-tree.c:2094
+#: mail/em-folder-tree.c:2372
#, fuzzy, c-format
msgid "Cannot delete local %s folder."
msgstr "Can not delete folder: %s: No such folder"
-#: mail/em-folder-tree.c:2100
+#: mail/em-folder-tree.c:2378
#, fuzzy, c-format
msgid "Really delete folder \"%s\" and all of its subfolders?"
msgstr "Can not delete folder: %s: No such folder"
-#: mail/em-folder-tree.c:2110
+#: mail/em-folder-tree.c:2388
#, c-format
msgid "Delete \"%s\""
msgstr ""
-#: mail/em-folder-tree.c:2144
+#: mail/em-folder-tree.c:2422
#, fuzzy, c-format
msgid "Cannot rename local %s folder."
msgstr "Can not rename folder: %s: No such folder"
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2431
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
-#: mail/em-folder-tree.c:2155
+#: mail/em-folder-tree.c:2433
#, fuzzy
msgid "Rename Folder"
msgstr "Synchronising folder"
-#: mail/em-folder-tree.c:2179
+#: mail/em-folder-tree.c:2457
#, c-format
msgid "A folder named \"%s\" already exists. Please use a different name."
msgstr ""
-#: mail/em-folder-tree.c:2225 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
msgid "_View"
msgstr ""
-#: mail/em-folder-tree.c:2226
+#: mail/em-folder-tree.c:2504
msgid "Open in _New Window"
msgstr ""
-#: mail/em-folder-tree.c:2231
+#: mail/em-folder-tree.c:2509
msgid "_Move"
msgstr ""
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2235
+#: mail/em-folder-tree.c:2513
#, fuzzy
msgid "_New Folder..."
msgstr "Synchronising folders"
-#: mail/em-folder-tree.c:2238
+#: mail/em-folder-tree.c:2516
msgid "_Rename"
msgstr ""
-#: mail/em-folder-tree.c:2241 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr ""
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:751 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
msgid "_Edit as New Message..."
msgstr ""
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:743
msgid "_Print"
msgstr ""
-#: mail/em-folder-view.c:756 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
msgid "_Reply to Sender"
msgstr ""
-#: mail/em-folder-view.c:757 mail/em-popup.c:808
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr ""
-#: mail/em-folder-view.c:758 mail/em-popup.c:809
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr ""
-#: mail/em-folder-view.c:759 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:111
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:113
msgid "_Forward"
msgstr ""
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:752
msgid "Follo_w Up..."
msgstr ""
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:753
msgid "Fla_g Completed"
msgstr ""
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:754
msgid "Cl_ear Flag"
msgstr ""
-#: mail/em-folder-view.c:767 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr ""
-#: mail/em-folder-view.c:768
+#: mail/em-folder-view.c:758
msgid "Mark as _Unread"
msgstr ""
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:759
msgid "Mark as _Important"
msgstr ""
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:760
msgid "_Mark as Unimportant"
msgstr ""
-#: mail/em-folder-view.c:771 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
msgid "Mark as _Junk"
msgstr ""
-#: mail/em-folder-view.c:772 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
msgid "Mark as _Not Junk"
msgstr ""
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:766
msgid "U_ndelete"
msgstr ""
-#: mail/em-folder-view.c:779
+#: mail/em-folder-view.c:769
msgid "Mo_ve to Folder..."
msgstr ""
-#: mail/em-folder-view.c:780 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr ""
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:778
msgid "Add Sender to Address_book"
msgstr ""
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:781
msgid "Appl_y Filters"
msgstr ""
-#: mail/em-folder-view.c:794
+#: mail/em-folder-view.c:782
+msgid "F_ilter Junk"
+msgstr ""
+
+#: mail/em-folder-view.c:785
msgid "Crea_te Rule From Message"
msgstr ""
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:786
msgid "VFolder on _Subject"
msgstr ""
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:787
msgid "VFolder on Se_nder"
msgstr ""
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:788
msgid "VFolder on _Recipients"
msgstr ""
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:789
msgid "VFolder on Mailing _List"
msgstr ""
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:791
msgid "VFolder on Thread"
msgstr ""
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:795
msgid "Filter on Sub_ject"
msgstr ""
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:796
msgid "Filter on Sen_der"
msgstr ""
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:797
msgid "Filter on Re_cipients"
msgstr ""
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:798
msgid "Filter on _Mailing List"
msgstr ""
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:800
msgid "Filter on Thread"
msgstr ""
#. default charset used in mail view
-#: mail/em-folder-view.c:1586 mail/em-folder-view.c:1624
-#: mail/mail-config.glade.h:41
+#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/mail-config.glade.h:66
msgid "Default"
msgstr ""
-#: mail/em-folder-view.c:1660
+#: mail/em-folder-view.c:1657
msgid "Print Message"
msgstr ""
-#: mail/em-folder-view.c:1907
+#: mail/em-folder-view.c:1904
#, fuzzy
msgid "_Copy Link Location"
msgstr "Organisation"
-#: mail/em-folder-view.c:2174
+#: mail/em-folder-view.c:2168
#, c-format
msgid "Click to mail %s"
msgstr ""
#. message-search popup match count string
-#: mail/em-format-html-display.c:402
+#: mail/em-format-html-display.c:409
#, c-format
msgid "Matches: %d"
msgstr ""
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:562
+#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
msgid "Unsigned"
msgstr ""
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:645
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr ""
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:563
+#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
msgid "Valid signature"
msgstr ""
-#: mail/em-format-html-display.c:639
+#: mail/em-format-html-display.c:646
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
msgstr ""
-#: mail/em-format-html-display.c:640 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
msgid "Invalid signature"
msgstr ""
-#: mail/em-format-html-display.c:640
+#: mail/em-format-html-display.c:647
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr ""
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
msgid "Valid signature, cannot verify sender"
msgstr ""
-#: mail/em-format-html-display.c:641
+#: mail/em-format-html-display.c:648
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
msgstr ""
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
msgid "Unencrypted"
msgstr ""
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:654
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr ""
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
msgid "Encrypted, weak"
msgstr ""
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:655
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would "
"be difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
msgid "Encrypted"
msgstr ""
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:656
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
msgstr ""
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
msgid "Encrypted, strong"
msgstr ""
-#: mail/em-format-html-display.c:650
+#: mail/em-format-html-display.c:657
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
#, fuzzy
msgid "_View Certificate"
msgstr "Could not close temporary folder: %s"
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
#, fuzzy
msgid "This certificate is not viewable"
msgstr "Could not close temporary folder: %s"
-#: mail/em-format-html-display.c:973
+#: mail/em-format-html-display.c:979
#, fuzzy
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
-#: mail/em-format-html-display.c:981
+#: mail/em-format-html-display.c:987
msgid "Overdue:"
msgstr ""
-#: mail/em-format-html-display.c:984
+#: mail/em-format-html-display.c:990
#, fuzzy
msgid "by %B %d, %Y, %l:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1060
msgid "_View Inline"
msgstr ""
-#: mail/em-format-html-display.c:1055
+#: mail/em-format-html-display.c:1061
msgid "_Hide"
msgstr ""
@@ -12721,124 +12768,156 @@ msgstr ""
msgid "Page %d of %d"
msgstr ""
-#: mail/em-format-html.c:455 mail/em-format-html.c:457
+#: mail/em-format-html.c:461 mail/em-format-html.c:463
#, c-format
msgid "Retrieving `%s'"
msgstr ""
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
msgid "Malformed external-body part."
msgstr ""
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr ""
-#: mail/em-format-html.c:853
+#: mail/em-format-html.c:881
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
#, c-format
msgid "Pointer to local file (%s)"
msgstr ""
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
#, c-format
msgid "Pointer to remote data (%s)"
msgstr ""
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr ""
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
#, fuzzy
msgid "Formatting message"
msgstr "Can not open message"
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:742
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
+#: mail/message-tag-followup.c:304
msgid "From"
msgstr ""
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:743
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
#: mail/em-mailer-prefs.c:68
msgid "Reply-To"
msgstr ""
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:744
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
msgid "To"
msgstr ""
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:745
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
#: mail/em-mailer-prefs.c:70
msgid "Cc"
msgstr ""
-#: mail/em-format-html.c:1375 mail/em-format-quote.c:191 mail/em-format.c:746
+#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
#: mail/em-mailer-prefs.c:71
msgid "Bcc"
msgstr ""
-#: mail/em-format-html.c:1491 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#. pseudo-header
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
msgid "Mailer"
msgstr ""
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1517
+#: mail/em-format-html.c:1569
msgid "<I> (%a, %R %Z)</I>"
msgstr ""
#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1520
+#: mail/em-format-html.c:1572
msgid "<I> (%R %Z)</I>"
msgstr ""
-#: mail/em-format-html.c:1532 mail/em-format-quote.c:315 mail/em-format.c:748
+#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
msgid "Date"
msgstr ""
-#: mail/em-format.c:963
+#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:987
#, c-format
msgid "%s attachment"
msgstr ""
-#: mail/em-format.c:1042 mail/em-format.c:1161
+#: mail/em-format.c:1066 mail/em-format.c:1188
msgid "Could not parse S/MIME message: Unknown error"
msgstr ""
-#: mail/em-format.c:1151
+#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
+#: mail/em-format.c:1223
+#, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr ""
+
+#: mail/em-format.c:1178
msgid "Unsupported encryption type for multipart/encrypted"
msgstr ""
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
msgid "Could not parse MIME message. Displaying as source."
msgstr ""
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
msgid "Unsupported signature format"
msgstr ""
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
msgid "Error verifying signature"
msgstr ""
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
msgid "Unknown error verifying signature"
msgstr ""
+#: mail/em-format.c:1372
+#, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr ""
+
#: mail/em-junk-filter.c:82
msgid "Spamassassin (built-in)"
msgstr ""
+#: mail/em-mailer-prefs.c:85
+msgid "Every time"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+msgid "Once per week"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:88
+msgid "Once per month"
+msgstr ""
+
#: mail/em-migrate.c:1079
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12847,22 +12926,22 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
#, fuzzy, c-format
msgid "Failed to migrate pop3 uid caches: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
#, fuzzy, c-format
msgid "Failed to migrate folder expand state: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
#, fuzzy, c-format
msgid "Failed to create directory `%s': %s"
msgstr "Could not close temporary folder: %s"
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
#, fuzzy, c-format
msgid "Failed to open store for `%s': %s"
msgstr "Could not close temporary folder: %s"
@@ -12902,57 +12981,57 @@ msgstr "Cannot initialise Evolution's mail component."
msgid "Open in %s..."
msgstr ""
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:604
msgid "This store does not support subscriptions, or they are not enabled."
msgstr ""
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
msgid "Subscribed"
msgstr ""
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
msgid "Folder"
msgstr ""
#. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:827
+#: mail/em-subscribe-editor.c:850
msgid "Please select a server."
msgstr ""
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
msgid "No server has been selected"
msgstr ""
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
msgid "Don't show this message again."
msgstr ""
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
#, c-format
msgid ""
"Error loading filter information:\n"
"%s"
msgstr ""
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
msgid "Filters"
msgstr ""
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
msgid "-------- Forwarded Message --------"
msgstr ""
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
msgid "an unknown sender"
msgstr ""
#. translators: attribution string used when quoting messages,
#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr ""
-#: mail/em-utils.c:1426 mail/em-utils.c:1510 mail/em-utils.c:1519
+#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
#, fuzzy, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -12961,44 +13040,44 @@ msgstr ""
"Can not get message: %s\n"
" %s"
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
#, c-format
msgid ""
"`%s' already exists.\n"
"Overwrite it?"
msgstr ""
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
#, fuzzy
msgid "message"
msgstr "Can not open message"
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
#, c-format
msgid "Error: '%s' exists and is not a regular file"
msgstr ""
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
msgid "Save Message..."
msgstr ""
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
#, fuzzy
msgid "Add address"
msgstr "Chile"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
#, c-format
msgid "Messages from %s"
msgstr ""
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
#, c-format
msgid "Could not create temporary directory: %s"
msgstr ""
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
#, c-format
msgid ""
"This operation will permanently remove all deleted messages in the folder `%"
@@ -13007,7 +13086,7 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/em-utils.c:2459
+#: mail/em-utils.c:2480
msgid ""
"This operation will permanently remove all deleted messages in all folders. "
"If you continue, you will not be able to recover these messages.\n"
@@ -13072,255 +13151,287 @@ msgid "Default height of the Message Window"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:15
-msgid "Default reply style"
+msgid "Default height of the Subscribe dialog"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:16
-msgid "Default width of the Composer Window"
+msgid "Default reply style"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Message Window"
+msgid "Default width of the Composer Window"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:18
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default width of the Message Window"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:19
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Subscribe dialog"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:20
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Draw spelling error indicators on words as you type."
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:21
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Empty Trash folders on exit"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:22
-msgid "Enable/disable caret mode"
+msgid "Empty all Trash folders when exiting Evolution."
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:23
-msgid "Height of the message-list pane"
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:24
-msgid "Height of the message-list pane."
+msgid "Enable/disable caret mode"
msgstr ""
#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
msgid ""
"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
"any mime-types appearing in this list which map to a bonobo-component viewer "
"in GNOME's mime-type database may be used for displaying content."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
msgid "List of Labels and their associated colours"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
msgid "List of accounts"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:31
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:32
msgid "List of custom headers and whether they are enabled."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:33
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:colour where colour uses the HTML hex encoding."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:34
msgid "List of mime types to check for bonobo component viewers"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:35
msgid "Load images for HTML messages over http"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:36
msgid ""
"Load images for HTML messages over http(s). Possible values are: 0 - Never "
"load images off the net 1 - Load images if sender is in the addressbook 2 - "
"Always load images off the net"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
msgid "Log filter actions"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:38
msgid "Log filter actions to the specified log file."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
msgid "Logfile to log filter actions"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
msgid "Logfile to log filter actions."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
msgid "Mark as Seen after specified timeout"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
msgid "Mark as Seen after specified timeout."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
msgid "Mark citations in the message \"Preview\""
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
msgid "Mark citations in the message \"Preview\"."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
msgid "Message Window default hight"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
msgid "Message Window default width"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:47
msgid "Message-display style (normal, full headers, source)"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
msgid "New Mail Notify sound file"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
msgid "New Mail Notify type"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
msgid "Prompt on empty subject"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:53
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:54
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
msgid "Prompt when user expunges"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
msgid "Prompt when user only fills Bcc"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:57
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:58
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:59
msgid "Prompt when user tries to send unwanted HTML"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:60
msgid "Recognize links in text and replace them."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:61
msgid "Recognize smileys in text and replace them with images."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
msgid "Run junk test on incoming mail"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
msgid "S3kr3t 0pt10n"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
msgid "S3kr3t 0pt10n."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
msgid "Send HTML mail by default"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
msgid "Send HTML mail by default."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
msgid "Show Animations"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
msgid "Show animated images as animations."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:69
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:70
msgid "Show deleted messages in the message-list"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
msgid "Show the \"Preview\" pane"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
msgid "Show the \"Preview\" pane."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:73
msgid "Sound file to play when new mail arrives."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:74
msgid "Specifies the type of New Mail Notification the user wishes to use."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
msgid "Spell check inline"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default hight"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
msgid "Terminal font"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
msgid "The terminal font for mail display"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:81
msgid "The variable width font for mail display"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:82
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13328,109 +13439,109 @@ msgid ""
"mail view."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
msgid "Thread the message list."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
msgid "Thread the message-list"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:85
msgid "Thread the message-list based on Subject"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
msgid "Timeout for marking message as Seen"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
msgid "Timeout for marking message as Seen."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
msgid "UID string of the default account."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
msgid "Use Spamasssassin daemon and client"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:90
msgid "Use Spamasssassin daemon and client (spamc/spamd)"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
msgid "Use custom fonts"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
msgid "Use custom fonts for displaying mail"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
msgid "Use only local spam tests."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:94
msgid "Use only the local spam tests (no DNS)."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
msgid "Variable width font"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
msgid "View/Bcc menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
msgid "View/Bcc menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
msgid "View/Cc menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
msgid "View/Cc menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
msgid "View/From menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
msgid "View/From menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
msgid "View/PostTo menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
msgid "View/PostTo menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
msgid "View/ReplyTo menu item is checked"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
msgid "View/ReplyTo menu item is checked."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:98
+#: mail/evolution-mail.schemas.in.in.h:106
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
msgid "port for starting user runned spamd"
msgstr ""
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
msgid "spamd port"
msgstr ""
@@ -13471,14 +13582,14 @@ msgstr ""
#: mail/importers/elm-importer.c:89
#: mail/importers/evolution-mbox-importer.c:220
#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1220 mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
msgid "Importing..."
msgstr ""
#: mail/importers/elm-importer.c:91
#: mail/importers/evolution-mbox-importer.c:222
#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1222 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
msgid "Please wait"
msgstr ""
@@ -13523,12 +13634,12 @@ msgstr "Organisation"
msgid "Scanning %s"
msgstr ""
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
#, c-format
msgid "Priority Filter \"%s\""
msgstr ""
-#: mail/importers/netscape-importer.c:650
+#: mail/importers/netscape-importer.c:651
msgid ""
"Some of your Netscape email filters are based on\n"
"email priorities, which are not used in Evolution.\n"
@@ -13543,7 +13654,7 @@ msgid ""
"everything still works as intended."
msgstr ""
-#: mail/importers/netscape-importer.c:674
+#: mail/importers/netscape-importer.c:675
msgid ""
"Some of your Netscape email filters use\n"
"the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13551,7 +13662,7 @@ msgid ""
"These filters will be dropped."
msgstr ""
-#: mail/importers/netscape-importer.c:691
+#: mail/importers/netscape-importer.c:692
msgid ""
"Some of your Netscape email filters test the\n"
"body of emails for (in)equality to a given string,\n"
@@ -13560,23 +13671,23 @@ msgid ""
"contained in the message body."
msgstr ""
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
msgid "Evolution is importing your old Netscape data"
msgstr ""
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
msgid "Importing Netscape data"
msgstr ""
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
msgid "Settings"
msgstr ""
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
msgid "Mail Filters"
msgstr ""
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1904
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -13604,59 +13715,28 @@ msgstr ""
msgid "Pine"
msgstr ""
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr ""
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable. Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr ""
-
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
msgid "You have not filled in all of the required information."
msgstr ""
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:140
+#: mail/mail-account-editor.c:153
msgid "Evolution Account Editor"
msgstr ""
-#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
msgid "_Host:"
msgstr ""
-#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
msgid "User_name:"
msgstr ""
-#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
msgid "_Path:"
msgstr ""
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
msgid "You may not create two accounts with the same name."
msgstr ""
@@ -13689,11 +13769,11 @@ msgstr ""
msgid "Add Filter Rule"
msgstr ""
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
msgid "The following filter rule(s):\n"
msgstr ""
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
#, c-format
msgid ""
"Used the removed folder:\n"
@@ -13701,84 +13781,85 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-component.c:487
+#: mail/mail-component.c:519
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr ""
-#: mail/mail-component.c:546
+#: mail/mail-component.c:587
#, fuzzy
msgid "New Mail Message"
msgstr "Can not open message"
-#: mail/mail-component.c:547
+#: mail/mail-component.c:588
#, fuzzy
msgid "_Mail Message"
msgstr "Can not open message"
-#: mail/mail-component.c:548
+#: mail/mail-component.c:589
#, fuzzy
msgid "Compose a new mail message"
msgstr "Can not open message"
-#: mail/mail-component.c:553
+#: mail/mail-component.c:594
#, fuzzy
msgid "New Mail Folder"
msgstr "Synchronising folders"
-#: mail/mail-component.c:554
+#: mail/mail-component.c:595
#, fuzzy
msgid "Mail _Folder"
msgstr "Synchronising folder"
-#: mail/mail-component.c:555
+#: mail/mail-component.c:596
#, fuzzy
msgid "Create a new mail folder"
msgstr "Synchronising folder"
-#: mail/mail-component.c:722
+#: mail/mail-component.c:760
msgid "URI of the mail source that the view will display"
msgstr ""
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
msgid "Identity"
msgstr ""
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:368
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
"information in email you send."
msgstr ""
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
+#: mail/mail-config.glade.h:116
msgid "Receiving Mail"
msgstr ""
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:376
msgid ""
"Please enter information about your incoming mail server below. If you are "
"not sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
msgid "Please select among the following options"
msgstr ""
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
msgid "Sending Mail"
msgstr ""
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:388
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
msgstr ""
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
msgid "Account Management"
msgstr ""
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:395
msgid ""
"You are almost done with the mail configuration process. The identity, "
"incoming mail server and outgoing mail transport method which you provided "
@@ -13787,623 +13868,637 @@ msgid ""
"purposes only."
msgstr ""
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:1170 mail/mail-config.c:1174
+#: mail/mail-config.c:976 mail/mail-config.c:980
msgid "Connecting to server..."
msgstr ""
+#: mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
+msgstr ""
+
#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+msgid "<b>Preview</b>"
msgstr ""
#: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "<b>SSL is not supported in this build of evolution</b>"
msgstr ""
#: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr ""
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "Organisation"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "Organisation"
#: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
+msgid "<span weight=\"bold\">Account Information</span>"
msgstr ""
#: mail/mail-config.glade.h:8
-msgid "A_lso encrypt to self when sending encrypted mail"
+msgid "<span weight=\"bold\">Alerts</span>"
msgstr ""
#: mail/mail-config.glade.h:9
-msgid "Account Editor"
+msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr ""
#: mail/mail-config.glade.h:10
-msgid "Account Information"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
msgstr ""
#: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
+msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr ""
#: mail/mail-config.glade.h:13
-msgid "Add new signature..."
+msgid "<span weight=\"bold\">Configuration</span>"
msgstr ""
#: mail/mail-config.glade.h:14
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr ""
#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+msgid "<span weight=\"bold\">Filter Options</span>"
msgstr ""
#: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+msgid "<span weight=\"bold\">General</span>"
msgstr ""
#: mail/mail-config.glade.h:19
-msgid "Always _trust keys in my keyring when encrypting"
+msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr ""
#: mail/mail-config.glade.h:20
-msgid "Attach original message"
+msgid "<span weight=\"bold\">Loading Images</span>"
msgstr ""
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
-msgid "Attachment"
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
msgstr ""
#: mail/mail-config.glade.h:22
-msgid "Authentication"
+msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr ""
#: mail/mail-config.glade.h:23
-msgid "Baltic (ISO-8859-13)"
+msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr ""
#: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-4)"
+msgid "<span weight=\"bold\">Optional Information</span>"
msgstr ""
#: mail/mail-config.glade.h:25
-msgid "C_haracter set:"
+msgid "<span weight=\"bold\">Options</span>"
msgstr ""
#: mail/mail-config.glade.h:26
-#, fuzzy
-msgid "C_olors"
-msgstr "C_lose"
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
#: mail/mail-config.glade.h:27
-msgid "Check _Incoming Mail"
+msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr ""
#: mail/mail-config.glade.h:28
-msgid "Check spelling while I _type"
+msgid "<span weight=\"bold\">Required Information</span>"
msgstr ""
#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr ""
#: mail/mail-config.glade.h:30
-msgid "Checks incoming mail messages to be Junk"
+msgid "<span weight=\"bold\">Security</span>"
msgstr ""
#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Color for _misspelled words:"
-msgstr "Colours for display"
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr ""
#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
+msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr ""
#: mail/mail-config.glade.h:33
-msgid "Configuration"
+msgid "A_lso encrypt to self when sending encrypted mail"
msgstr ""
#: mail/mail-config.glade.h:34
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
+msgid "Account Editor"
msgstr ""
-#: mail/mail-config.glade.h:40
-msgid "De_fault"
+#: mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr ""
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
msgstr ""
#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
+msgid "Always _sign outgoing messages when using this account"
msgstr ""
#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+msgid "Always _trust keys in my keyring when encrypting"
msgstr ""
#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
+msgid "Attach original message"
+msgstr ""
+
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+msgid "Attachment"
msgstr ""
#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
+msgid "Automatically _insert smiley images"
msgstr ""
#: mail/mail-config.glade.h:47
-#, fuzzy
-msgid "Do not quote original message"
-msgstr "Can not open message"
+msgid "Automatically check for _new mail every"
+msgstr ""
#: mail/mail-config.glade.h:48
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgid "Baltic (ISO-8859-13)"
msgstr ""
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Done"
+#: mail/mail-config.glade.h:49
+msgid "Baltic (ISO-8859-4)"
msgstr ""
#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+msgid "C_haracter set:"
msgstr ""
#: mail/mail-config.glade.h:52
-msgid "Email Accounts"
+msgid "Ch_eck for Supported Types "
msgstr ""
#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+msgid "Check _Incoming Mail"
msgstr ""
#: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+msgid "Check spelling while I _type"
msgstr ""
#: mail/mail-config.glade.h:55
-msgid "Encry_ption certificate:"
+msgid "Checks incoming mail messages to be Junk"
msgstr ""
#: mail/mail-config.glade.h:56
-msgid "Evolution Account Assistant"
-msgstr ""
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Colours for display"
#: mail/mail-config.glade.h:57
-msgid "Execute Command..."
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "C_lose"
#: mail/mail-config.glade.h:58
-msgid "Fi_xed -width:"
+msgid "Confirm _when expunging a folder"
msgstr ""
#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:60
-msgid "Font Properties"
-msgstr ""
-
-#: mail/mail-config.glade.h:61
-msgid "Format messages in _HTML"
-msgstr ""
-
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
-msgstr ""
-
-#: mail/mail-config.glade.h:63
-msgid "Highlight _quotations with"
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
msgstr ""
-#: mail/mail-config.glade.h:64
-msgid "IMAPv4 "
+#: mail/mail-config.glade.h:65
+msgid "De_fault"
msgstr ""
#: mail/mail-config.glade.h:67
-msgid "Inline"
+msgid "Default character e_ncoding:"
msgstr ""
#: mail/mail-config.glade.h:68
-msgid "Kerberos "
+msgid "Defaults"
msgstr ""
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr ""
+#: mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Can not open message"
#: mail/mail-config.glade.h:71
-msgid "Loading Images"
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr ""
-#: mail/mail-config.glade.h:72
-msgid "Mail Configuration"
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Done"
msgstr ""
-#: mail/mail-config.glade.h:74
-msgid "Mailbox location"
-msgstr ""
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
+msgstr "Synchronising folder"
#: mail/mail-config.glade.h:75
-msgid "Message Composer"
+msgid "Email Accounts"
msgstr ""
#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr ""
+#, fuzzy
+msgid "Email _Address:"
+msgstr "Chile"
#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
+msgid "Empty trash folders on e_xit"
+msgstr ""
+
+#: mail/mail-config.glade.h:78
+msgid "Encry_ption certificate:"
msgstr ""
#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
+msgid "Evolution Account Assistant"
+msgstr ""
+
+#: mail/mail-config.glade.h:80
+msgid "Execute Command..."
msgstr ""
#: mail/mail-config.glade.h:81
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+msgid "Fi_xed -width:"
msgstr ""
#: mail/mail-config.glade.h:82
-msgid "Optional Information"
+msgid "Font Properties"
msgstr ""
-#: mail/mail-config.glade.h:84
-#, fuzzy
-msgid "Or_ganization:"
-msgstr "Organi_sation:"
+#: mail/mail-config.glade.h:83
+msgid "Format messages in _HTML"
+msgstr ""
#: mail/mail-config.glade.h:85
-msgid "PGP/GPG _Key ID:"
+msgid "HTML Mail"
msgstr ""
-#: mail/mail-config.glade.h:89
-msgid "Pick a color"
-msgstr "Pick a colour"
+#: mail/mail-config.glade.h:86
+msgid "Headers"
+msgstr ""
-#: mail/mail-config.glade.h:90
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: mail/mail-config.glade.h:87
+msgid "Highlight _quotations with"
msgstr ""
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
+#: mail/mail-config.glade.h:88
+msgid "IMAPv4 "
msgstr ""
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
+#: mail/mail-config.glade.h:91
+msgid "Inline"
msgstr ""
#: mail/mail-config.glade.h:93
-msgid "Qmail maildir "
+msgid "Kerberos "
msgstr ""
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Quote original message"
-msgstr "Can not open message"
-
#: mail/mail-config.glade.h:95
-msgid "Quoted"
-msgstr ""
-
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
+msgid "Mail Configuration"
msgstr ""
#: mail/mail-config.glade.h:97
-msgid "Re_ply-To:"
+msgid "Mailbox location"
msgstr ""
#: mail/mail-config.glade.h:98
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
+msgid "Message Composer"
msgstr ""
#: mail/mail-config.glade.h:101
-msgid "Required Information"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
msgstr ""
#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr ""
-
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr ""
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_sation:"
-#: mail/mail-config.glade.h:106
-msgid "Select HTML fixed width font"
+#: mail/mail-config.glade.h:103
+msgid "PGP/GPG _Key ID:"
msgstr ""
#: mail/mail-config.glade.h:107
-msgid "Select HTML fixed width font for printing"
-msgstr ""
+msgid "Pick a color"
+msgstr "Pick a colour"
#: mail/mail-config.glade.h:108
-msgid "Select HTML variable width font"
+msgid "Play sound file when new mail arri_ves"
msgstr ""
#: mail/mail-config.glade.h:109
-msgid "Select HTML variable width font for printing"
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr ""
#: mail/mail-config.glade.h:110
-msgid "Sending Email"
+msgid "Qmail maildir "
msgstr ""
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Quote original message"
+msgstr "Can not open message"
+
#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+msgid "Quoted"
msgstr ""
#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
+msgid "Re_member password"
msgstr ""
#: mail/mail-config.glade.h:114
-msgid "Ser_ver requires authentication"
+msgid "Re_ply-To:"
msgstr ""
#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config.glade.h:116
-msgid "Server _Type: "
+msgid "Receiving Email"
msgstr ""
#: mail/mail-config.glade.h:117
-msgid "Si_gning certificate:"
+msgid "Receiving Options"
msgstr ""
#: mail/mail-config.glade.h:118
-msgid "Specify _filename:"
-msgstr ""
-
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+msgid "Remember _password"
msgstr ""
#: mail/mail-config.glade.h:120
-msgid "Standard Unix mbox"
+msgid "S_tandard Font:"
msgstr ""
#: mail/mail-config.glade.h:121
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:122
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:123
+msgid "Select HTML fixed width font for printing"
msgstr ""
#: mail/mail-config.glade.h:124
-msgid ""
-"This page allows you to configure spell checking behavior and language. The "
-"list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "Select HTML variable width font"
msgstr ""
-#: mail/mail-config.glade.h:126
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+#: mail/mail-config.glade.h:125
+msgid "Select HTML variable width font for printing"
msgstr ""
-#: mail/mail-config.glade.h:128
-msgid "Use _Daemon"
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "Organisation"
+
+#: mail/mail-config.glade.h:127
+msgid "Sending Email"
msgstr ""
#: mail/mail-config.glade.h:130
-msgid "V_ariable-width:"
-msgstr ""
+#, fuzzy
+msgid "Sent _Messages Folder:"
+msgstr "Synchronising folder"
#: mail/mail-config.glade.h:131
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
+msgid "Ser_ver requires authentication"
msgstr ""
-#: mail/mail-config.glade.h:136
-msgid "_Add Signature"
+#: mail/mail-config.glade.h:132
+msgid "Server _Type: "
msgstr ""
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
+#: mail/mail-config.glade.h:133
+msgid "Si_gning certificate:"
msgstr ""
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:134
+msgid "Signat_ure:"
msgstr ""
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
+#: mail/mail-config.glade.h:135
+msgid "Signatures"
msgstr ""
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
+#: mail/mail-config.glade.h:136
+msgid "Specify _filename:"
msgstr ""
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
+#: mail/mail-config.glade.h:137
+msgid "Spell Checking"
msgstr ""
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
+#: mail/mail-config.glade.h:138
+msgid "Standard Unix mbox"
msgstr ""
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
+#: mail/mail-config.glade.h:139
+msgid "T_erminal Font:"
msgstr ""
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
+#: mail/mail-config.glade.h:140
+msgid "T_ype: "
msgstr ""
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
+#: mail/mail-config.glade.h:141
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
msgstr ""
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
+#: mail/mail-config.glade.h:144
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
msgstr ""
-#: mail/mail-config.glade.h:147
-msgid "_Do not notify me when new mail arrives"
+#: mail/mail-config.glade.h:146
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
msgstr ""
-#: mail/mail-config.glade.h:149
-msgid "_Enable"
+#: mail/mail-config.glade.h:148
+msgid "Use _Daemon"
msgstr ""
#: mail/mail-config.glade.h:150
-msgid "_Encrypt outgoing messages (by default)"
+msgid "V_ariable-width:"
msgstr ""
#: mail/mail-config.glade.h:151
-msgid "_Forward style:"
-msgstr ""
-
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
msgstr ""
#: mail/mail-config.glade.h:156
-msgid "_Identity"
+msgid "_Add Signature"
msgstr ""
#: mail/mail-config.glade.h:157
-msgid "_Junk"
+msgid "_Always load images from the Internet"
msgstr ""
#: mail/mail-config.glade.h:158
-msgid "_Load images if sender is in address book"
+msgid "_Digitally sign outgoing messages (by default)"
msgstr ""
#: mail/mail-config.glade.h:159
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:160
-msgid "_Make this my default account"
+msgid "_Do not notify me when new mail arrives"
msgstr ""
#: mail/mail-config.glade.h:161
-msgid "_Mark messages as read after"
+msgid "_Enable"
msgstr ""
#: mail/mail-config.glade.h:162
-msgid "_Name:"
+msgid "_Encrypt outgoing messages (by default)"
msgstr ""
#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
+msgid "_Forward style:"
msgstr ""
#: mail/mail-config.glade.h:166
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Load images if sender is in address book"
msgstr ""
#: mail/mail-config.glade.h:167
-msgid "_Prompt when sending messages with an empty subject line"
+msgid "_Local Tests Only"
msgstr ""
#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
+msgid "_Make this my default account"
msgstr ""
#: mail/mail-config.glade.h:169
-msgid "_Reply style:"
+msgid "_Mark messages as read after"
msgstr ""
#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
+msgid "_Name:"
msgstr ""
#: mail/mail-config.glade.h:171
-msgid "_Script:"
+msgid "_Never load images from the Internet"
msgstr ""
-#: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Select..."
-msgstr "Organisation"
-
#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr ""
#: mail/mail-config.glade.h:174
-msgid "_Show animated images"
+msgid "_Prompt when sending messages with an empty subject line"
msgstr ""
#: mail/mail-config.glade.h:175
-msgid "_Signatures"
+msgid "_Reply style:"
msgstr ""
#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
+msgid "_Script:"
msgstr ""
#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
+msgid "_Show animated images"
msgstr ""
#: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+msgid "_Use Secure Connection (SSL):"
msgstr ""
#: mail/mail-config.glade.h:179
msgid "_Use the same fonts as other applications"
msgstr ""
+#: mail/mail-config.glade.h:180
+msgid "_minute(s)"
+msgstr ""
+
#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "color"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:182
msgid "description"
msgstr ""
-#: mail/mail-folder-cache.c:792
+#: mail/mail-folder-cache.c:796
#, c-format
msgid "Pinging %s"
msgstr ""
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
#, c-format
msgid ""
"Error while '%s':\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
#, c-format
msgid ""
"Error while performing operation:\n"
"%s"
msgstr ""
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
msgid "Working"
msgstr ""
@@ -14411,175 +14506,170 @@ msgstr ""
msgid "Filtering Folder"
msgstr ""
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:249
msgid "Fetching Mail"
msgstr ""
-#: mail/mail-ops.c:528
+#: mail/mail-ops.c:534
#, fuzzy, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:559
#, c-format
msgid ""
"Failed to append to %s: %s\n"
"Appending to local `Sent' folder instead."
msgstr ""
-#: mail/mail-ops.c:562
+#: mail/mail-ops.c:568
#, fuzzy, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:604
-#, c-format
-msgid "Sending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:664
#, c-format
msgid "Sending message %d of %d"
msgstr ""
-#: mail/mail-ops.c:741
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr ""
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Could not close temporary folder: %s"
-#: mail/mail-ops.c:743
+#: mail/mail-ops.c:699
msgid "Complete."
msgstr ""
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:796
msgid "Saving message to folder"
msgstr ""
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
#, c-format
msgid "Moving messages to %s"
msgstr ""
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
#, c-format
msgid "Copying messages to %s"
msgstr ""
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:994
#, c-format
msgid "Scanning folders in \"%s\""
msgstr ""
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1190
msgid "Forwarded messages"
msgstr ""
-#: mail/mail-ops.c:1274
+#: mail/mail-ops.c:1233
#, c-format
msgid "Opening folder %s"
msgstr ""
-#: mail/mail-ops.c:1346
+#: mail/mail-ops.c:1305
#, c-format
msgid "Opening store %s"
msgstr ""
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1383
#, c-format
msgid "Removing folder %s"
msgstr ""
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1477
#, c-format
msgid "Storing folder '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1583
+#: mail/mail-ops.c:1542
#, c-format
msgid "Expunging and storing account '%s'"
msgstr ""
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:1543
#, fuzzy, c-format
msgid "Storing account '%s'"
msgstr "Synchronising \"%s\""
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1598
msgid "Refreshing folder"
msgstr ""
-#: mail/mail-ops.c:1675 mail/mail-ops.c:1726
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
msgid "Expunging folder"
msgstr ""
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1682
#, c-format
msgid "Emptying trash in '%s'"
msgstr ""
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1683
msgid "Local Folders"
msgstr ""
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1766
#, c-format
msgid "Retrieving message %s"
msgstr ""
-#: mail/mail-ops.c:1879
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr ""
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Can not open message"
+msgstr[1] "Can not open message"
-#: mail/mail-ops.c:1963
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr ""
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Can not open message"
+msgstr[1] "Can not open message"
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:1974
#, c-format
msgid ""
"Unable to create output file: %s\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2002
#, c-format
msgid ""
"Error saving messages to: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2110
+#: mail/mail-ops.c:2073
msgid "Saving attachment"
msgstr ""
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2090
#, c-format
msgid ""
"Cannot create output file: %s:\n"
" %s"
msgstr ""
-#: mail/mail-ops.c:2157
+#: mail/mail-ops.c:2120
#, c-format
msgid "Could not write data: %s"
msgstr ""
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
#, c-format
msgid "Disconnecting from %s"
msgstr ""
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2268
#, c-format
msgid "Reconnecting to %s"
msgstr ""
-#: mail/mail-ops.c:2407
-msgid "Changing junk status"
-msgstr ""
-
#: mail/mail-search.glade.h:2
msgid "Case Sensitive"
msgstr ""
@@ -14592,107 +14682,103 @@ msgstr ""
msgid "Find:"
msgstr ""
-#: mail/mail-search.glade.h:5
-msgid "Search"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
msgstr ""
#: mail/mail-security.glade.h:2
-msgid "Digital Signature"
-msgstr ""
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
+msgid "<span weight=\"bold\">Encryption</span>"
msgstr ""
#: mail/mail-security.glade.h:4
msgid "Security Information"
msgstr ""
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
msgid "Cancelling..."
msgstr ""
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
#, c-format
msgid "Server: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
#, c-format
msgid "Path: %s, Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
#, c-format
msgid "Type: %s"
msgstr ""
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
msgid "Send & Receive Mail"
msgstr ""
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
msgid "Cancel _All"
msgstr ""
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
msgid "Updating..."
msgstr ""
-#: mail/mail-send-recv.c:396 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
msgid "Waiting..."
msgstr ""
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
msgid "User canceled operation."
msgstr ""
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
#, c-format
msgid "Enter Password for %s"
msgstr ""
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
msgid "Enter Password"
msgstr ""
-#: mail/mail-session.c:294
+#: mail/mail-session.c:298
msgid "_Remember this password"
msgstr ""
-#: mail/mail-session.c:295
+#: mail/mail-session.c:299
msgid "_Remember this password for the remainder of this session"
msgstr ""
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
#, fuzzy, c-format
msgid "Could not save signature file: %s"
msgstr "Could not close temporary folder: %s"
-#: mail/mail-signature-editor.c:226
+#: mail/mail-signature-editor.c:233
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
"Do you wish to save your changes?"
msgstr ""
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
msgid "_Discard changes"
msgstr ""
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
msgid "Save signature"
msgstr ""
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
msgid "Edit signature"
msgstr ""
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
msgid "Enter a name for this signature."
msgstr ""
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
msgid "Name:"
msgstr ""
@@ -14720,17 +14806,17 @@ msgstr ""
msgid "Invalid folder: `%s'"
msgstr "Can not get folder: %s: %s"
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
#, c-format
msgid "Setting up vfolder: %s"
msgstr ""
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
#, c-format
msgid "Updating vfolders for uri: %s"
msgstr ""
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -14739,84 +14825,84 @@ msgid ""
"And have been updated."
msgstr ""
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
msgid "vFolders"
msgstr ""
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
msgid "Edit VFolder"
msgstr ""
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr ""
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
msgid "New VFolder"
msgstr ""
-#: mail/message-list.c:927
+#: mail/message-list.c:935
msgid "Unseen"
msgstr ""
-#: mail/message-list.c:928
+#: mail/message-list.c:936
msgid "Seen"
msgstr ""
-#: mail/message-list.c:929
+#: mail/message-list.c:937
msgid "Answered"
msgstr ""
-#: mail/message-list.c:930
+#: mail/message-list.c:938
msgid "Multiple Unseen Messages"
msgstr ""
-#: mail/message-list.c:931
+#: mail/message-list.c:939
msgid "Multiple Messages"
msgstr ""
-#: mail/message-list.c:935
+#: mail/message-list.c:943
msgid "Lowest"
msgstr ""
-#: mail/message-list.c:936
+#: mail/message-list.c:944
msgid "Lower"
msgstr ""
-#: mail/message-list.c:940
+#: mail/message-list.c:948
msgid "Higher"
msgstr ""
-#: mail/message-list.c:941
+#: mail/message-list.c:949
msgid "Highest"
msgstr ""
-#: mail/message-list.c:1262
+#: mail/message-list.c:1270
msgid "?"
msgstr ""
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
msgid "Today %l:%M %p"
msgstr ""
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
msgid "Yesterday %l:%M %p"
msgstr ""
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
msgid "%a %l:%M %p"
msgstr ""
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
msgid "%b %d %l:%M %p"
msgstr ""
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
msgid "%b %d %Y"
msgstr ""
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
msgid "Generating message list"
msgstr ""
@@ -14865,7 +14951,7 @@ msgstr ""
msgid "For Your Information"
msgstr ""
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr ""
@@ -14873,11 +14959,11 @@ msgstr ""
msgid "No Response Necessary"
msgstr ""
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr ""
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
msgid "Reply to All"
msgstr ""
@@ -14900,7 +14986,7 @@ msgid ""
msgstr ""
#: mail/message-tags.glade.h:6
-msgid "_Due by:"
+msgid "_Due By:"
msgstr ""
#: mail/message-tags.glade.h:7
@@ -15107,7 +15193,7 @@ msgstr ""
msgid "Choose the destination for this import"
msgstr ""
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:737
+#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
msgid "Please select the information that you would like to import:"
msgstr ""
@@ -15130,82 +15216,82 @@ msgstr ""
msgid "Select importer"
msgstr ""
-#: shell/e-shell-importer.c:448 shell/e-shell-importer.c:1020
+#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
#, c-format
msgid "File %s does not exist"
msgstr ""
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
msgid "Importing"
msgstr ""
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
#, c-format
msgid "Importing %s.\n"
msgstr ""
-#: shell/e-shell-importer.c:473 shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
#, c-format
msgid "Error loading %s"
msgstr ""
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
#, c-format
msgid ""
"Importing %s\n"
"Importing item 1."
msgstr ""
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
msgid "Automatic"
msgstr ""
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
msgid "_Filename:"
msgstr ""
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
msgid "Select a file"
msgstr ""
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
msgid "File _type:"
msgstr ""
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
msgid "Import data and settings from _older programs"
msgstr ""
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
msgid "Import a _single file"
msgstr ""
-#: shell/e-shell-importer.c:718 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
msgid "Starting Intelligent Importers"
msgstr ""
-#: shell/e-shell-importer.c:847 shell/e-shell-startup-wizard.c:692
+#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
#, c-format
msgid "From %s:"
msgstr ""
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
#, c-format
msgid "No importer available for file %s"
msgstr ""
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
#, fuzzy
msgid "Unable to execute importer"
msgstr "Could not close temporary folder: %s"
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
msgid "_Import"
msgstr ""
@@ -15213,7 +15299,7 @@ msgstr ""
msgid "Closing connections..."
msgstr ""
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
msgid "Evolution Settings"
msgstr ""
@@ -15248,11 +15334,11 @@ msgstr "Could not close temporary folder: %s"
msgid "Cannot find the specified shared folder."
msgstr ""
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
msgid "Starting import"
msgstr ""
-#: shell/e-shell-startup-wizard.c:784
+#: shell/e-shell-startup-wizard.c:785
msgid ""
"If you quit the Evolution Setup Assistant now, all of the information that "
"you have entered will be forgotten. You will need to run this assistant "
@@ -15261,10 +15347,6 @@ msgid ""
"Do you want to quit using the Assistant now?"
msgstr ""
-#: shell/e-shell-startup-wizard.c:795
-msgid "Quit Assistant"
-msgstr ""
-
#: shell/e-shell-utils.c:116
msgid "No folder name specified."
msgstr ""
@@ -15307,15 +15389,15 @@ msgstr ""
msgid "About Ximian Evolution"
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
msgid "_Work Online"
msgstr ""
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
msgid "_Work Offline"
msgstr ""
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
msgid "Work Offline"
msgstr ""
@@ -15364,7 +15446,6 @@ msgstr "Chile"
#: shell/e-user-creatable-items-handler.c:601
#: shell/e-user-creatable-items-handler.c:642
-#: widgets/misc/e-charset-picker.c:109
msgid "New"
msgstr ""
@@ -15409,15 +15490,16 @@ msgid "Create a new test item"
msgstr "_Other Organiser"
#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
-msgstr ""
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "Organisation"
#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
+msgid "Active Connections"
msgstr ""
#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
+msgid "Click OK to close these connections and go offline"
msgstr ""
#: shell/glade/e-shell-config-default-folders.glade.h:1
@@ -15526,28 +15608,28 @@ msgid ""
"importing external files into Evolution."
msgstr ""
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
msgid "Importers"
msgstr ""
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
msgid "Import"
msgstr ""
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
msgid "Don't import"
msgstr ""
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
msgid "Don't ask me again"
msgstr ""
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
msgid "Evolution can import data from the following files:"
msgstr ""
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -15567,101 +15649,110 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
-#: shell/main.c:241
+#: shell/main.c:255
#, fuzzy
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:249
+#: shell/main.c:262
msgid "Don't tell me again"
msgstr ""
-#: shell/main.c:381
+#: shell/main.c:392
msgid "Cannot access the Ximian Evolution shell."
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:390
+#: shell/main.c:401
#, fuzzy, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Can not initialise the Ximian Evolution shell."
-#: shell/main.c:487
+#: shell/main.c:498
msgid "Start Evolution activating the specified component"
msgstr ""
-#: shell/main.c:489
+#: shell/main.c:500
msgid "Start in offline mode"
msgstr ""
-#: shell/main.c:491
+#: shell/main.c:502
msgid "Start in online mode"
msgstr ""
-#: shell/main.c:494
+#: shell/main.c:505
msgid "Forcibly shut down all evolution components"
msgstr ""
-#: shell/main.c:498
+#: shell/main.c:509
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr ""
-#: shell/main.c:501
+#: shell/main.c:512
msgid "Send the debugging output of all components to a file."
msgstr ""
-#: shell/main.c:524
+#: shell/main.c:535
msgid "Evolution"
msgstr ""
-#: shell/main.c:528
+#: shell/main.c:539
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
" Use %s --help for more information.\n"
msgstr ""
-#: smime/gui/certificate-manager.c:127 smime/gui/certificate-manager.c:316
-#: smime/gui/certificate-manager.c:463
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
+#: smime/gui/certificate-manager.c:503
msgid "Select a cert to import..."
msgstr ""
-#: smime/gui/certificate-manager.c:238 smime/gui/certificate-manager.c:400
-#: smime/gui/certificate-manager.c:546
+#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
+#: smime/gui/certificate-manager.c:585
#, fuzzy
msgid "Certificate Name"
msgstr "Could not close temporary folder: %s"
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
#, fuzzy
msgid "Purposes"
msgstr "C_lose"
-#: smime/gui/certificate-manager.c:254 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
#: smime/lib/e-cert.c:517
msgid "Serial Number"
msgstr ""
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
msgid "Expires"
msgstr ""
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
#, fuzzy
msgid "E-Mail Address"
msgstr "Chile"
-#: smime/gui/certificate-viewer.c:331
+#: smime/gui/certificate-viewer.c:334
#, fuzzy, c-format
msgid "Certificate Viewer: %s"
msgstr "Could not close temporary folder: %s"
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
#, c-format
msgid "Enter the password for `%s'"
msgstr ""
+#. we're setting the password initially
+#: smime/gui/component.c:68
+msgid "Enter new password for certificate database"
+msgstr ""
+
+#: smime/gui/component.c:70
+msgid "Enter new password"
+msgstr ""
+
#. FIXME: add serial no, validity date, uses
#: smime/gui/e-cert-selector.c:121
#, c-format
@@ -15850,7 +15941,8 @@ msgstr ""
msgid "Your Certificates"
msgstr ""
-#: smime/lib/e-cert-db.c:571
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
#, fuzzy
msgid "Certificate already exists"
msgstr "Could not close temporary folder: %s"
@@ -16129,7 +16221,7 @@ msgstr ""
msgid "Move to Folder..."
msgstr ""
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
msgid "Paste the clipboard"
msgstr ""
@@ -16138,8 +16230,8 @@ msgid "Previews the contacts to be printed"
msgstr ""
#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr ""
@@ -16187,13 +16279,13 @@ msgstr ""
msgid "View the current contact"
msgstr ""
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
msgid "_Actions"
msgstr ""
@@ -16214,14 +16306,10 @@ msgid "_Save as VCard"
msgstr ""
#: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:43
msgid "_Select All"
msgstr ""
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
msgid "_Send Message to Contact..."
msgstr ""
@@ -16229,56 +16317,52 @@ msgstr ""
msgid "Day"
msgstr ""
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
msgid "Delete All Occurrences"
msgstr ""
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
msgid "Delete the appointment"
msgstr ""
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
msgid "Delete this Occurrence"
msgstr ""
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
msgid "Delete this occurrence"
msgstr ""
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
msgid "Go To"
msgstr ""
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
msgid "Go back"
msgstr ""
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
msgid "Go forward"
msgstr ""
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
+#: ui/evolution-calendar.xml.h:13
+msgid "List"
msgstr ""
#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
+msgid "Month"
msgstr ""
-#: ui/evolution-calendar.xml.h:16
-msgid "List"
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
msgstr ""
#: ui/evolution-calendar.xml.h:17
-msgid "Month"
+msgid "Previews the calendar to be printed"
msgstr ""
-#: ui/evolution-calendar.xml.h:19
-msgid "Previews the calendar to be printed"
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
msgstr ""
#: ui/evolution-calendar.xml.h:21
@@ -16289,7 +16373,7 @@ msgstr ""
msgid "Publish Free/Busy information for this calendar"
msgstr ""
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
msgid "Purg_e"
msgstr ""
@@ -16298,34 +16382,53 @@ msgid "Purge old appointments and meetings"
msgstr ""
#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "_Other Organiser"
+
+#: ui/evolution-calendar.xml.h:27
+msgid "Select a specific date"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Organisation"
+
+#: ui/evolution-calendar.xml.h:29
msgid "Show as list"
msgstr ""
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
msgid "Show one day"
msgstr ""
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
msgid "Show one month"
msgstr ""
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
msgid "Show one week"
msgstr ""
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
msgid "Show the working week"
msgstr ""
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:35
msgid "View the current appointment"
msgstr ""
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
msgid "Week"
msgstr ""
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
msgid "_Open Appointment"
msgstr ""
@@ -16594,7 +16697,7 @@ msgstr ""
msgid "Mark all visible messages as read"
msgstr ""
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
msgid "Paste message(s) from the clipboard"
msgstr ""
@@ -16761,307 +16864,307 @@ msgid "F_orward As..."
msgstr ""
#: ui/evolution-mail-message.xml.h:33
-msgid "Filter on Mailing _List..."
+msgid "Filter _Junk"
msgstr ""
#: ui/evolution-mail-message.xml.h:34
-msgid "Filter on Se_nder..."
+msgid "Filter on Mailing _List..."
msgstr ""
#: ui/evolution-mail-message.xml.h:35
-msgid "Filter on _Recipients..."
+msgid "Filter on Se_nder..."
msgstr ""
#: ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Subject..."
+msgid "Filter on _Recipients..."
msgstr ""
#: ui/evolution-mail-message.xml.h:37
-msgid "Flag selected message(s) for follow-up"
+msgid "Filter on _Subject..."
msgstr ""
#: ui/evolution-mail-message.xml.h:38
-msgid "Follow _Up..."
+msgid "Filter the selected messages for junk status"
msgstr ""
#: ui/evolution-mail-message.xml.h:39
-msgid "Force images in HTML mail to be loaded"
+msgid "Flag selected message(s) for follow-up"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
msgstr ""
#: ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:43
msgid "Forward the selected message in the body of a new message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
msgid "Forward the selected message quoted like a reply"
msgstr ""
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
msgid "Forward the selected message to someone"
msgstr ""
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
msgid "Forward the selected message to someone as an attachment"
msgstr ""
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
msgid "Increase the text size"
msgstr ""
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
msgid "Load _Images"
msgstr ""
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
msgid "Mark as I_mportant"
msgstr ""
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
msgid "Mark as U_nread"
msgstr ""
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
msgid "Mark as Unimp_ortant"
msgstr ""
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
msgid "Mark the selected message(s) as having been read"
msgstr ""
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
msgid "Mark the selected message(s) as important"
msgstr ""
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
msgid "Mark the selected message(s) as junk"
msgstr ""
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
msgid "Mark the selected message(s) as not being junk"
msgstr ""
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
msgid "Mark the selected message(s) as not having been read"
msgstr ""
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
msgid "Mark the selected message(s) as unimportant"
msgstr ""
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
msgid "Mark the selected messages for deletion"
msgstr ""
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
msgid "Move"
msgstr ""
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
msgid "Move selected message(s) to another folder"
msgstr ""
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
msgid "Next _Important Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
msgid "Next _Thread"
msgstr ""
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
msgid "Next _Unread Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
msgid "Not Junk"
msgstr ""
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
msgid "Open the selected message in a new window"
msgstr ""
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
msgid "Open the selected message in the composer to re-send it"
msgstr ""
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
msgid "Original Si_ze"
msgstr ""
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
msgid "P_revious Unread Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
msgid "Post a Repl_y"
msgstr ""
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
#, fuzzy
msgid "Post a reply to a message in a Public folder"
msgstr "You can not copy messages from this rubbish bin."
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
msgid "Pr_evious Important Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
msgid "Preview the message to be printed"
msgstr ""
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
msgid "Print this message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
msgid "Re_direct"
msgstr ""
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
msgid "Redirect (bounce) the selected message to someone"
msgstr ""
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
msgid "Reset the text to its original size"
msgstr ""
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
msgid "S_earch in Message..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
msgid "S_maller"
msgstr ""
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
msgid "Save the message as a text file"
msgstr ""
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
msgid "Search for text in the body of the displayed message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
msgid "Set up the page settings for your current printer"
msgstr ""
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
msgid "Show Email _Source"
msgstr ""
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
msgid "Show Full _Headers"
msgstr ""
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
msgid "Show a blinking cursor in the body of displayed messages"
msgstr ""
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
msgid "Show message in the normal style"
msgstr ""
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
msgid "Show message with all email headers"
msgstr ""
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
msgid "Show the raw email source of the message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
msgid "Text Si_ze"
msgstr ""
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
msgid "Un-delete the selected messages"
msgstr ""
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
msgid "VFolder on Mailing _List..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
msgid "VFolder on Se_nder..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
msgid "VFolder on _Recipients..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
msgid "VFolder on _Subject..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
msgid "_Attached"
msgstr ""
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr ""
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
msgid "_Create Filter From Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
msgid "_Go To"
msgstr ""
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
msgid "_Inline"
msgstr ""
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
msgid "_Larger"
msgstr ""
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
msgid "_Message Display"
msgstr ""
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr ""
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
msgid "_Next Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:120
msgid "_Normal Display"
msgstr ""
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
msgid "_Open Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
msgid "_Previous Message"
msgstr ""
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
msgid "_Quoted"
msgstr ""
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:127
msgid "_Resend..."
msgstr ""
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
msgid "_Tools"
msgstr ""
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
msgid "_Undelete"
msgstr ""
@@ -17327,39 +17430,39 @@ msgstr ""
msgid "Cut selected task"
msgstr ""
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
msgid "Delete completed tasks"
msgstr ""
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
msgid "Delete selected tasks"
msgstr ""
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
msgid "Mar_k as Complete"
msgstr ""
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
msgid "Mark selected tasks as complete"
msgstr ""
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
msgid "Paste task from the clipboard"
msgstr ""
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
msgid "Previews the list of tasks to be printed"
msgstr ""
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
msgid "Print the list of tasks"
msgstr ""
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
msgid "View the selected task"
msgstr ""
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
msgid "_Open Task"
msgstr ""
@@ -17488,10 +17591,14 @@ msgid "_Day View"
msgstr ""
#: views/calendar/galview.xml.h:3
-msgid "_Month View"
+msgid "_List View"
msgstr ""
#: views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr ""
+
+#: views/calendar/galview.xml.h:5
msgid "_Work Week View"
msgstr ""
@@ -17521,10 +17628,15 @@ msgid "_Messages"
msgstr ""
#: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr ""
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Other Organiser"
#: views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr ""
+
+#: views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr ""
@@ -17581,14 +17693,10 @@ msgstr ""
msgid "%B %Y"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
msgid "Now"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr ""
-
#: widgets/misc/e-cell-date-edit.c:805
#, c-format
msgid "The time must be in the format: %s"
@@ -17598,82 +17706,86 @@ msgstr ""
msgid "The percent value must be between 0 and 100, inclusive"
msgstr ""
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
msgid "Baltic"
msgstr ""
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
msgid "Central European"
msgstr ""
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
msgid "Chinese"
msgstr ""
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
msgid "Cyrillic"
msgstr ""
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
msgid "Greek"
msgstr ""
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
msgid "Hebrew"
msgstr ""
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
msgid "Japanese"
msgstr ""
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
msgid "Korean"
msgstr ""
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
msgid "Turkish"
msgstr ""
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
msgid "Unicode"
msgstr ""
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
msgid "Western European"
msgstr ""
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:73
+msgid "Western European, New"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
msgid "Traditional"
msgstr ""
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
+#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
msgid "Simplified"
msgstr ""
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
msgid "Ukrainian"
msgstr ""
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
msgid "Visual"
msgstr ""
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
#, c-format
msgid "Unknown character set: %s"
msgstr ""
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
msgid "Character Encoding"
msgstr ""
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
msgid "Enter the character set to use"
msgstr ""
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
msgid "Other..."
msgstr ""
@@ -17736,11 +17848,16 @@ msgid "Spacing around expander arrow"
msgstr ""
#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Other Organiser"
+
+#: widgets/misc/e-filter-bar.c:193
msgid "Search Editor"
msgstr ""
#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
msgid "Save Search"
msgstr ""
@@ -17760,15 +17877,15 @@ msgstr ""
msgid "Choose Image"
msgstr ""
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
msgid "_Search"
msgstr ""
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
msgid "_Find Now"
msgstr ""
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
msgid "_Clear"
msgstr ""
@@ -17799,6 +17916,18 @@ msgid "%s (%d%% complete)"
msgstr ""
#, fuzzy
+#~ msgid "Address Book Sources"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "1 contact"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "and %d other contacts."
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
#~ msgid ""
#~ "Could not create directory `%s':\n"
#~ "%s"
@@ -17951,10 +18080,6 @@ msgstr ""
#~ msgstr "Synchronising folders"
#, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
#~ msgid "Evolution Summary component"
#~ msgstr "Cannot initialise Evolution's mail component."