aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_CA.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_CA.po')
-rw-r--r--po/en_CA.po4677
1 files changed, 2561 insertions, 2116 deletions
diff --git a/po/en_CA.po b/po/en_CA.po
index eb2588964b..97fd56427a 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,16 +6,57 @@
msgid ""
msgstr ""
"Project-Id-Version: evolution 1.5.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-11 11:44-0500\n"
+"POT-Creation-Date: 2004-04-02 11:14-0500\n"
"PO-Revision-Date: 2004-03-11 11:39-0500\n"
"Last-Translator: Alexander Winston <alexander.winston@comcast.net>\n"
"Language-Team: Canadian English <adamw@FreeBSD.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: 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 "Evolution Addressbook"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "List local addressbook folders"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Save As"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "cards"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "cards"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Contacts: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution Alarm"
+
#: addressbook/conduit/address-conduit.c:272
msgid "Default Sync Address:"
msgstr "Default Sync Address:"
@@ -46,7 +87,6 @@ msgstr "Configure autocomple here"
#. can not get name, should be a bug of e-book.Anyway, should set a default name.
#.
#. name = e_book_get_name (book);
-#. Create the contacts group
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
#: calendar/gui/migration.c:363
@@ -94,75 +134,91 @@ msgstr "Manager your S/Mime certificates here"
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
-#: addressbook/gui/component/addressbook-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
msgid "New Address Book"
msgstr "New Address Book"
-#: 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 "Delete"
-#: 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 "Properties..."
-#: addressbook/gui/component/addressbook-component.c:554
+#: addressbook/gui/component/addressbook-component.c:551
msgid "New Contact"
msgstr "New Contact"
-#: addressbook/gui/component/addressbook-component.c:555
+#: addressbook/gui/component/addressbook-component.c:552
msgid "_Contact"
msgstr "_Contact"
-#: addressbook/gui/component/addressbook-component.c:556
+#: addressbook/gui/component/addressbook-component.c:553
msgid "Create a new contact"
msgstr "Create a new contact"
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:558
msgid "New Contact List"
msgstr "New Contact List"
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:559
msgid "Contact _List"
msgstr "Contact _List"
-#: addressbook/gui/component/addressbook-component.c:563
+#: addressbook/gui/component/addressbook-component.c:560
msgid "Create a new contact list"
msgstr "Create a new contact list"
-#: addressbook/gui/component/addressbook-config.c:399
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "New Addressbook Book"
+msgstr "New Address Book"
+
+#: addressbook/gui/component/addressbook-component.c:566
+#, fuzzy
+msgid "_Address Book"
+msgstr "Address Book"
+
+#: addressbook/gui/component/addressbook-component.c:567
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Create a new task"
+
+#: addressbook/gui/component/addressbook-config.c:407
msgid "Failed to connect to LDAP server"
msgstr "Failed to connect to LDAP server"
-#: addressbook/gui/component/addressbook-config.c:423
+#: addressbook/gui/component/addressbook-config.c:431
msgid "Failed to authenticate with LDAP server"
msgstr "Failed to authenticate with LDAP server"
-#: addressbook/gui/component/addressbook-config.c:451
+#: addressbook/gui/component/addressbook-config.c:459
msgid "Could not perform query on Root DSE"
msgstr "Could not perform query on Root DSE"
-#: addressbook/gui/component/addressbook-config.c:777
+#: addressbook/gui/component/addressbook-config.c:785
msgid "The server responded with no supported search bases"
msgstr "The server responded with no supported search bases"
-#: addressbook/gui/component/addressbook-config.c:1198
+#: addressbook/gui/component/addressbook-config.c:1217
msgid "This server does not support LDAPv3 schema information"
msgstr "This server does not support LDAPv3 schema information"
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1238
msgid "Error retrieving schema information"
msgstr "Error retrieving schema information"
-#: addressbook/gui/component/addressbook-config.c:1228
+#: addressbook/gui/component/addressbook-config.c:1246
msgid "Server did not respond with valid schema information"
msgstr "Server did not respond with valid schema information"
@@ -190,20 +246,18 @@ msgid "Migrating `%s':"
msgstr "Migrating `%s':"
#. create the local source group
-#. On This Computer is always first and VFolders is always last
#: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:426 calendar/gui/migration.c:503
-#: mail/em-folder-tree-model.c:176 mail/em-folder-tree-model.c:178
+#: 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 "On This Computer"
#. Create the default Person addressbook
-#. orange
#: 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 "Personal"
@@ -256,7 +310,7 @@ msgstr "The backend for this addressbook refused to perform this query."
msgid "This query did not complete successfully."
msgstr "This query did not complete successfully."
-#: 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."
@@ -264,7 +318,7 @@ msgstr ""
"We were unable to open this addressbook. Please check that the path exists "
"and that you have permission to access it."
-#: addressbook/gui/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."
@@ -272,7 +326,7 @@ msgstr ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
-#: addressbook/gui/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 "
@@ -282,7 +336,7 @@ msgstr ""
"you want to use LDAP in Evolution you must compile the program from the CVS "
"sources after retrieving OpenLDAP from the link below."
-#: addressbook/gui/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."
@@ -290,28 +344,28 @@ msgstr ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:629
msgid "Unable to open addressbook"
msgstr "Unable to open addressbook"
-#: addressbook/gui/component/addressbook.c:716
+#: addressbook/gui/component/addressbook.c:713
msgid "Accessing LDAP Server anonymously"
msgstr "Accessing LDAP Server anonymously"
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:782
msgid "Failed to authenticate.\n"
msgstr "Failed to authenticate.\n"
-#: addressbook/gui/component/addressbook.c:791
+#: addressbook/gui/component/addressbook.c:788
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sEnter password for %s (user %s)"
-#: addressbook/gui/component/addressbook.c:1116
+#: addressbook/gui/component/addressbook.c:1113
msgid "UID of the contacts source that the view will display"
msgstr "UID of the contacts source that the view will display"
-#: addressbook/gui/component/addressbook.c:1121
+#: addressbook/gui/component/addressbook.c:1118
msgid "The URI that the address book will display"
msgstr "The URI that the address book will display"
@@ -336,16 +390,10 @@ msgid "URI for the folder last used in the select names dialog"
msgstr "URI for the folder last used in the select names dialog"
#: 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 "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
msgid " S_how Supported Bases "
msgstr " S_how Supported Bases "
-#: 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
@@ -360,59 +408,51 @@ msgstr " S_how Supported Bases "
#: 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 "1:00"
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr "2:30"
-
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "3268"
msgstr "3268"
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "5:00"
msgstr "5:00"
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
msgid "636"
msgstr "636"
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
msgid "Address Book Creation Assistant"
msgstr "Address Book Creation Assistant"
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
msgid "Address Book Properties"
msgstr "Address Book Properties"
-#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Address Book Sources"
-msgstr "Address Book Sources"
-
-#: 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 "Always"
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:11
msgid "Anonymously"
msgstr "Anonymously"
-#: 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"
@@ -424,51 +464,51 @@ msgstr ""
"\n"
"Please click the \"Apply\" button to save the settings you have entered here."
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Connecting"
msgstr "Connecting"
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:17
msgid "Distinguished _name:"
msgstr "Distinguished _name:"
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
msgid "Email address:"
msgstr "Email address:"
-#: 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 "Evolution will use this DN to authenticate you with the server"
-#: 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 ""
"Evolution will use this email address to authenticate you with the server"
-#: 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 "Finished"
-#: 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 "General"
-#: 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 "Group:"
-#: 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 "Never"
-#: 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"
@@ -484,23 +524,19 @@ msgstr ""
"your connection. Ask your system administrator if your LDAP server uses "
"these protocols."
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid "One"
msgstr "One"
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid "S_earch scope: "
msgstr "S_earch scope: "
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:31
msgid "Searching"
msgstr "Searching"
-#: addressbook/gui/component/ldap-config.glade.h:36
-msgid "Selected:"
-msgstr "Selected:"
-
-#: 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"
@@ -510,7 +546,7 @@ msgstr ""
"server if\n"
"your LDAP server supports SSL or TLS."
-#: 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"
@@ -528,7 +564,7 @@ msgstr ""
"is already\n"
"secure."
-#: 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"
@@ -542,7 +578,7 @@ msgstr ""
"to security\n"
"exploits. "
-#: 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 "
@@ -553,7 +589,7 @@ msgstr ""
"LDAP\n"
"searches, and for creating and editing contacts. "
-#: 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"
@@ -563,32 +599,32 @@ msgstr ""
"\t\t\t display name and group is the first step in setting\n"
"\t\t\t up an address book."
-#: 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 "Step 1: Folder Characteristics"
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:47
msgid "Step 2: Server Information"
msgstr "Step 2: Server Information"
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "Step 3: Connecting to Server"
msgstr "Step 3: Connecting to Server"
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
msgid "Step 4: Searching the Directory"
msgstr "Step 4: Searching the Directory"
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "Sub"
msgstr "Sub"
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "Supported Search Bases"
msgstr "Supported Search Bases"
-#: 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"
@@ -602,7 +638,7 @@ msgstr ""
"if you\n"
"need to change these options."
-#: 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"
@@ -614,7 +650,7 @@ msgstr ""
"begin. If you leave this blank, the search will begin at the root of the "
"directory tree."
-#: 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"
@@ -630,7 +666,7 @@ msgstr ""
"A search scope of \"one\" will only include the entries one level beneath "
"your base.\n"
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:61
msgid ""
"This assistant will help you\n"
"\t create a new address book. \n"
@@ -646,7 +682,7 @@ msgstr ""
"parameters may be required. Please contact your system\n"
"administrator if you need help finding this information."
-#: 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"
"\"."
@@ -654,7 +690,7 @@ msgstr ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
-#: 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"
@@ -664,7 +700,7 @@ msgstr ""
"be \n"
"too large will slow down your address book."
-#: 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 "
@@ -674,7 +710,7 @@ msgstr ""
"setting this to \"Email Address\" requires anonymous access to your ldap "
"server."
-#: 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"
@@ -684,7 +720,7 @@ msgstr ""
"list.\n"
"It is for display purposes only. "
-#: 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 "
@@ -693,7 +729,7 @@ msgstr ""
"This is the name that will appear in your Evolution folder list. It is for "
"display purposes only. "
-#: 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"
@@ -705,28 +741,28 @@ msgstr ""
"list of standard ports has been provided. Ask your system administrator\n"
"what port you should specify."
-#: 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 "This option controls how long a search will be run."
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:78
msgid "U_se SSL/TLS:"
msgstr "U_se SSL/TLS:"
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:79
msgid "Using distinguished name (DN)"
msgstr "Using distinguished name (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:80
msgid "Using email address"
msgstr "Using email address"
-#: 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 "Whenever Possible"
-#: 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"
@@ -738,60 +774,48 @@ msgstr ""
"log in information. Please ask your system administrator if you are unsure "
"of this information."
-#: 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 "_Display name:"
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:85
msgid "_Download limit:"
msgstr "_Download limit:"
-#: 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 "_Edit"
-
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:86
msgid "_Log in method:"
msgstr "_Log in method:"
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:87
msgid "_Port number:"
msgstr "_Port number:"
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
msgid "_Search base:"
msgstr "_Search base:"
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
msgid "_Server name:"
msgstr "_Server name:"
-#: addressbook/gui/component/ldap-config.glade.h:96
+#: addressbook/gui/component/ldap-config.glade.h:90
msgid "_Timeout (minutes):"
msgstr "_Timeout (minutes):"
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
msgid "cards"
msgstr "cards"
-#: addressbook/gui/component/ldap-config.glade.h:98
+#: addressbook/gui/component/ldap-config.glade.h:92
msgid "connecting-tab"
msgstr "connecting-tab"
-#: addressbook/gui/component/ldap-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:93
msgid "general-tab"
msgstr "general-tab"
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
msgid "searching-tab"
msgstr "searching-tab"
@@ -823,7 +847,7 @@ msgid "Send HTML Mail?"
msgstr "Send HTML Mail?"
#: 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 "Add to Contacts"
@@ -839,7 +863,7 @@ msgstr "Name"
#: 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 "Source"
@@ -906,7 +930,8 @@ msgstr "Collaboration"
#. Construct the app
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:2065
+#: addressbook/gui/contact-editor/e-contact-editor.c:1202
+#: addressbook/gui/contact-editor/e-contact-editor.c:2019
msgid "Contact Editor"
msgstr "Contact Editor"
@@ -915,7 +940,7 @@ msgid "D_epartment:"
msgstr "D_epartment:"
#: 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 "Details"
@@ -1000,16 +1025,27 @@ msgstr "_Categories..."
#. 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:2388
-#: mail/em-folder-view.c:783 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:112
-#: 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 "_Delete"
+#: 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 "_Edit"
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_Home:"
msgstr "_Home:"
@@ -1052,21 +1088,21 @@ msgstr "_Web page address:"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
#: addressbook/gui/widgets/eab-contact-display.c:316
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:337
msgid "Address"
msgstr "Address"
#: 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:250
-#: 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 "Editable"
@@ -2047,7 +2083,7 @@ msgid "Novell Groupwise"
msgstr "Novell Groupwise"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2917
+#: 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"
@@ -2062,20 +2098,21 @@ msgid "MSN Messenger"
msgstr "MSN Messenger"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2920
+#: 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 "ICQ"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:741
+#: addressbook/gui/contact-editor/e-contact-editor.c:704
msgid "Service"
msgstr "Service"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
+#: 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
msgid "Location"
msgstr "Location"
@@ -2084,111 +2121,95 @@ msgid "Username"
msgstr "Username"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2585
-#: addressbook/gui/contact-editor/e-contact-editor.c:2881
+#: addressbook/gui/contact-editor/e-contact-editor.c:2503
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
msgid "Home"
msgstr "Home"
#. red
#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2885
-#: 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 "Work"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2586
-#: addressbook/gui/contact-editor/e-contact-editor.c:2889
+#: addressbook/gui/contact-editor/e-contact-editor.c:2504
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
msgid "Other"
msgstr "Other"
-#: addressbook/gui/contact-editor/e-contact-editor.c:215
+#: addressbook/gui/contact-editor/e-contact-editor.c:217
msgid "Source Book"
msgstr "Source Book"
-#: addressbook/gui/contact-editor/e-contact-editor.c:222
+#: addressbook/gui/contact-editor/e-contact-editor.c:224
msgid "Target Book"
msgstr "Target Book"
-#: addressbook/gui/contact-editor/e-contact-editor.c:229
-#: 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
msgid "Contact"
msgstr "Contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:236
+#: addressbook/gui/contact-editor/e-contact-editor.c:238
msgid "Is New Contact"
msgstr "Is New Contact"
-#: addressbook/gui/contact-editor/e-contact-editor.c:243
+#: addressbook/gui/contact-editor/e-contact-editor.c:245
msgid "Writable Fields"
msgstr "Writable Fields"
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Changed"
msgstr "Changed"
-#: addressbook/gui/contact-editor/e-contact-editor.c:755
+#: addressbook/gui/contact-editor/e-contact-editor.c:718
msgid "Account Name"
msgstr "Account Name"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#: addressbook/gui/contact-editor/e-contact-editor.c:1485
msgid "Category editor not available."
msgstr "Category editor not available."
-#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/contact-editor/e-contact-editor.c:1493
msgid "This contact belongs to these categories:"
msgstr "This contact belongs to these categories:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1717
msgid "Save Contact as VCard"
msgstr "Save Contact as VCard"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1774
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Are you sure you want\n"
-"to delete this contact?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: addressbook/gui/contact-editor/e-contact-editor.c:2502
msgid "Business"
msgstr "Business"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2916
+#: 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 "AIM"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2918
+#: 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 "Yahoo"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: 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 "MSN"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2921
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
msgid "GroupWise"
msgstr "GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:3208
+#: addressbook/gui/contact-editor/e-contact-editor.c:3126
#, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "Could not find widget for a field: `%s'"
@@ -2202,6 +2223,7 @@ msgid "_Edit Full"
msgstr "_Edit Full"
#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:164
msgid "_Full Name:"
msgstr "_Full Name:"
@@ -2209,6 +2231,22 @@ msgstr "_Full Name:"
msgid "E-_mail:"
msgstr "E-_mail:"
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
#: addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Address _2:"
msgstr "Address _2:"
@@ -2326,6 +2364,10 @@ msgstr "_IM Service:"
msgid "_Location:"
msgstr "_Location:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr "\n"
+
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
msgid "Members"
msgstr "Members"
@@ -2346,25 +2388,26 @@ msgstr "_Type an email address or drag a contact into the list below:"
msgid "contact-list-editor"
msgstr "contact-list-editor"
-#: 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 "Book"
-#: 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 "Is New List"
#. 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 "Contact List Editor"
-#: 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 "Save List as VCard"
@@ -2416,23 +2459,21 @@ msgid "No contacts"
msgstr "No contacts"
#: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "1 contact"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contacts"
+msgstr[1] "%d contacts"
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d contacts"
-
-#: 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 "Query"
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
msgid "Error getting book view"
msgstr "Error getting book view"
@@ -2444,129 +2485,128 @@ msgstr "Model"
msgid "Error modifying card"
msgstr "Error modifying card"
-#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: addressbook/gui/widgets/e-addressbook-view.c:161
msgid "Name begins with"
msgstr "Name begins with"
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:162
msgid "Email begins with"
msgstr "Email begins with"
-#: 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 "Category is"
#. 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 "Any field contains"
-#: 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 "Advanced..."
-#: 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 "Type"
-#: addressbook/gui/widgets/e-addressbook-view.c:494
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: addressbook/gui/widgets/e-addressbook-view.c:506
msgid "Address Book"
msgstr "Address Book"
-#: 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 "Save as VCard"
-#: addressbook/gui/widgets/e-addressbook-view.c:1045
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
msgid "New Contact..."
msgstr "New Contact..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
msgid "New Contact List..."
msgstr "New Contact List..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1049
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
msgid "Go to Folder..."
msgstr "Go to Folder..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
msgid "Import..."
msgstr "Import..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1052
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
msgid "Search for Contacts..."
msgstr "Search for Contacts..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1053
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
msgid "Address Book Sources..."
msgstr "Address Book Sources..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1055
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
msgid "Pilot Settings..."
msgstr "Pilot Settings..."
-#: 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 "Forward Contact"
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
msgid "Send Message to Contact"
msgstr "Send Message to Contact"
-#: 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:80
+#: 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 "Print"
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
msgid "Print Envelope"
msgstr "Print Envelope"
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
msgid "Copy to Address Book..."
msgstr "Copy to Address Book..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1068
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
msgid "Move to Address Book..."
msgstr "Move to Address Book..."
-#: 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 "Cut"
-#. 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 "Copy"
-#: 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 "Paste"
-#: 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 "Current View"
-#: addressbook/gui/widgets/e-addressbook-view.c:1267
+#: addressbook/gui/widgets/e-addressbook-view.c:1279
#, c-format
msgid ""
"The addressbook backend for\n"
@@ -2578,7 +2618,7 @@ msgstr ""
"has crashed. You will have to restart Evolution in order to use it again"
#. 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 "Any Category"
@@ -2612,8 +2652,6 @@ msgid "Car Phone"
msgstr "Car Phone"
#: 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 "Categories"
@@ -2622,7 +2660,7 @@ msgid "Company Phone"
msgstr "Company Phone"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:520 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
msgid "Email"
msgstr "Email"
@@ -2673,6 +2711,7 @@ msgid "Manager"
msgstr "Manager"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:336
msgid "Mobile Phone"
msgstr "Mobile Phone"
@@ -2681,7 +2720,7 @@ msgid "Nickname"
msgstr "Nickname"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:347
msgid "Note"
msgstr "Note"
@@ -2746,17 +2785,17 @@ msgid "Web Site"
msgstr "Web Site"
#: 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 "Width"
#: 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 "Height"
#: 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 "Has Focus"
@@ -2808,11 +2847,11 @@ msgstr ""
msgid "Adapter"
msgstr "Adapter"
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:159
msgid "Selected"
msgstr "Selected"
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:166
msgid "Has Cursor"
msgstr "Has Cursor"
@@ -2827,7 +2866,7 @@ msgid "map"
msgstr "map"
#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:496
+#: addressbook/gui/widgets/eab-contact-display.c:498
msgid "List Members"
msgstr "List Members"
@@ -2849,6 +2888,7 @@ msgid "Video Conferencing"
msgstr "Video Conferencing"
#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:335
msgid "Phone"
msgstr "Phone"
@@ -2865,27 +2905,27 @@ msgid "WWW"
msgstr "WWW"
#: addressbook/gui/widgets/eab-contact-display.c:333
-#: addressbook/gui/widgets/eab-contact-display.c:555
+#: addressbook/gui/widgets/eab-contact-display.c:557
msgid "Blog"
msgstr "Blog"
-#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:340
msgid "personal"
msgstr "personal"
-#: addressbook/gui/widgets/eab-contact-display.c:516
+#: addressbook/gui/widgets/eab-contact-display.c:518
msgid "Job Title"
msgstr "Job Title"
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:549
msgid "Home page"
msgstr "Home page"
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:47
msgid "Success"
msgstr "Success"
-#: 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
@@ -2893,92 +2933,92 @@ msgstr "Success"
msgid "Unknown error"
msgstr "Unknown error"
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
msgid "Repository offline"
msgstr "Repository offline"
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
msgid "Permission denied"
msgstr "Permission denied"
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
msgid "Contact not found"
msgstr "Contact not found"
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
msgid "Contact ID already exists"
msgstr "Contact ID already exists"
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
msgid "Protocol not supported"
msgstr "Protocol not supported"
-#: 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 "Cancelled"
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
msgid "Authentication Failed"
msgstr "Authentication Failed"
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:56
msgid "Authentication Required"
msgstr "Authentication Required"
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
msgid "TLS not Available"
msgstr "TLS not Available"
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
msgid "Address Book does not exist"
msgstr "Address Book does not exist"
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
msgid "Other error"
msgstr "Other error"
-#: addressbook/gui/widgets/eab-gui-util.c:85
+#: addressbook/gui/widgets/eab-gui-util.c:86
msgid "Do you want to save changes?"
msgstr "Do you want to save changes?"
-#: addressbook/gui/widgets/eab-gui-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:88
msgid "_Discard"
msgstr "_Discard"
-#: addressbook/gui/widgets/eab-gui-util.c:106
+#: addressbook/gui/widgets/eab-gui-util.c:107
msgid "Error adding list"
msgstr "Error adding list"
-#: 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 "Error adding contact"
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
msgid "Error modifying list"
msgstr "Error modifying list"
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:116
msgid "Error modifying contact"
msgstr "Error modifying contact"
-#: addressbook/gui/widgets/eab-gui-util.c:125
+#: addressbook/gui/widgets/eab-gui-util.c:126
msgid "Error removing list"
msgstr "Error removing list"
-#: 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 "Error removing contact"
-#: 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"
@@ -2987,7 +3027,7 @@ msgstr ""
"Opening %d contacts will open %d new windows as well.\n"
"Do you really want to display all of these contacts?"
-#: addressbook/gui/widgets/eab-gui-util.c:233
+#: addressbook/gui/widgets/eab-gui-util.c:234
#, c-format
msgid ""
"%s already exists\n"
@@ -2996,49 +3036,49 @@ msgstr ""
"%s already exists\n"
"Do you want to overwrite it?"
-#: addressbook/gui/widgets/eab-gui-util.c:237
+#: addressbook/gui/widgets/eab-gui-util.c:238
msgid "Overwrite"
msgstr "Overwrite"
-#: addressbook/gui/widgets/eab-gui-util.c:273
+#: addressbook/gui/widgets/eab-gui-util.c:274
#, c-format
msgid "Error saving %s: %s"
msgstr "Error saving %s: %s"
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:310
+#: addressbook/gui/widgets/eab-gui-util.c:311
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:443
+#: addressbook/gui/widgets/eab-gui-util.c:444
msgid "list"
msgstr "list"
-#: addressbook/gui/widgets/eab-gui-util.c:578
+#: addressbook/gui/widgets/eab-gui-util.c:579
msgid "Move contact to"
msgstr "Move contact to"
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:581
msgid "Copy contact to"
msgstr "Copy contact to"
-#: addressbook/gui/widgets/eab-gui-util.c:583
+#: addressbook/gui/widgets/eab-gui-util.c:584
msgid "Move contacts to"
msgstr "Move contacts to"
-#: addressbook/gui/widgets/eab-gui-util.c:585
+#: addressbook/gui/widgets/eab-gui-util.c:586
msgid "Copy contacts to"
msgstr "Copy contacts to"
-#: addressbook/gui/widgets/eab-gui-util.c:588
+#: addressbook/gui/widgets/eab-gui-util.c:589
msgid "Select target addressbook."
msgstr "Select target addressbook."
-#: addressbook/gui/widgets/eab-gui-util.c:767
+#: addressbook/gui/widgets/eab-gui-util.c:768
msgid "Multiple VCards"
msgstr "Multiple VCards"
-#: addressbook/gui/widgets/eab-gui-util.c:770
+#: addressbook/gui/widgets/eab-gui-util.c:771
#, c-format
msgid "VCard for %s"
msgstr "VCard for %s"
@@ -3074,33 +3114,31 @@ msgstr "Add address to existing contact \"%s\""
msgid "Querying Address Book..."
msgstr "Querying Address Book..."
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:971
msgid "Edit Contact Info"
msgstr "Edit Contact Info"
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1026
msgid "Merge E-Mail Address"
msgstr "Merge E-Mail Address"
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "and %d other contacts."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
msgid "and one other contact."
-msgstr "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "and one other contact."
+msgstr[1] "and one other contact."
-#: 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 "Show Full VCard"
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
msgid "Show Compact VCard"
msgstr "Show Compact VCard"
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
msgid "Save in addressbook"
msgstr "Save in addressbook"
@@ -3112,17 +3150,17 @@ msgstr "Card View"
msgid "GTK Tree View"
msgstr "GTK Tree View"
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
msgid "Reflow Test"
msgstr "Reflow Test"
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
#: addressbook/printing/test-contact-print-style-editor.c:54
#: addressbook/printing/test-print.c:53
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "Copyright (C) 2000, Ximian, Inc."
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
msgid "This should test the reflow canvas item"
msgstr "This should test the reflow canvas item"
@@ -3248,7 +3286,7 @@ msgstr "Margins"
msgid "Number of columns:"
msgstr "Number of columns:"
-#: 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 "Options"
@@ -3427,7 +3465,7 @@ msgid "Unnamed List"
msgstr "Unnamed List"
#: 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 "Enter password"
@@ -3504,7 +3542,7 @@ msgid "Evolution's Tasks component"
msgstr "Evolution's Tasks 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"
@@ -3550,24 +3588,24 @@ msgstr "Snooze time (minutes)"
msgid "_Edit appointment"
msgstr "_Edit appointment"
-#: 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 "Open"
-#: calendar/gui/alarm-notify/alarm-queue.c:905
+#: calendar/gui/alarm-notify/alarm-queue.c:908
msgid "Dismiss"
msgstr "Dismiss"
-#: calendar/gui/alarm-notify/alarm-queue.c:907
+#: calendar/gui/alarm-notify/alarm-queue.c:910
msgid "Dismiss All"
msgstr "Dismiss All"
-#: calendar/gui/alarm-notify/alarm-queue.c:972
+#: calendar/gui/alarm-notify/alarm-queue.c:975
msgid "No description available."
msgstr "No description available."
-#: calendar/gui/alarm-notify/alarm-queue.c:990
+#: calendar/gui/alarm-notify/alarm-queue.c:993
#, c-format
msgid ""
"Alarm on %s\n"
@@ -3580,12 +3618,12 @@ msgstr ""
"Starting at %s\n"
"Ending at %s"
-#: 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 "Warning"
-#: 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"
@@ -3597,7 +3635,7 @@ msgstr ""
"configured to send an email. Evolution will display\n"
"a normal reminder dialog box instead."
-#: 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 "
@@ -3614,7 +3652,7 @@ msgstr ""
"\n"
"Are you sure you want to run this program?"
-#: 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 "Do not ask me about this program again."
@@ -3778,13 +3816,13 @@ msgstr "Comment contains"
msgid "Location contains"
msgstr "Location contains"
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1106
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
msgid "Unmatched"
msgstr "Unmatched"
-#: 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 "Calendar"
@@ -3803,7 +3841,7 @@ msgid "Purge events older than"
msgstr "Purge events older than"
#: 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 "days"
@@ -3813,12 +3851,8 @@ msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
#: calendar/gui/calendar-commands.c: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 "%a %d %b"
@@ -3840,70 +3874,70 @@ msgstr "%d %B %Y"
msgid "%d %B"
msgstr "%d %B"
-#: 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 '%s' will be removed. Are you sure you want to continue?"
-#: calendar/gui/calendar-component.c:370
+#: calendar/gui/calendar-component.c:432
#: calendar/gui/dialogs/calendar-setup.glade.h:13
msgid "New Calendar"
msgstr "New Calendar"
-#: calendar/gui/calendar-component.c:843
+#: calendar/gui/calendar-component.c:923
msgid "New appointment"
msgstr "New appointment"
-#: calendar/gui/calendar-component.c:844
+#: calendar/gui/calendar-component.c:924
msgid "_Appointment"
msgstr "_Appointment"
-#: calendar/gui/calendar-component.c:845
+#: calendar/gui/calendar-component.c:925
msgid "Create a new appointment"
msgstr "Create a new appointment"
-#: calendar/gui/calendar-component.c:850
+#: calendar/gui/calendar-component.c:930
msgid "New meeting"
msgstr "New meeting"
-#: calendar/gui/calendar-component.c:851
+#: calendar/gui/calendar-component.c:931
msgid "M_eeting"
msgstr "M_eeting"
-#: calendar/gui/calendar-component.c:852
+#: calendar/gui/calendar-component.c:932
msgid "Create a new meeting request"
msgstr "Create a new meeting request"
-#: calendar/gui/calendar-component.c:857
+#: calendar/gui/calendar-component.c:937
msgid "New all day appointment"
msgstr "New all day appointment"
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:938
msgid "All _Day Appointment"
msgstr "All _Day Appointment"
-#: calendar/gui/calendar-component.c:859
+#: calendar/gui/calendar-component.c:939
msgid "Create a new all-day appointment"
msgstr "Create a new all-day appointment"
-#: calendar/gui/calendar-component.c:864
+#: calendar/gui/calendar-component.c:944
msgid "New calendar"
msgstr "New calendar"
-#: calendar/gui/calendar-component.c:865
+#: calendar/gui/calendar-component.c:945
msgid "C_alendar"
msgstr "C_alendar"
-#: calendar/gui/calendar-component.c:866
+#: calendar/gui/calendar-component.c:946
msgid "Create a new calendar"
msgstr "Create a new calendar"
-#: 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 "Unable to open the calendar '%s' for creating events and meetings"
-#: calendar/gui/calendar-component.c:945
+#: calendar/gui/calendar-component.c:1025
msgid "There is no calendar available for creating events and meetings"
msgstr "There is no calendar available for creating events and meetings"
@@ -3933,10 +3967,6 @@ msgstr "Week View"
msgid "Month View"
msgstr "Month View"
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "List View"
-
#: calendar/gui/comp-editor-factory.c:408
msgid "Error while opening the calendar"
msgstr "Error while opening the calendar"
@@ -3954,16 +3984,16 @@ msgstr "Permission denied to open the calendar"
msgid "open_client(): %s"
msgstr "open_client(): %s"
-#: calendar/gui/control-factory.c:140
+#: calendar/gui/control-factory.c:142
#, c-format
msgid "Could not open the folder in '%s'"
msgstr "Could not open the folder in '%s'"
-#: calendar/gui/control-factory.c:190
+#: calendar/gui/control-factory.c:192
msgid "The URI that the calendar will display"
msgstr "The URI that the calendar will display"
-#: calendar/gui/control-factory.c:197
+#: calendar/gui/control-factory.c:199
msgid "The type of view to show"
msgstr "The type of view to show"
@@ -4027,11 +4057,11 @@ msgstr "dialog1"
msgid "extra times every"
msgstr "extra times every"
-#: 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 "hours"
-#: 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 "minutes"
@@ -4054,11 +4084,11 @@ msgstr "Basics"
msgid "Date/Time:"
msgstr "Date/Time:"
-#: 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 "Display a message"
-#: 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 "Play a sound"
@@ -4066,17 +4096,17 @@ msgstr "Play a sound"
msgid "Reminders"
msgstr "Reminders"
-#: 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 "Run a program"
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:467
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
msgid "Send an email"
msgstr "Send an email"
#: 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 "Summary:"
@@ -4107,7 +4137,7 @@ msgid "hour(s)"
msgstr "hour(s)"
#: 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 "minute(s)"
@@ -4117,8 +4147,8 @@ msgstr "start of appointment"
#. 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 "Enabled"
@@ -4132,19 +4162,19 @@ msgstr "Don't Remove"
#: 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 "Disable"
#: 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 "Enable"
@@ -4168,7 +4198,7 @@ msgstr "30 minutes"
msgid "60 minutes"
msgstr "60 minutes"
-#: 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 "Alerts"
@@ -4193,7 +4223,7 @@ msgid "Days"
msgstr "Days"
#: 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 "E_nable"
@@ -4288,7 +4318,7 @@ msgid "Wednesday"
msgstr "Wednesday"
#: 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 "Work Week"
@@ -4333,7 +4363,6 @@ msgid "_Fri"
msgstr "_Fri"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: mail/mail-config.glade.h:153
msgid "_General"
msgstr "_General"
@@ -4430,7 +4459,7 @@ msgstr ""
"Please click the \"Apply\" button to save the settings you have entered here."
#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:363
msgid "New Task List"
msgstr "New Task List"
@@ -4592,28 +4621,28 @@ msgstr "%s You have made changes. Forget those changes and update the editor?"
msgid "%s You have made no changes, update the editor?"
msgstr "%s You have made no changes, update the editor?"
-#: calendar/gui/dialogs/comp-editor-page.c:441
+#: calendar/gui/dialogs/comp-editor-page.c:440
#, c-format
msgid "Validation error: %s"
msgstr "Validation error: %s"
-#: 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 " to "
-#: 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 " (Completed "
-#: 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 "Completed "
-#: 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 " (Due "
-#: 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 "Due "
@@ -4649,8 +4678,9 @@ msgstr "Journal entry - %s"
msgid "No summary"
msgstr "No summary"
-#: 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 "Save as..."
@@ -4664,31 +4694,18 @@ msgstr "Changes made to this item may be discarded if an update arrives"
msgid "Unable to use current version!"
msgstr "Unable to use current version!"
-#: calendar/gui/dialogs/copy-source-dialog.c:83
+#: calendar/gui/dialogs/copy-source-dialog.c:57
msgid "Could not open source"
msgstr "Could not open source"
-#: calendar/gui/dialogs/copy-source-dialog.c:91
+#: calendar/gui/dialogs/copy-source-dialog.c:65
msgid "Could not open destination"
msgstr "Could not open destination"
-#: calendar/gui/dialogs/copy-source-dialog.c:100
+#: calendar/gui/dialogs/copy-source-dialog.c:74
msgid "Destination is read only"
msgstr "Destination is read only"
-#: calendar/gui/dialogs/copy-source-dialog.c:165
-#, c-format
-msgid "Select destination %s"
-msgstr "Select destination %s"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-msgid "calendar"
-msgstr "calendar"
-
-#: calendar/gui/dialogs/copy-source-dialog.c:167
-msgid "task list"
-msgstr "task list"
-
#: calendar/gui/dialogs/delete-comp.c:95
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4717,19 +4734,25 @@ msgid "Are you sure want to delete this untitled journal entry?"
msgstr "Are you sure want to delete this untitled journal entry?"
#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Are you sure you want to delete %d appointments?"
-
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Are you sure you want to delete %d tasks?"
-
-#: calendar/gui/dialogs/delete-comp.c:141
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Are you sure you want to delete %d journal entries?"
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointment?"
+msgid_plural "Are you sure you want to delete %d appointments?"
+msgstr[0] "Are you sure you want to delete %d appointments?"
+msgstr[1] "Are you sure you want to delete %d appointments?"
+
+#: calendar/gui/dialogs/delete-comp.c:138
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d task?"
+msgid_plural "Are you sure you want to delete %d tasks?"
+msgstr[0] "Are you sure you want to delete %d tasks?"
+msgstr[1] "Are you sure you want to delete %d tasks?"
+
+#: calendar/gui/dialogs/delete-comp.c:145
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entry?"
+msgid_plural "Are you sure you want to delete %d journal entries?"
+msgstr[0] "Are you sure you want to delete %d journal entries?"
+msgstr[1] "Are you sure you want to delete %d journal entries?"
#: calendar/gui/dialogs/delete-error.c:52
msgid "The event could not be deleted due to a corba error"
@@ -4791,7 +4814,7 @@ msgstr "Delegate To:"
msgid "Enter Delegate"
msgstr "Enter Delegate"
-#: 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 "Appointment"
@@ -4863,8 +4886,6 @@ msgstr "Calendar:"
#: 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 "Classification"
@@ -4913,20 +4934,15 @@ msgid "_Start time:"
msgstr "_Start time:"
#. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
#: calendar/gui/dialogs/meeting-page.c:311
#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:792
-#: 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 "None"
@@ -4983,13 +4999,13 @@ msgid "Member"
msgstr "Member"
#: 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 "RSVP"
#: 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
@@ -5161,7 +5177,7 @@ msgid "_No recurrence"
msgstr "_No recurrence"
#: 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 "_Remove"
@@ -5203,7 +5219,7 @@ msgstr ""
"\n"
"Do you wish to save your changes?"
-#: 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 "_Discard Changes"
@@ -5211,6 +5227,26 @@ msgstr "_Discard Changes"
msgid "Save Event"
msgstr "Save Event"
+#. create the dialog
+#: calendar/gui/dialogs/select-source-dialog.c:63
+#, fuzzy
+msgid "Select source"
+msgstr "Select importer"
+
+#. 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 "Select destination %s"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "calendar"
+msgstr "calendar"
+
+#: calendar/gui/dialogs/select-source-dialog.c:71
+msgid "task list"
+msgstr "task list"
+
#: calendar/gui/dialogs/send-comp.c:57
msgid "The meeting information has been created. Send it?"
msgstr "The meeting information has been created. Send it?"
@@ -5240,39 +5276,39 @@ msgstr "% _Complete"
#: 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 "Completed"
#: 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 "High"
#: 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 "In Progress"
#: 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 "Low"
#: 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 "Normal"
#: 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 "Not Started"
@@ -5286,7 +5322,8 @@ msgid "Undefined"
msgstr "Undefined"
#: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
msgstr "_Date Completed:"
#: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -5329,9 +5366,9 @@ msgstr "Unable to open tasks in '%s'."
msgid "Con_fidential"
msgstr "Con_fidential"
-#: 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 "Description:"
@@ -5340,11 +5377,13 @@ msgid "Folder:"
msgstr "Folder:"
#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Sta_rt Date:"
+#, fuzzy
+msgid "Sta_rt date:"
msgstr "Sta_rt Date:"
#: calendar/gui/dialogs/task-page.glade.h:12
-msgid "_Due Date:"
+#, fuzzy
+msgid "_Due date:"
msgstr "_Due Date:"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
@@ -5396,132 +5435,113 @@ msgid "Weekly"
msgstr "Weekly"
#: calendar/gui/e-alarm-list.c:395
-#, c-format
-msgid "%d days"
-msgstr "%d days"
-
-#: calendar/gui/e-alarm-list.c:398
-msgid "1 day"
-msgstr "1 day"
-
-#: calendar/gui/e-alarm-list.c:403
-#, c-format
-msgid "%d weeks"
-msgstr "%d weeks"
-
-#: calendar/gui/e-alarm-list.c:406
-msgid "1 week"
-msgstr "1 week"
-
-#: calendar/gui/e-alarm-list.c:411
-#, c-format
-msgid "%d hours"
-msgstr "%d hours"
-
-#: calendar/gui/e-alarm-list.c:414
-msgid "1 hour"
-msgstr "1 hour"
-
-#: calendar/gui/e-alarm-list.c:419
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutes"
-
-#: calendar/gui/e-alarm-list.c:422
-msgid "1 minute"
-msgstr "1 minute"
-
-#: calendar/gui/e-alarm-list.c:427
-#, c-format
-msgid "%d seconds"
-msgstr "%d seconds"
-
-#: calendar/gui/e-alarm-list.c:430
-msgid "1 second"
-msgstr "1 second"
-
-#: calendar/gui/e-alarm-list.c:477
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d days"
+msgstr[1] "%d days"
+
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d weeks"
+msgstr[1] "%d weeks"
+
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hours"
+msgstr[1] "%d hours"
+
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutes"
+msgstr[1] "%d minutes"
+
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d seconds"
+msgstr[1] "%d seconds"
+
+#: calendar/gui/e-alarm-list.c:462
msgid "Unknown action to be performed"
msgstr "Unknown action to be performed"
-#: 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 "%s %s before the start of the appointment"
-#: 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 "%s %s after the start of the appointment"
-#: 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 "%s at the start of the appointment"
-#: 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 "%s %s before the end of the appointment"
-#: 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 "%s %s after the end of the appointment"
-#: 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 "%s at the end of the appointment"
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:521
#, c-format
msgid "%s at %s"
msgstr "%s at %s"
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:527
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s for an unknown trigger type"
-#: 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 "Public"
-#: 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 "Private"
-#: 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 "Confidential"
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "Description"
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Date"
-#: 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 "Start Date"
-#: 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 "Summary"
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
-msgid "color"
-msgstr "colour"
-
-#: calendar/gui/e-cal-list-view.etspec.h:7
-msgid "component"
-msgstr "component"
-
#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
msgid "Free"
msgstr "Free"
@@ -5557,141 +5577,39 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: 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 "Yes"
-#: 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 "No"
#. 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 "Unknown"
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:872
msgid "Recurring"
msgstr "Recurring"
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:874
msgid "Assigned"
msgstr "Assigned"
-#: calendar/gui/e-cal-view.c:719 calendar/gui/e-calendar-table.c:698
-msgid "Deleting selected objects"
-msgstr "Deleting selected objects"
-
-#: calendar/gui/e-cal-view.c:820 calendar/gui/e-calendar-table.c:861
-msgid "Updating objects"
-msgstr "Updating objects"
-
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1339
-msgid "New _Appointment..."
-msgstr "New _Appointment..."
-
-#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1341
-msgid "New All Day _Event"
-msgstr "New All Day _Event"
-
-#: calendar/gui/e-cal-view.c:1256 calendar/gui/e-cal-view.c:1343
-msgid "New Meeting"
-msgstr "New Meeting"
-
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1345
-msgid "New Task"
-msgstr "New Task"
-
-#: 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:124
-#: ui/evolution-tasks.xml.h:23
-msgid "_Print..."
-msgstr "_Print..."
-
-#: 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:122 ui/evolution-tasks.xml.h:22
-msgid "_Paste"
-msgstr "_Paste"
-
-#: calendar/gui/e-cal-view.c:1271 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Go to _Today"
-
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-cal-view.c:1337
-msgid "_Go to Date..."
-msgstr "_Go to Date..."
-
-#: calendar/gui/e-cal-view.c:1276 ui/evolution-calendar.xml.h:40
-msgid "_Publish Free/Busy Information"
-msgstr "_Publish Free/Busy Information"
-
-#: 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:758 ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Open"
-
-#: 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:760 mail/em-popup.c:689 mail/em-popup.c:804
-#: ui/evolution-mail-message.xml.h:128
-msgid "_Save As..."
-msgstr "_Save As..."
-
-#: 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"
-msgstr "C_ut"
-
-#: 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:2381 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:109 ui/evolution-tasks.xml.h:18
-msgid "_Copy"
-msgstr "_Copy"
-
-#: calendar/gui/e-cal-view.c:1295
-msgid "_Schedule Meeting..."
-msgstr "_Schedule Meeting..."
-
-#: calendar/gui/e-cal-view.c:1296
-msgid "_Forward as iCalendar..."
-msgstr "_Forward as iCalendar..."
-
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
-msgid "Delete this _Occurrence"
-msgstr "Delete this _Occurrence"
-
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
-msgid "Delete _All Occurrences"
-msgstr "Delete _All Occurrences"
-
-#: calendar/gui/e-cal-view.c:1355 ui/evolution.xml.h:33
-msgid "_Settings..."
-msgstr "_Settings..."
-
#: calendar/gui/e-calendar-table.c:413
msgid "0%"
msgstr "0%"
@@ -5736,32 +5654,85 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+msgid "Deleting selected objects"
+msgstr "Deleting selected objects"
+
+#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+msgid "Updating objects"
+msgstr "Updating objects"
+
+#: 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 "_Open"
+
+#: calendar/gui/e-calendar-table.c:1041
msgid "Open _Web Page"
msgstr "Open _Web Page"
-#: calendar/gui/e-calendar-table.c:1050
+#: 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 "_Save As..."
+
+#: 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 "_Print..."
+
+#: 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 "C_ut"
+
+#: 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 "_Copy"
+
+#: 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 "_Paste"
+
+#: calendar/gui/e-calendar-table.c:1053
msgid "_Assign Task"
msgstr "_Assign Task"
-#: calendar/gui/e-calendar-table.c:1051
+#: calendar/gui/e-calendar-table.c:1054
msgid "_Forward as iCalendar"
msgstr "_Forward as iCalendar"
-#: calendar/gui/e-calendar-table.c:1052
+#: calendar/gui/e-calendar-table.c:1055
msgid "_Mark as Complete"
msgstr "_Mark as Complete"
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1056
msgid "_Mark Selected Tasks as Complete"
msgstr "_Mark Selected Tasks as Complete"
-#: calendar/gui/e-calendar-table.c:1058 calendar/gui/e-calendar-table.c:1076
+#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
msgid "_Delete Selected Tasks"
msgstr "_Delete Selected Tasks"
-#: calendar/gui/e-calendar-table.c:1368
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1371
+#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Click to add a task"
msgstr "Click to add a task"
@@ -5770,54 +5741,109 @@ msgstr "Click to add a task"
msgid "% Complete"
msgstr "% Complete"
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Alarms"
-
-#: 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
+#: 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 "Complete"
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
msgstr "Completion Date"
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
msgstr "Due Date"
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Geographical Position"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
msgid "Priority"
msgstr "Priority"
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
+msgstr "Start Date"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
msgid "Task sort"
msgstr "Task sort"
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+msgid "New _Appointment..."
+msgstr "New _Appointment..."
+
+#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+msgid "New All Day _Event"
+msgstr "New All Day _Event"
+
+#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+msgid "New Meeting"
+msgstr "New Meeting"
+
+#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+msgid "New Task"
+msgstr "New Task"
+
+#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Select _Thread"
+
+#: calendar/gui/e-calendar-view.c:1251
+#, fuzzy
+msgid "_Select Date..."
+msgstr "_Select..."
+
+#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Publish Free/Busy Information"
+
+#: calendar/gui/e-calendar-view.c:1274
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Copy to Folder..."
+
+#: calendar/gui/e-calendar-view.c:1275
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ve to Folder..."
+
+#: calendar/gui/e-calendar-view.c:1276
+msgid "_Schedule Meeting..."
+msgstr "_Schedule Meeting..."
+
+#: calendar/gui/e-calendar-view.c:1277
+msgid "_Forward as iCalendar..."
+msgstr "_Forward as iCalendar..."
+
+#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+msgid "Delete this _Occurrence"
+msgstr "Delete this _Occurrence"
+
+#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+msgid "Delete _All Occurrences"
+msgstr "Delete _All Occurrences"
+
+#: calendar/gui/e-calendar-view.c:1316
+msgid "Go to _Today"
+msgstr "Go to _Today"
+
+#: calendar/gui/e-calendar-view.c:1318
+msgid "_Go to Date..."
+msgstr "_Go to Date..."
+
+#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+msgid "_Settings..."
+msgstr "_Settings..."
#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %d/%m/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
#: e-util/e-time-utils.c:402
msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5841,33 +5867,26 @@ msgstr "%02i minute divisions"
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view-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 "%A %d %B"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view-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 "%d %b"
#. 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 "am"
#. 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 "pm"
@@ -5876,106 +5895,98 @@ msgstr "pm"
msgid "Yes. (Complex Recurrence)"
msgstr "Yes. (Complex Recurrence)"
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:602
+#, fuzzy, c-format
msgid "Every day"
-msgstr "Every day"
-
-#: calendar/gui/e-itip-control.c:605
-#, c-format
-msgid "Every %d days"
-msgstr "Every %d days"
+msgid_plural "Every %d days"
+msgstr[0] "Every day"
+msgstr[1] "Every day"
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:607
+#, fuzzy, c-format
msgid "Every week"
-msgstr "Every week"
-
-#: calendar/gui/e-itip-control.c:613
-#, c-format
-msgid "Every %d weeks"
-msgstr "Every %d weeks"
+msgid_plural "Every %d weeks"
+msgstr[0] "Every week"
+msgstr[1] "Every week"
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:609
+#, fuzzy, c-format
msgid "Every week on "
-msgstr "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] "Every week on "
+msgstr[1] "Every week on "
-#: calendar/gui/e-itip-control.c:618
-#, c-format
-msgid "Every %d weeks on "
-msgstr "Every %d weeks on "
-
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:617
msgid " and "
msgstr " and "
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:624
#, c-format
msgid "The %s day of "
msgstr "The %s day of "
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:637
#, c-format
msgid "The %s %s of "
msgstr "The %s %s of "
-#: calendar/gui/e-itip-control.c:651
+#: calendar/gui/e-itip-control.c:644
+#, fuzzy, c-format
msgid "every month"
-msgstr "every month"
+msgid_plural "every %d months"
+msgstr[0] "every month"
+msgstr[1] "every month"
-#: calendar/gui/e-itip-control.c:656
-#, c-format
-msgid "every %d months"
-msgstr "every %d months"
-
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:648
+#, fuzzy, c-format
msgid "Every year"
-msgstr "Every year"
-
-#: calendar/gui/e-itip-control.c:664
-#, c-format
-msgid "Every %d years"
-msgstr "Every %d years"
-
-#: calendar/gui/e-itip-control.c:676
-#, c-format
-msgid " a total of %d times"
-msgstr " a total of %d times"
-
-#: calendar/gui/e-itip-control.c:685
+msgid_plural "Every %d years"
+msgstr[0] "Every year"
+msgstr[1] "Every year"
+
+#: calendar/gui/e-itip-control.c:659
+#, fuzzy, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] " a total of %d times"
+msgstr[1] " a total of %d times"
+
+#: calendar/gui/e-itip-control.c:668
msgid ", ending on "
msgstr ", ending on "
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:692
msgid "<b>Starts:</b> "
msgstr "<b>Starts:</b> "
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:702
msgid "<b>Ends:</b> "
msgstr "<b>Ends:</b> "
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/e-itip-control.c:722
msgid "<b>Completed:</b> "
msgstr "<b>Completed:</b> "
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:732
msgid "<b>Due:</b> "
msgstr "<b>Due:</b> "
-#: 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 "iCalendar Information"
#. Title
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:784
msgid "iCalendar Error"
msgstr "iCalendar Error"
-#: 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 "An unknown person"
#. 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."
@@ -5983,314 +5994,314 @@ msgstr ""
"<br> Please review the following information, and then select an action from "
"the menu below."
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:919
msgid "<i>None</i>"
msgstr "<i>None</i>"
-#: calendar/gui/e-itip-control.c:947
+#: calendar/gui/e-itip-control.c:930
msgid "Location:"
msgstr "Location:"
#. 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 "Status:"
-#: 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 "Accepted"
-#: 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 "Tentatively Accepted"
-#: 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 "Declined"
-#: 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 "Choose an action:"
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1017
msgid "Update"
msgstr "Update"
-#: 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 "OK"
-#: calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1045
msgid "Accept"
msgstr "Accept"
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1046
msgid "Tentatively accept"
msgstr "Tentatively accept"
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1047
msgid "Decline"
msgstr "Decline"
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1071
msgid "Send Free/Busy Information"
msgstr "Send Free/Busy Information"
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1084
msgid "Update respondent status"
msgstr "Update respondent status"
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1097
msgid "Send Latest Information"
msgstr "Send Latest Information"
-#: 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
+#: 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 "Cancel"
-#: 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 "<b>%s</b> has published meeting information."
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1187
msgid "Meeting Information"
msgstr "Meeting Information"
-#: 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 "<b>%s</b> requests the presence of %s at a meeting."
-#: 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 "<b>%s</b> requests your presence at a meeting."
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1195
msgid "Meeting Proposal"
msgstr "Meeting Proposal"
-#: 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 "<b>%s</b> wishes to add to an existing meeting."
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1200
msgid "Meeting Update"
msgstr "Meeting Update"
-#: 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 "<b>%s</b> wishes to receive the latest meeting information."
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1205
msgid "Meeting Update Request"
msgstr "Meeting Update Request"
-#: 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 "<b>%s</b> has replied to a meeting request."
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1213
msgid "Meeting Reply"
msgstr "Meeting Reply"
-#: 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 "<b>%s</b> has cancelled a meeting."
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1221
msgid "Meeting Cancellation"
msgstr "Meeting Cancellation"
-#: 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 "<b>%s</b> has sent an unintelligible message."
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1229
msgid "Bad Meeting Message"
msgstr "Bad Meeting Message"
-#: 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 "<b>%s</b> has published task information."
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1255
msgid "Task Information"
msgstr "Task Information"
-#: 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 "<b>%s</b> requests %s to perform a task."
-#: 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 "<b>%s</b> requests you perform a task."
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1263
msgid "Task Proposal"
msgstr "Task Proposal"
-#: 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 "<b>%s</b> wishes to add to an existing task."
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1268
msgid "Task Update"
msgstr "Task Update"
-#: 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 "<b>%s</b> wishes to receive the latest task information."
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1273
msgid "Task Update Request"
msgstr "Task Update Request"
-#: 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 "<b>%s</b> has replied to a task assignment."
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1281
msgid "Task Reply"
msgstr "Task Reply"
-#: 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 "<b>%s</b> has cancelled a task."
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1289
msgid "Task Cancellation"
msgstr "Task Cancellation"
-#: calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1297
msgid "Bad Task Message"
msgstr "Bad Task Message"
-#: 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 "<b>%s</b> has published free/busy information."
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1317
msgid "Free/Busy Information"
msgstr "Free/Busy Information"
-#: 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 "<b>%s</b> requests your free/busy information."
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1322
msgid "Free/Busy Request"
msgstr "Free/Busy Request"
-#: 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 "<b>%s</b> has replied to a free/busy request."
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1327
msgid "Free/Busy Reply"
msgstr "Free/Busy Reply"
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1332
msgid "Bad Free/Busy Message"
msgstr "Bad Free/Busy Message"
-#: 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 "The message does not appear to be properly formed"
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1466
msgid "The message contains only unsupported requests."
msgstr "The message contains only unsupported requests."
-#: 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 "The attachment does not contain a valid calendar message"
-#: calendar/gui/e-itip-control.c:1544
+#: calendar/gui/e-itip-control.c:1527
msgid "The attachment has no viewable calendar items"
msgstr "The attachment has no viewable calendar items"
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1758
msgid "Calendar file could not be updated!\n"
msgstr "Calendar file could not be updated!\n"
-#: calendar/gui/e-itip-control.c:1777
+#: calendar/gui/e-itip-control.c:1760
msgid "Update complete\n"
msgstr "Update complete\n"
-#: 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 "Attendee status can not be updated because the item no longer exists"
-#: 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 "Object is invalid and cannot be updated\n"
-#: 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 "This response is not from a current attendee. Add as an attendee?"
-#: 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 "Attendee status could not be updated because of an invalid status!\n"
-#: 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 "There was an error on the CORBA system\n"
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1850
msgid "Object could not be found\n"
msgstr "Object could not be found\n"
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1853
msgid "You don't have the right permissions to update the calendar\n"
msgstr "You don't have the right permissions to update the calendar\n"
-#: calendar/gui/e-itip-control.c:1873
+#: calendar/gui/e-itip-control.c:1856
msgid "Attendee status updated\n"
msgstr "Attendee status updated\n"
-#: calendar/gui/e-itip-control.c:1876
+#: calendar/gui/e-itip-control.c:1859
msgid "Attendee status could not be updated!\n"
msgstr "Attendee status could not be updated!\n"
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1890
msgid "Removal Complete"
msgstr "Removal Complete"
-#: 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 "Item sent!\n"
-#: 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 "The item could not be sent!\n"
@@ -6416,10 +6427,6 @@ msgstr "%A, %B %d, %Y"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
#: calendar/gui/e-meeting-time-sel-item.c:456
#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6428,12 +6435,8 @@ msgstr "%a %d/%m/%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
msgid "%m/%d/%Y"
msgstr "%d/%m/%Y"
@@ -6515,12 +6518,12 @@ msgstr "Priority:"
msgid "Web Page:"
msgstr "Web Page:"
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2194
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
#, c-format
msgid "Click to open %s"
msgstr "Click to open %s"
-#: 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"
@@ -6530,7 +6533,7 @@ msgstr ""
" %s"
#. 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"
@@ -6541,12 +6544,12 @@ msgstr ""
"%s\n"
" has crashed."
-#: calendar/gui/e-tasks.c:868
+#: calendar/gui/e-tasks.c:872
#, c-format
msgid "Opening tasks at %s"
msgstr "Opening tasks at %s"
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:893
#, c-format
msgid ""
"Error opening %s:\n"
@@ -6555,49 +6558,54 @@ msgstr ""
"Error opening %s:\n"
"%s"
-#: calendar/gui/e-tasks.c:908
+#: calendar/gui/e-tasks.c:912
msgid "Loading tasks"
msgstr "Loading tasks"
-#: calendar/gui/e-tasks.c:1010
+#: calendar/gui/e-tasks.c:1014
msgid "Completing tasks..."
msgstr "Completing tasks..."
-#: calendar/gui/e-tasks.c:1033
+#: calendar/gui/e-tasks.c:1037
msgid "Deleting selected objects..."
msgstr "Deleting selected objects..."
-#: calendar/gui/e-tasks.c:1058
+#: calendar/gui/e-tasks.c:1063
msgid "Expunging"
msgstr "Expunging"
-#: calendar/gui/gnome-cal.c:1751
-#, c-format
-msgid "Loading tasks at %s"
-msgstr "Loading tasks at %s"
-
-#: calendar/gui/gnome-cal.c:1763
+#: calendar/gui/gnome-cal.c:1760
#, c-format
msgid "Loading appointments at %s"
msgstr "Loading appointments at %s"
-#: calendar/gui/gnome-cal.c:1796
+#: calendar/gui/gnome-cal.c:1779
+#, c-format
+msgid "Loading tasks at %s"
+msgstr "Loading tasks at %s"
+
+#: calendar/gui/gnome-cal.c:1799
#, c-format
msgid "Opening %s"
msgstr "Opening %s"
-#: calendar/gui/gnome-cal.c:1945
-#, c-format
-msgid ""
+#: calendar/gui/gnome-cal.c:1928
+#, fuzzy, c-format
+msgid "The calendar backend for '%s' has crashed."
+msgstr ""
"The calendar backend for\n"
"%s\n"
" has crashed."
+
+#: calendar/gui/gnome-cal.c:1940
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
msgstr ""
-"The calendar backend for\n"
+"The task backend for\n"
"%s\n"
" has crashed."
-#: calendar/gui/gnome-cal.c:2799
+#: calendar/gui/gnome-cal.c:2754
msgid "Purging"
msgstr "Purging"
@@ -6618,44 +6626,46 @@ msgid "February"
msgstr "February"
#: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Go To Date"
-
-#: calendar/gui/goto-dialog.glade.h:6
msgid "January"
msgstr "January"
-#: calendar/gui/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:6
msgid "July"
msgstr "July"
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
msgid "June"
msgstr "June"
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
msgid "March"
msgstr "March"
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
msgid "May"
msgstr "May"
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
msgid "November"
msgstr "November"
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
msgid "October"
msgstr "October"
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Select all text"
+
#: calendar/gui/goto-dialog.glade.h:13
msgid "September"
msgstr "September"
#: calendar/gui/goto-dialog.glade.h:14
-msgid "_Go To Today"
-msgstr "_Go To Today"
+#, fuzzy
+msgid "_Select Today"
+msgstr "Select folder"
#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
#: calendar/gui/itip-utils.c:351
@@ -6745,7 +6755,7 @@ msgid "Birthdays & Anniversaries"
msgstr "Birthdays & Anniversaries"
#. 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 "On The Web"
@@ -6902,81 +6912,81 @@ msgid "Sa"
msgstr "Sa"
#. Day
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1914
msgid "Selected day (%a %b %d %Y)"
msgstr "Selected day (%a %b %d %Y)"
-#: 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 "%a %b %d"
-#: calendar/gui/print.c:1941
+#: calendar/gui/print.c:1940
msgid "%a %d %Y"
msgstr "%a %d %Y"
-#: 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 "%a %b %d %Y"
-#: calendar/gui/print.c:1952
+#: calendar/gui/print.c:1951
#, c-format
msgid "Selected week (%s - %s)"
msgstr "Selected week (%s - %s)"
#. Month
-#: calendar/gui/print.c:1960
+#: calendar/gui/print.c:1959
msgid "Selected month (%b %Y)"
msgstr "Selected month (%b %Y)"
#. Year
-#: calendar/gui/print.c:1967
+#: calendar/gui/print.c:1966
msgid "Selected year (%Y)"
msgstr "Selected year (%Y)"
-#: calendar/gui/print.c:2298
+#: calendar/gui/print.c:2297
msgid "Task"
msgstr "Task"
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: calendar/gui/print.c:2374
+#: calendar/gui/print.c:2373
#, c-format
msgid "Priority: %s"
msgstr "Priority: %s"
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2385
#, c-format
msgid "Percent Complete: %i"
msgstr "Percent Complete: %i"
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2397
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2411
#, c-format
msgid "Categories: %s"
msgstr "Categories: %s"
-#: calendar/gui/print.c:2423
+#: calendar/gui/print.c:2422
msgid "Contacts: "
msgstr "Contacts: "
-#: 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 "Print Preview"
-#: calendar/gui/print.c:2594
+#: calendar/gui/print.c:2593
msgid "Print Item"
msgstr "Print Item"
-#: calendar/gui/print.c:2760
+#: calendar/gui/print.c:2759
msgid "Print Setup"
msgstr "Print Setup"
@@ -6985,36 +6995,36 @@ msgstr "Print Setup"
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr "Task List '%s' will be removed. Are you sure you want to continue?"
-#: calendar/gui/tasks-component.c:558
+#: calendar/gui/tasks-component.c:560
msgid "New task"
msgstr "New task"
-#: calendar/gui/tasks-component.c:559
+#: calendar/gui/tasks-component.c:561
msgid "_Task"
msgstr "_Task"
-#: calendar/gui/tasks-component.c:560
+#: calendar/gui/tasks-component.c:562
msgid "Create a new task"
msgstr "Create a new task"
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:567
msgid "New task list"
msgstr "New task list"
-#: calendar/gui/tasks-component.c:566
+#: calendar/gui/tasks-component.c:568
msgid "_Task List"
msgstr "_Task List"
-#: calendar/gui/tasks-component.c:567
+#: calendar/gui/tasks-component.c:569
msgid "Create a new task list"
msgstr "Create a new task list"
-#: 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 "Unable to open the task list '%s' for creating events and meetings"
-#: calendar/gui/tasks-component.c:646
+#: calendar/gui/tasks-component.c:648
msgid "There is no calendar available for creating tasks"
msgstr "There is no calendar available for creating tasks"
@@ -8657,7 +8667,7 @@ msgstr "Unable to create cache path"
msgid "Could not remove cache entry: %s: %s"
msgstr "Could not remove cache entry: %s: %s"
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -8668,7 +8678,7 @@ msgstr ""
"Further operations on this server will not be replayed when you\n"
"reconnect to the network."
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
#, c-format
msgid ""
"Could not open `%s':\n"
@@ -8679,7 +8689,7 @@ msgstr ""
"%s\n"
"Changes made to this folder will not be resynchronized."
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
msgid "Resynchronizing with server"
msgstr "Resynchronizing with server"
@@ -8696,7 +8706,7 @@ msgstr "Downloading new messages for offline mode"
msgid "Preparing folder '%s' for offline"
msgstr "Preparing folder '%s' for offline"
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:377
msgid "You must be working online to complete this operation"
msgstr "You must be working online to complete this operation"
@@ -8811,30 +8821,34 @@ msgstr "(match-all) requires a single bool result"
msgid "Performing query on unknown header: %s"
msgstr "Performing query on unknown header: %s"
-#: camel/camel-folder.c:584
+#: camel/camel-folder.c:586
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "Unsupported operation: append message: for %s"
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1177
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "Unsupported operation: search by expression: for %s"
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1217
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr "Unsupported operation: search by uids: for %s"
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
msgid "Moving messages"
msgstr "Moving messages"
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1335
msgid "Copying messages"
msgstr "Copying messages"
-#: 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
msgid "Filtering new message(s)"
msgstr "Filtering new message(s)"
@@ -8868,7 +8882,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 "Cancelled."
@@ -9244,7 +9259,7 @@ msgstr "The referenced credentials have expired."
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1197
msgid "Bad authentication response from server."
msgstr "Bad authentication response from server."
@@ -9439,7 +9454,7 @@ msgstr "Processing error"
msgid "Signer: %s <%s>: %s\n"
msgstr "Signer: %s <%s>: %s\n"
-#: camel/camel-store.c:212
+#: camel/camel-store.c:214
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Cannot get folder: Invalid operation on this store"
@@ -9448,20 +9463,21 @@ msgstr "Cannot get folder: Invalid operation on this store"
msgid "Cannot create folder `%s': folder exists"
msgstr "Cannot create folder `%s': folder exists"
-#: camel/camel-store.c:297
+#: camel/camel-store.c:295
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Cannot create folder: Invalid operation on this store"
-#: camel/camel-store.c:381 camel/camel-vee-store.c:354
+#: camel/camel-store.c:379 camel/camel-vee-store.c:354
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Cannot delete folder: %s: Invalid operation"
-#: camel/camel-store.c:779 mail/mail-ops.c:1126
+#: camel/camel-store.c:793 mail/mail-ops.c:1079
msgid "Trash"
msgstr "Trash"
-#: camel/camel-store.c:781 filter/libfilter-i18n.h:35 mail/mail-ops.c:1130
+#: 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 "Junk"
@@ -9735,51 +9751,52 @@ msgstr "Apply filters to new messages in Inbox on this server"
msgid "Automatically synchronize remote mail locally"
msgstr "Automatically synchronize remote mail locally"
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "LDAP Server Name:"
-msgstr "LDAP Server Name:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "Address Book"
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Search base:"
-msgstr "Search base:"
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:80
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
msgid "For accessing Novell Groupwise servers"
msgstr "For accessing Novell Groupwise servers"
-#: 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 "Password"
-#: 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 ""
"This option will connect to the IMAP server using a plaintext password."
-#: 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 "Checklist"
#: 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:2912
+#: camel/providers/imap/camel-imap-store.c:3024
msgid "Operation cancelled"
msgstr "Operation cancelled"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:2915
+#: camel/providers/imap/camel-imap-store.c:3027
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Server unexpectedly disconnected: %s"
@@ -9837,12 +9854,12 @@ msgstr "Folder was destroyed and recreated on server."
msgid "Scanning for changed messages"
msgstr "Scanning for changed messages"
-#: camel/providers/imap/camel-imap-folder.c:1917
+#: camel/providers/imap/camel-imap-folder.c:1924
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "Unable to retrieve message: %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
@@ -9858,25 +9875,25 @@ msgstr ""
"Cannot 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 "No such message"
-#: 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 "This message is not currently available"
-#: 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 "Fetching summary information for new messages"
-#: 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 "Could not find message body in FETCH response."
@@ -9947,18 +9964,18 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "For reading and storing mail on IMAP servers."
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:424
#, c-format
msgid "IMAP server %s"
msgstr "IMAP server %s"
-#: 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 "IMAP service for %s on %s"
-#: 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
@@ -9968,14 +9985,14 @@ msgstr "IMAP service for %s on %s"
msgid "Could not connect to %s (port %d): %s"
msgstr "Could not connect to %s (port %d): %s"
-#: camel/providers/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 "SSL unavailable"
-#: 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
@@ -9983,49 +10000,49 @@ msgstr "SSL unavailable"
msgid "Connection cancelled"
msgstr "Connection cancelled"
-#: 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
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-#: camel/providers/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 "SSL/TLS extension not supported."
-#: 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 "SSL negotiations failed"
-#: camel/providers/imap/camel-imap-store.c:853
+#: camel/providers/imap/camel-imap-store.c:803
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Could not connect with command \"%s\": %s"
-#: camel/providers/imap/camel-imap-store.c:1277
+#: camel/providers/imap/camel-imap-store.c:1227
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP server %s does not support requested authentication type %s"
-#: camel/providers/imap/camel-imap-store.c:1287
+#: 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 "No support for authentication type %s"
-#: camel/providers/imap/camel-imap-store.c:1310
+#: 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 "%sPlease enter the IMAP password for %s@%s"
-#: camel/providers/imap/camel-imap-store.c:1324
+#: camel/providers/imap/camel-imap-store.c:1274
msgid "You didn't enter a password."
msgstr "You didn't enter a password."
-#: camel/providers/imap/camel-imap-store.c:1353
+#: camel/providers/imap/camel-imap-store.c:1303
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10036,13 +10053,21 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1769
-#: camel/providers/imap/camel-imap-store.c:1850
+#: camel/providers/imap/camel-imap-store.c:1790
+#: camel/providers/imap/camel-imap-store.c:1884
#, c-format
msgid "No such folder %s"
msgstr "No such folder %s"
-#: camel/providers/imap/camel-imap-store.c:1791
+#: 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 ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+
+#: 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:236
@@ -10050,19 +10075,12 @@ msgstr "No such folder %s"
msgid "Cannot create folder `%s': folder exists."
msgstr "Cannot create folder `%s': folder exists."
-#: camel/providers/imap/camel-imap-store.c:2051
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:2063
+#: camel/providers/imap/camel-imap-store.c:2102
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Unknown parent folder: %s"
-#: camel/providers/imap/camel-imap-store.c:2099
+#: camel/providers/imap/camel-imap-store.c:2152
msgid "The parent folder is not allowed to contain subfolders"
msgstr "The parent folder is not allowed to contain subfolders"
@@ -10097,20 +10115,20 @@ msgid "Index message body data"
msgstr "Index message body data"
#. $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 "~%s (%s)"
#. /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
#, c-format
msgid "mailbox:%s (%s)"
msgstr "mailbox:%s (%s)"
#. 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 "%s (%s)"
@@ -10170,7 +10188,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"
@@ -10219,8 +10237,8 @@ msgstr "Could not delete folder summary file `%s': %s"
msgid "Could not delete folder index file `%s': %s"
msgstr "Could not delete folder index file `%s': %s"
-#: 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
#, c-format
msgid "Could not delete folder meta file `%s': %s"
msgstr "Could not delete folder meta file `%s': %s"
@@ -10285,28 +10303,28 @@ msgstr "Could not delete folder `%s': %s"
msgid "not a maildir directory"
msgstr "not a maildir directory"
-#: camel/providers/local/camel-maildir-store.c:377
+#: 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 "Could not scan folder `%s': %s"
-#: 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 "Cannot 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 "Checking folder consistency"
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
msgid "Checking for new messages"
msgstr "Checking for new messages"
-#: 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
@@ -10354,7 +10372,7 @@ msgid "Message construction failed: Corrupt mailbox?"
msgstr "Message construction failed: Corrupt mailbox?"
#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:362
msgid "Cannot create a folder by this name."
msgstr "Cannot create a folder by this name."
@@ -10384,30 +10402,30 @@ msgstr "`%s' is not a regular file."
msgid "Folder `%s' is not empty. Not deleted."
msgstr "Folder `%s' is not empty. Not deleted."
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:375
#, c-format
msgid "Cannot create directory `%s': %s."
msgstr "Cannot create directory `%s': %s."
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:389
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Cannot create folder: %s: %s"
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:391
msgid "Folder already exists"
msgstr "Folder already exists"
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:473
msgid "The new folder name is illegal."
msgstr "The new folder name is illegal."
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:486
#, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "Could not rename `%s': `%s': %s"
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:561
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Could not rename '%s' to %s: %s"
@@ -10451,7 +10469,7 @@ msgstr "Could not close source folder %s: %s"
msgid "Could not close temp folder: %s"
msgstr "Could not close temp folder: %s"
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2343
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
#, c-format
msgid "Could not rename folder: %s"
msgstr "Could not rename folder: %s"
@@ -10781,46 +10799,46 @@ msgstr "You cannot rename a folder in a News store."
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "You cannot remove a folder in a News store: unsubscribe instead."
-#: camel/providers/nntp/camel-nntp-summary.c:247
+#: camel/providers/nntp/camel-nntp-summary.c:253
#, c-format
msgid "Connection error: %s"
msgstr "Connection error: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:258
+#: camel/providers/nntp/camel-nntp-summary.c:262
#, c-format
msgid "No such folder: %s"
msgstr "No such folder: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:264
+#: camel/providers/nntp/camel-nntp-summary.c:268
#, c-format
msgid "Could not get group: %s"
msgstr "Could not get group: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:329
+#: camel/providers/nntp/camel-nntp-summary.c:333
msgid "Could not get messages: unspecificed error"
msgstr "Could not get messages: unspecificed error"
-#: camel/providers/nntp/camel-nntp-summary.c:374
+#: camel/providers/nntp/camel-nntp-summary.c:378
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP Command failed: %s"
-#: 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 "%s: Scanning new messages"
-#: camel/providers/nntp/camel-nntp-summary.c:554
+#: camel/providers/nntp/camel-nntp-summary.c:558
#, c-format
msgid "Unknown server response: %s"
msgstr "Unknown server response: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:601
+#: camel/providers/nntp/camel-nntp-summary.c:605
msgid "Use cancel"
msgstr "Use cancel"
-#: camel/providers/nntp/camel-nntp-summary.c:603
+#: camel/providers/nntp/camel-nntp-summary.c:607
#, c-format
msgid "Operation failed: %s"
msgstr "Operation failed: %s"
@@ -10867,7 +10885,7 @@ msgstr "Delete after %s day(s)"
msgid "Disable support for all POP3 extensions"
msgstr "Disable support for all POP3 extensions"
-#: 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 "POP"
@@ -10956,7 +10974,7 @@ msgid "No such folder `%s'."
msgstr "No such folder `%s'."
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:129
msgid "Sendmail"
msgstr "Sendmail"
@@ -11010,12 +11028,13 @@ msgstr "sendmail"
msgid "Mail delivery via the sendmail program"
msgstr "Mail delivery via the sendmail program"
-#: 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 "SMTP"
#: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "For delivering mail by connecting to a remote mailhub using SMTP.\n"
#: camel/providers/smtp/camel-smtp-transport.c:174
@@ -11133,13 +11152,14 @@ msgid "server does not appear to support SSL"
msgstr "server does not appear to support SSL"
#: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "STARTTLS request timed out: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP command failed: %s"
#: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "STARTTLS response error"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP command failed: %s"
#: camel/providers/smtp/camel-smtp-transport.c:476
#, c-format
@@ -11173,153 +11193,157 @@ msgid "SMTP mail delivery via %s"
msgstr "SMTP mail delivery via %s"
#: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Cannot send message: no recipients defined."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
msgid "Cannot send message: sender address not valid."
msgstr "Cannot send message: sender address not valid."
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:612
+#: camel/providers/smtp/camel-smtp-transport.c:696
msgid "Sending message"
msgstr "Sending message"
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
msgid "Cannot send message: no recipients defined."
msgstr "Cannot send message: no recipients defined."
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:722
msgid "Cannot send message: one or more invalid recipients"
msgstr "Cannot send message: one or more invalid recipients"
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:894
msgid "SMTP Greeting"
msgstr "SMTP Greeting"
-#: camel/providers/smtp/camel-smtp-transport.c:934
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "HELO request timed out: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:956
-msgid "HELO response error"
-msgstr "HELO response error"
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1026
msgid "SMTP Authentication"
msgstr "SMTP Authentication"
-#: camel/providers/smtp/camel-smtp-transport.c:1028
+#: camel/providers/smtp/camel-smtp-transport.c:1032
msgid "Error creating SASL authentication object."
msgstr "Error creating SASL authentication object."
-#: camel/providers/smtp/camel-smtp-transport.c:1045
-#: camel/providers/smtp/camel-smtp-transport.c:1057
-#, c-format
-msgid "AUTH request timed out: %s"
-msgstr "AUTH request timed out: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
+#, fuzzy, c-format
+msgid "AUTH command failed: %s"
+msgstr "IMAP command failed: %s"
#: camel/providers/smtp/camel-smtp-transport.c:1066
-msgid "AUTH request failed."
-msgstr "AUTH request failed."
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1127
+#: camel/providers/smtp/camel-smtp-transport.c:1128
msgid "Bad authentication response from server.\n"
msgstr "Bad authentication response from server.\n"
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1153
+#, fuzzy, c-format
+msgid "MAIL FROM command failed: %s: mail not sent"
msgstr "MAIL FROM request timed out: %s: mail not sent"
-#: camel/providers/smtp/camel-smtp-transport.c:1172
-msgid "MAIL FROM response error"
-msgstr "MAIL FROM response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1196
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
msgstr "RCPT TO request timed out: %s: mail not sent"
-#: camel/providers/smtp/camel-smtp-transport.c:1218
+#: camel/providers/smtp/camel-smtp-transport.c:1213
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> failed"
-#: camel/providers/smtp/camel-smtp-transport.c:1257
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
+#, fuzzy, c-format
+msgid "DATA command failed: %s: mail not sent"
msgstr "DATA request timed out: %s: mail not sent"
#. 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"
-msgstr "DATA response error"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1318
-#: camel/providers/smtp/camel-smtp-transport.c:1341
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "DATA send timed out: message termination: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1361
-msgid "DATA termination response error"
-msgstr "DATA termination response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP command failed: %s"
#: camel/providers/smtp/camel-smtp-transport.c:1384
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "RSET request timed out: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1404
-msgid "RSET response error"
-msgstr "RSET response error"
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1427
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "QUIT request timed out: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP command failed: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1447
-msgid "QUIT response error"
-msgstr "QUIT response error"
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP command failed: %s"
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:105
#, c-format
msgid "%.0fK"
msgstr "%.0fK"
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:108
#, c-format
msgid "%.0fM"
msgstr "%.0fM"
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
#, c-format
msgid "%.0fG"
msgstr "%.0fG"
-#: 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 "attachment"
-#: 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 "Remove selected items from the attachment list"
-#: composer/e-msg-composer-attachment-bar.c:483
+#: composer/e-msg-composer-attachment-bar.c:493
msgid "Add attachment..."
msgstr "Add attachment..."
-#: composer/e-msg-composer-attachment-bar.c:484
+#: composer/e-msg-composer-attachment-bar.c:494
msgid "Attach a file to the message"
msgstr "Attach a file to the message"
-#: 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 "Cannot attach file %s: %s"
-#: 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 "Cannot attach file %s: not a regular file"
@@ -11341,19 +11365,19 @@ msgstr "MIME type:"
msgid "Suggest automatic display of attachment"
msgstr "Suggest automatic display of attachment"
-#: 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 "You need to configure an account before you can compose mail."
-#: composer/e-msg-composer-hdrs.c:507
+#: composer/e-msg-composer-hdrs.c:512
msgid "Posting destination"
msgstr "Posting destination"
-#: composer/e-msg-composer-hdrs.c:508
+#: composer/e-msg-composer-hdrs.c:513
msgid "Choose folders to post the message to."
msgstr "Choose folders to post the message to."
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:547
msgid "Click here for the address book"
msgstr "Click here for the address book"
@@ -11364,45 +11388,45 @@ msgstr "Click here for the address book"
#. * 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 "Reply-To:"
#.
#. * From
#.
-#: composer/e-msg-composer-hdrs.c:578
+#: composer/e-msg-composer-hdrs.c:583
msgid "From:"
msgstr "From:"
#.
#. * Subject
#.
-#: composer/e-msg-composer-hdrs.c:584
+#: composer/e-msg-composer-hdrs.c:589
msgid "Subject:"
msgstr "Subject:"
-#: composer/e-msg-composer-hdrs.c:593
+#: composer/e-msg-composer-hdrs.c:598
msgid "To:"
msgstr "To:"
-#: composer/e-msg-composer-hdrs.c:594
+#: composer/e-msg-composer-hdrs.c:599
msgid "Enter the recipients of the message"
msgstr "Enter the recipients of the message"
-#: composer/e-msg-composer-hdrs.c:597
+#: composer/e-msg-composer-hdrs.c:602
msgid "Cc:"
msgstr "Cc:"
-#: 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 "Enter the addresses that will receive a carbon copy of the message"
-#: composer/e-msg-composer-hdrs.c:601
+#: composer/e-msg-composer-hdrs.c:606
msgid "Bcc:"
msgstr "Bcc:"
-#: 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."
@@ -11413,11 +11437,11 @@ msgstr ""
#.
#. * Post-To
#.
-#: composer/e-msg-composer-hdrs.c:609
+#: composer/e-msg-composer-hdrs.c:614
msgid "Post To:"
msgstr "Post To:"
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:619
msgid "Click here to select folders to post to"
msgstr "Click here to select folders to post to"
@@ -11425,13 +11449,13 @@ msgstr "Click here to select folders to post to"
msgid "Attach file(s)"
msgstr "Attach file(s)"
-#: 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 ""
"Cannot sign outgoing message: No signing certificate set for from account"
-#: composer/e-msg-composer.c:658
+#: composer/e-msg-composer.c:668
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for from "
"account"
@@ -11439,7 +11463,7 @@ msgstr ""
"Cannot encrypt outgoing message: No encryption certificate set for from "
"account"
-#: composer/e-msg-composer.c:789
+#: composer/e-msg-composer.c:799
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -11448,30 +11472,30 @@ msgstr ""
"Error while reading file %s:\n"
"%s"
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1168
msgid "File exists, overwrite?"
msgstr "File exists, overwrite?"
-#: 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 "Error saving file: %s"
-#: composer/e-msg-composer.c:1212
+#: composer/e-msg-composer.c:1219
#, c-format
msgid "Error loading file: %s"
msgstr "Error loading file: %s"
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1257
#, c-format
msgid "Error accessing file: %s"
msgstr "Error accessing file: %s"
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1265
msgid "Unable to retrieve message from editor"
msgstr "Unable to retrieve message from editor"
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1272
#, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -11480,7 +11504,7 @@ msgstr ""
"Unable to seek on file: %s\n"
"%s"
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1279
#, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -11489,7 +11513,7 @@ msgstr ""
"Unable to truncate file: %s\n"
"%s"
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1288
#, c-format
msgid ""
"Unable to copy file descriptor: %s\n"
@@ -11498,7 +11522,7 @@ msgstr ""
"Unable to copy file descriptor: %s\n"
"%s"
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1297
#, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -11507,7 +11531,7 @@ msgstr ""
"Error autosaving message: %s\n"
" %s"
-#: 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?"
@@ -11515,7 +11539,7 @@ msgstr ""
"Ximian Evolution has found unsaved messages from a previous session.\n"
"Would you like to try to recover them?"
-#: composer/e-msg-composer.c:1558
+#: composer/e-msg-composer.c:1565
#, c-format
msgid ""
"The message \"%s\" has not been sent.\n"
@@ -11526,47 +11550,47 @@ msgstr ""
"\n"
"Do you wish to save your changes?"
-#: composer/e-msg-composer.c:1560
+#: composer/e-msg-composer.c:1567
msgid "Untitled Message"
msgstr "Untitled Message"
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1574
msgid "Warning: Modified Message"
msgstr "Warning: Modified Message"
-#: composer/e-msg-composer.c:1600
+#: composer/e-msg-composer.c:1607
msgid "Open file"
msgstr "Open file"
-#: composer/e-msg-composer.c:2045
-msgid "Signature:"
-msgstr "Signature:"
-
-#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
+#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
msgid "Autogenerated"
msgstr "Autogenerated"
-#: composer/e-msg-composer.c:2263
+#: composer/e-msg-composer.c:2084
+msgid "Signature:"
+msgstr "Signature:"
+
+#: composer/e-msg-composer.c:2316
#, c-format
msgid "<b>%d</b> File Attached"
msgid_plural "<b>%d</b> Files Attached"
msgstr[0] "<b>%d</b> File Attached"
msgstr[1] "<b>%d</b> Files Attached"
-#: composer/e-msg-composer.c:2292
+#: composer/e-msg-composer.c:2345
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr "Hide _Attachment Bar (drop attachments here)"
-#: 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 "Show _Attachment Bar (drop attachments here)"
-#: 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 "Compose a message"
-#: 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."
@@ -11574,7 +11598,7 @@ msgstr ""
"Could not create composer window:\n"
"Unable to activate address selector control."
-#: 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"
@@ -11586,7 +11610,7 @@ msgstr ""
"Please make sure you have the correct version\n"
"of gtkhtml and libgtkhtml installed.\n"
-#: 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."
@@ -11594,7 +11618,7 @@ msgstr ""
"Could not create composer window:\n"
"Unable to activate HTML editor component."
-#: composer/e-msg-composer.c:4234
+#: composer/e-msg-composer.c:4290
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -11752,16 +11776,12 @@ msgstr "Sync Categories:"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %d/%m/%Y %I:%M %p"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %d/%m/%Y %H:%M"
@@ -11813,33 +11833,25 @@ msgid "%m/%d/%Y %H"
msgstr "%d/%m/%Y %H"
#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. strptime format for time of day, without seconds,
#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
msgid "%H:%M"
msgstr "%H:%M"
@@ -11848,118 +11860,106 @@ msgstr "%H:%M"
msgid "%I %p"
msgstr "%I %p"
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
msgid "1 second ago"
-msgstr "1 second ago"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "%d seconds ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "1 second ago"
+msgstr[1] "1 second ago"
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
msgid "1 minute ago"
-msgstr "1 minute ago"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "%d minutes ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 minute ago"
+msgstr[1] "1 minute ago"
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
msgid "1 hour ago"
-msgstr "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "1 hour ago"
+msgstr[1] "1 hour ago"
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "%d hours ago"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
msgid "1 day ago"
-msgstr "1 day ago"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "%d days ago"
+msgid_plural "%d days ago"
+msgstr[0] "1 day ago"
+msgstr[1] "1 day ago"
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
msgid "1 week ago"
-msgstr "1 week ago"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "%d weeks ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "1 week ago"
+msgstr[1] "1 week ago"
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
msgid "1 month ago"
-msgstr "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "1 month ago"
+msgstr[1] "1 month ago"
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "%d months ago"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
msgid "1 year ago"
-msgstr "1 year ago"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "%d years ago"
+msgid_plural "%d years ago"
+msgstr[0] "1 year ago"
+msgstr[1] "1 year ago"
-#: filter/filter-datespec.c:176
+#: filter/filter-datespec.c:187
msgid "You must choose a date."
msgstr "You must choose a date."
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:287
msgid "<click here to select a date>"
msgstr "<click here to select a date>"
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
msgid "now"
msgstr "now"
#. 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
msgid "%d-%b-%Y"
msgstr "%d-%b-%Y"
-#: filter/filter-datespec.c:406
+#: filter/filter-datespec.c:413
msgid "Select a time to compare against"
msgstr "Select a time to compare against"
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
msgstr "Filter Rules"
#: filter/filter-file.c:166
msgid "You must specify a file name."
msgstr "You must specify a file name."
-#: 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 "File '%s' does not exist or is not a regular file."
-#: filter/filter-file.c:299
+#: filter/filter-file.c:301
msgid "Choose a file"
msgstr "Choose a file"
#. and now for the action area
#: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Then"
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Due:</b> "
#: filter/filter-folder.c:153
msgid "You must specify a folder."
msgstr "You must specify a folder."
-#: 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 "Select Folder"
@@ -11973,23 +11973,23 @@ msgstr ""
"%s"
#: 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 "Important"
#. 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 "To Do"
#. 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 "Later"
-#: 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 "Test"
@@ -11997,59 +11997,63 @@ msgstr "Test"
msgid "You must name this filter."
msgstr "You must name this filter."
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:752
+#, fuzzy
+msgid "Rule name:"
msgstr "Rule name: "
-#: filter/filter-rule.c:755
+#: filter/filter-rule.c:756
msgid "Untitled"
msgstr "Untitled"
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "If"
+#: filter/filter-rule.c:779
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Due:</b> "
-#: filter/filter-rule.c:791
+#: filter/filter-rule.c:810
msgid "Execute actions"
msgstr "Execute actions"
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:814
msgid "if all criteria are met"
msgstr "if all criteria are met"
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:819
msgid "if any criteria are met"
msgstr "if any criteria are met"
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
msgid "incoming"
msgstr "incoming"
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:910
msgid "outgoing"
msgstr "outgoing"
#: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Compare against"
+msgid " "
+msgstr " "
#: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Edit Filters"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filter Rules"
#: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Edit VFolders"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vFolder Sources"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Compare against"
#: filter/filter.glade.h:5
msgid "Incoming"
msgstr "Incoming"
#: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Outgoing"
-
-#: filter/filter.glade.h:7
msgid ""
"The message's date will be compared against\n"
"12:00am of the date specified."
@@ -12057,7 +12061,7 @@ msgstr ""
"The message's date will be compared against\n"
"12:00am of the date specified."
-#: 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."
@@ -12065,7 +12069,7 @@ msgstr ""
"The message's date will be compared against\n"
"a time relative to when filtering occurs."
-#: 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."
@@ -12073,59 +12077,51 @@ msgstr ""
"The message's date will be compared against\n"
"the current time when filtering occurs."
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:112
-msgid "Virtual Folders"
-msgstr "Virtual Folders"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
msgid "a time relative to the current time"
msgstr "a time relative to the current time"
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
msgid "ago"
msgstr "ago"
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
msgid "months"
msgstr "months"
-#: 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 "seconds"
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
msgid "specific folders only"
msgstr "specific folders only"
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
msgid "the current time"
msgstr "the current time"
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
msgid "the time you specify"
msgstr "the time you specify"
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "vFolder Sources"
-
-#: filter/filter.glade.h:26
+#: filter/filter.glade.h:23
msgid "weeks"
msgstr "weeks"
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
msgid "with all active remote folders"
msgstr "with all active remote folders"
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
msgid "with all local and active remote folders"
msgstr "with all local and active remote folders"
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
msgid "with all local folders"
msgstr "with all local folders"
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
msgid "years"
msgstr "years"
@@ -12258,7 +12254,7 @@ msgstr "is not Flagged"
msgid "Junk Test"
msgstr "Junk Test"
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:791
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
#: widgets/misc/e-expander.c:189
msgid "Label"
msgstr "Label"
@@ -12288,8 +12284,9 @@ msgid "Move to Folder"
msgstr "Move to Folder"
#: filter/libfilter-i18n.h:44
-msgid "Pipe Message to Shell Command"
-msgstr "Pipe Message to Shell Command"
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Exit the program"
#: filter/libfilter-i18n.h:45
msgid "Play Sound"
@@ -12323,23 +12320,24 @@ msgstr "returns greater than"
msgid "returns less than"
msgstr "returns less than"
-#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Run program:"
+
+#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
#: mail/message-list.etspec.h:10
msgid "Score"
msgstr "Score"
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
msgid "Sender"
msgstr "Sender"
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
msgid "Set Status"
msgstr "Set Status"
-#: filter/libfilter-i18n.h:56
-msgid "Shell Command"
-msgstr "Shell Command"
-
#: filter/libfilter-i18n.h:57
msgid "Size (kB)"
msgstr "Size (kB)"
@@ -12364,9 +12362,9 @@ msgstr "starts with"
msgid "Stop Processing"
msgstr "Stop Processing"
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1481
-#: 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 "Subject"
@@ -12375,17 +12373,13 @@ msgstr "Subject"
msgid "Unset Status"
msgstr "Unset Status"
-#: 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 "Rule name '%s' is not unique, choose another."
-#: filter/rule-editor.c:172
-msgid "Rules"
-msgstr "Rules"
-
-#: filter/rule-editor.c:293
+#: filter/rule-editor.c:291
msgid "Add Rule"
msgstr "Add Rule"
@@ -12397,8 +12391,9 @@ msgstr "Edit Rule"
msgid "Rule name"
msgstr "Rule name"
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
msgstr "Score Rules"
#: filter/searchtypes.xml.h:1
@@ -12433,15 +12428,20 @@ msgstr "Subject contains"
msgid "Subject does not contain"
msgstr "Subject does not contain"
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtual Folders"
+
#: filter/vfolder-rule.c:215
msgid "You must name this vfolder."
msgstr "You must name this vfolder."
-#: filter/vfolder-rule.c:229
+#: filter/vfolder-rule.c:230
msgid "You need to to specify at least one folder as a source."
msgstr "You need to to specify at least one folder as a source."
-#: filter/vfolder-rule.c:585
+#: filter/vfolder-rule.c:587
msgid "VFolder source"
msgstr "VFolder source"
@@ -12491,8 +12491,8 @@ msgstr "Evolution Mail folder viewer"
msgid "Evolution Mail preferences control"
msgstr "Evolution Mail preferences control"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:830
-#: 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 "Mail"
@@ -12501,53 +12501,50 @@ msgstr "Mail"
msgid "Mail Accounts"
msgstr "Mail Accounts"
-#: 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 Preferences"
-#: mail/em-account-prefs.c:233
+#: mail/em-account-prefs.c:232
msgid "Are you sure you want to delete this account?"
msgstr "Are you sure you want to delete this account?"
-#: mail/em-account-prefs.c:241
+#: mail/em-account-prefs.c:240
msgid "Don't delete"
msgstr "Don't delete"
#. translators: default account indicator
-#: mail/em-account-prefs.c:439
+#: mail/em-account-prefs.c:444
msgid "[Default]"
msgstr "[Default]"
-#: mail/em-account-prefs.c:493
+#: mail/em-account-prefs.c:498
msgid "Account name"
msgstr "Account name"
-#: mail/em-account-prefs.c:495
+#: mail/em-account-prefs.c:500
msgid "Protocol"
msgstr "Protocol"
-#: 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 "Unnamed"
-#: mail/em-composer-prefs.c:337
+#: mail/em-composer-prefs.c:445
msgid "You must specify a valid script name."
msgstr "You must specify a valid script name."
-#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
-msgid "[script]"
-msgstr "[script]"
-
-#: mail/em-composer-prefs.c:880
+#: mail/em-composer-prefs.c:952
msgid "Language(s)"
msgstr "Language(s)"
-#: mail/em-composer-prefs.c:922
-msgid "Add script signature"
-msgstr "Add script signature"
+#: mail/em-composer-prefs.c:1000
+#, fuzzy
+msgid "Add signature script"
+msgstr "_Add Signature"
-#: mail/em-composer-prefs.c:942
+#: mail/em-composer-prefs.c:1020
msgid "Signature(s)"
msgstr "Signature(s)"
@@ -12604,7 +12601,7 @@ msgstr ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
-#: mail/em-folder-browser.c:137
+#: mail/em-folder-browser.c:138
msgid "Create _Virtual Folder From Search..."
msgstr "Create _Virtual Folder From Search..."
@@ -12638,8 +12635,8 @@ msgstr "<click here to select a folder>"
msgid "Create New Folder"
msgstr "Create New Folder"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2101
-#: mail/mail-component.c:629
+#: 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 "Specify where to create the folder:"
@@ -12649,281 +12646,301 @@ msgstr "Specify where to create the folder:"
msgid "Folder _name:"
msgstr "Folder _name:"
-#: mail/em-folder-tree-model.c:180 mail/em-folder-tree-model.c:182
-#: 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 "VFolders"
-#: mail/em-folder-tree-model.c:190 mail/em-folder-tree-model.c:192
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
msgid "UNMATCHED"
msgstr "UNMATCHED"
#. Inbox is always first
-#: mail/em-folder-tree-model.c:220 mail/em-folder-tree-model.c:222
+#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
msgid "Inbox"
msgstr "Inbox"
-#: mail/em-folder-tree-model.c:474 mail/em-folder-tree-model.c:759
+#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
msgid "Loading..."
msgstr "Loading..."
-#: mail/em-folder-tree.c:856
+#: mail/em-folder-tree.c:877
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Removing folder %s"
+
+#: mail/em-folder-tree.c:879
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Opening folder %s"
+
+#: mail/em-folder-tree.c:886
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Moving messages to %s"
+
+#: mail/em-folder-tree.c:888
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Copying messages to %s"
+
+#: mail/em-folder-tree.c:904
msgid "Cannot drop message(s) into toplevel store"
msgstr "Cannot drop message(s) into toplevel store"
-#: mail/em-folder-tree.c:1831
+#: mail/em-folder-tree.c:1950
#, c-format
msgid "Cannot move folder `%s': illegal operation"
msgstr "Cannot move folder `%s': illegal operation"
-#: mail/em-folder-tree.c:1860 mail/em-folder-tree.c:2036
+#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
#, c-format
msgid "%s"
msgstr "%s"
-#: mail/em-folder-tree.c:1876 mail/em-folder-tree.c:1889
-#: 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 "Select folder"
-#: mail/em-folder-tree.c:1916
+#: mail/em-folder-tree.c:2035
#, c-format
msgid "Creating folder `%s'"
msgstr "Creating folder `%s'"
-#: mail/em-folder-tree.c:2101 mail/mail-component.c:629
+#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
msgid "Create folder"
msgstr "Create folder"
-#: mail/em-folder-tree.c:2220
+#: mail/em-folder-tree.c:2347
#, c-format
msgid "Could not delete folder: %s"
msgstr "Could not delete folder: %s"
-#: mail/em-folder-tree.c:2245
+#: mail/em-folder-tree.c:2372
#, c-format
msgid "Cannot delete local %s folder."
msgstr "Cannot delete local %s folder."
-#: mail/em-folder-tree.c:2251
+#: mail/em-folder-tree.c:2378
#, c-format
msgid "Really delete folder \"%s\" and all of its subfolders?"
msgstr "Really delete folder \"%s\" and all of its subfolders?"
-#: mail/em-folder-tree.c:2261
+#: mail/em-folder-tree.c:2388
#, c-format
msgid "Delete \"%s\""
msgstr "Delete \"%s\""
-#: mail/em-folder-tree.c:2295
+#: mail/em-folder-tree.c:2422
#, c-format
msgid "Cannot rename local %s folder."
msgstr "Cannot rename local %s folder."
-#: mail/em-folder-tree.c:2304
+#: mail/em-folder-tree.c:2431
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Rename the \"%s\" folder to:"
-#: mail/em-folder-tree.c:2306
+#: mail/em-folder-tree.c:2433
msgid "Rename Folder"
msgstr "Rename Folder"
-#: mail/em-folder-tree.c:2330
+#: mail/em-folder-tree.c:2457
#, c-format
msgid "A folder named \"%s\" already exists. Please use a different name."
msgstr "A folder named \"%s\" already exists. Please use a different name."
-#: mail/em-folder-tree.c:2376 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 "_View"
-#: mail/em-folder-tree.c:2377
+#: mail/em-folder-tree.c:2504
msgid "Open in _New Window"
msgstr "Open in _New Window"
-#: mail/em-folder-tree.c:2382
+#: mail/em-folder-tree.c:2509
msgid "_Move"
msgstr "_Move"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2386
+#: mail/em-folder-tree.c:2513
msgid "_New Folder..."
msgstr "_New Folder..."
-#: mail/em-folder-tree.c:2389
+#: mail/em-folder-tree.c:2516
msgid "_Rename"
msgstr "_Rename"
-#: mail/em-folder-tree.c:2392 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
msgid "_Properties..."
msgstr "_Properties..."
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:759 mail/em-popup.c:688
+#: mail/em-folder-view.c:741 mail/em-popup.c:688
msgid "_Edit as New Message..."
msgstr "_Edit as New Message..."
-#: mail/em-folder-view.c:761
+#: mail/em-folder-view.c:743
msgid "_Print"
msgstr "_Print"
-#: mail/em-folder-view.c:764 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
msgid "_Reply to Sender"
msgstr "_Reply to Sender"
-#: mail/em-folder-view.c:765 mail/em-popup.c:808
+#: mail/em-folder-view.c:747 mail/em-popup.c:808
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "Reply to _List"
-#: mail/em-folder-view.c:766 mail/em-popup.c:809
+#: mail/em-folder-view.c:748 mail/em-popup.c:809
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "Reply to _All"
-#: mail/em-folder-view.c:767 mail/em-popup.c:811
+#: mail/em-folder-view.c:749 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:113
msgid "_Forward"
msgstr "_Forward"
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:752
msgid "Follo_w Up..."
msgstr "Follo_w Up..."
-#: mail/em-folder-view.c:771
+#: mail/em-folder-view.c:753
msgid "Fla_g Completed"
msgstr "Fla_g Completed"
-#: mail/em-folder-view.c:772
+#: mail/em-folder-view.c:754
msgid "Cl_ear Flag"
msgstr "Cl_ear Flag"
-#: mail/em-folder-view.c:775 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr "Mar_k as Read"
-#: mail/em-folder-view.c:776
+#: mail/em-folder-view.c:758
msgid "Mark as _Unread"
msgstr "Mark as _Unread"
-#: mail/em-folder-view.c:777
+#: mail/em-folder-view.c:759
msgid "Mark as _Important"
msgstr "Mark as _Important"
-#: mail/em-folder-view.c:778
+#: mail/em-folder-view.c:760
msgid "_Mark as Unimportant"
msgstr "_Mark as Unimportant"
-#: mail/em-folder-view.c:779 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
msgid "Mark as _Junk"
msgstr "Mark as _Junk"
-#: mail/em-folder-view.c:780 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
msgid "Mark as _Not Junk"
msgstr "Mark as _Not Junk"
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:766
msgid "U_ndelete"
msgstr "U_ndelete"
-#: mail/em-folder-view.c:787
+#: mail/em-folder-view.c:769
msgid "Mo_ve to Folder..."
msgstr "Mo_ve to Folder..."
-#: mail/em-folder-view.c:788 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr "_Copy to Folder..."
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:778
msgid "Add Sender to Address_book"
msgstr "Add Sender to Address_book"
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:781
msgid "Appl_y Filters"
msgstr "Appl_y Filters"
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:782
msgid "F_ilter Junk"
msgstr "F_ilter Junk"
-#: mail/em-folder-view.c:803
+#: mail/em-folder-view.c:785
msgid "Crea_te Rule From Message"
msgstr "Crea_te Rule From Message"
-#: mail/em-folder-view.c:804
+#: mail/em-folder-view.c:786
msgid "VFolder on _Subject"
msgstr "VFolder on _Subject"
-#: mail/em-folder-view.c:805
+#: mail/em-folder-view.c:787
msgid "VFolder on Se_nder"
msgstr "VFolder on Se_nder"
-#: mail/em-folder-view.c:806
+#: mail/em-folder-view.c:788
msgid "VFolder on _Recipients"
msgstr "VFolder on _Recipients"
-#: mail/em-folder-view.c:807
+#: mail/em-folder-view.c:789
msgid "VFolder on Mailing _List"
msgstr "VFolder on Mailing _List"
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:791
msgid "VFolder on Thread"
msgstr "VFolder on Thread"
-#: mail/em-folder-view.c:813
+#: mail/em-folder-view.c:795
msgid "Filter on Sub_ject"
msgstr "Filter on Sub_ject"
-#: mail/em-folder-view.c:814
+#: mail/em-folder-view.c:796
msgid "Filter on Sen_der"
msgstr "Filter on Sen_der"
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:797
msgid "Filter on Re_cipients"
msgstr "Filter on Re_cipients"
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:798
msgid "Filter on _Mailing List"
msgstr "Filter on _Mailing List"
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:800
msgid "Filter on Thread"
msgstr "Filter on Thread"
#. default charset used in mail view
-#: mail/em-folder-view.c:1601 mail/em-folder-view.c:1639
-#: 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 "Default"
-#: mail/em-folder-view.c:1675
+#: mail/em-folder-view.c:1657
msgid "Print Message"
msgstr "Print Message"
-#: mail/em-folder-view.c:1922
+#: mail/em-folder-view.c:1904
msgid "_Copy Link Location"
msgstr "_Copy Link Location"
-#: mail/em-folder-view.c:2189
+#: mail/em-folder-view.c:2168
#, c-format
msgid "Click to mail %s"
msgstr "Click to mail %s"
#. 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 "Matches: %d"
-#: 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 "Unsigned"
-#: 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."
@@ -12931,11 +12948,11 @@ msgstr ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-#: 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 "Valid signature"
-#: 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."
@@ -12943,11 +12960,11 @@ msgstr ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
-#: 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 "Invalid signature"
-#: 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."
@@ -12955,11 +12972,11 @@ msgstr ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
-#: 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 "Valid signature, cannot verify sender"
-#: 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."
@@ -12967,11 +12984,11 @@ msgstr ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
-#: 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 "Unencrypted"
-#: 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."
@@ -12979,11 +12996,11 @@ msgstr ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
-#: 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 "Encrypted, weak"
-#: 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 "
@@ -12993,11 +13010,11 @@ msgstr ""
"be difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
-#: 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 "Encrypted"
-#: 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."
@@ -13005,11 +13022,11 @@ msgstr ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
-#: 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 "Encrypted, strong"
-#: 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 "
@@ -13019,31 +13036,31 @@ msgstr ""
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
-#: mail/em-format-html-display.c:734
+#: mail/em-format-html-display.c:741
msgid "_View Certificate"
msgstr "_View Certificate"
-#: mail/em-format-html-display.c:739
+#: mail/em-format-html-display.c:746
msgid "This certificate is not viewable"
msgstr "This certificate is not viewable"
-#: mail/em-format-html-display.c:972
+#: mail/em-format-html-display.c:979
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Completed on %B %d, %Y, %l:%M %p"
-#: mail/em-format-html-display.c:980
+#: mail/em-format-html-display.c:987
msgid "Overdue:"
msgstr "Overdue:"
-#: mail/em-format-html-display.c:983
+#: mail/em-format-html-display.c:990
msgid "by %B %d, %Y, %l:%M %p"
msgstr "by %B %d, %Y, %l:%M %p"
-#: mail/em-format-html-display.c:1053
+#: mail/em-format-html-display.c:1060
msgid "_View Inline"
msgstr "_View Inline"
-#: mail/em-format-html-display.c:1054
+#: mail/em-format-html-display.c:1061
msgid "_Hide"
msgstr "_Hide"
@@ -13052,124 +13069,158 @@ msgstr "_Hide"
msgid "Page %d of %d"
msgstr "Page %d of %d"
-#: 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 "Retrieving `%s'"
-#: mail/em-format-html.c:812
+#: mail/em-format-html.c:840
msgid "Malformed external-body part."
msgstr "Malformed external-body part."
-#: mail/em-format-html.c:842
+#: mail/em-format-html.c:870
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Pointer to FTP site (%s)"
-#: 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 "Pointer to local file (%s) valid at site \"%s\""
-#: mail/em-format-html.c:855
+#: mail/em-format-html.c:883
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Pointer to local file (%s)"
-#: mail/em-format-html.c:876
+#: mail/em-format-html.c:904
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "Pointer to remote data (%s)"
-#: mail/em-format-html.c:887
+#: mail/em-format-html.c:915
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Pointer to unknown external data (\"%s\" type)"
-#: mail/em-format-html.c:1098
+#: mail/em-format-html.c:1157
msgid "Formatting message"
msgstr "Formatting 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 "From"
-#: 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 "Reply-To"
-#: 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 "To"
-#: 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 "Cc"
-#: 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 "Bcc"
#. pseudo-header
-#: mail/em-format-html.c:1485 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:729
+#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:771
msgid "Mailer"
msgstr "Mailer"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1512
+#: mail/em-format-html.c:1569
msgid "<I> (%a, %R %Z)</I>"
msgstr "<I> (%a, %R %Z)</I>"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1515
+#: mail/em-format-html.c:1572
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: mail/em-format-html.c:1525 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 "Date"
-#: 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 "%s attachment"
-#: 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 "Could not parse S/MIME message: Unknown error"
-#: 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
+#, fuzzy, c-format
+msgid "Internal error: expecting CamelMultipart, got \"%s\""
+msgstr "Internal error: uid in invalid format: %s"
+
+#: mail/em-format.c:1178
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "Unsupported encryption type for multipart/encrypted"
-#: mail/em-format.c:1297
+#: mail/em-format.c:1325
msgid "Could not parse MIME message. Displaying as source."
msgstr "Could not parse MIME message. Displaying as source."
-#: mail/em-format.c:1316
+#: mail/em-format.c:1344
msgid "Unsupported signature format"
msgstr "Unsupported signature format"
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
msgid "Error verifying signature"
msgstr "Error verifying signature"
-#: mail/em-format.c:1324
+#: mail/em-format.c:1352
msgid "Unknown error verifying signature"
msgstr "Unknown error verifying signature"
+#: mail/em-format.c:1372
+#, fuzzy, c-format
+msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+msgstr "Internal error: uid in invalid format: %s"
+
#: mail/em-junk-filter.c:82
msgid "Spamassassin (built-in)"
msgstr "Spamassassin (built-in)"
+#: mail/em-mailer-prefs.c:85
+#, fuzzy
+msgid "Every time"
+msgstr "Every year"
+
+#: mail/em-mailer-prefs.c:86
+msgid "Once per day"
+msgstr ""
+
+#: mail/em-mailer-prefs.c:87
+#, fuzzy
+msgid "Once per week"
+msgstr "Every week"
+
+#: mail/em-mailer-prefs.c:88
+#, fuzzy
+msgid "Once per month"
+msgstr "every month"
+
#: mail/em-migrate.c:1079
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
@@ -13182,22 +13233,22 @@ msgstr ""
"\n"
"Please be patient while Evolution migrates your folders..."
-#: mail/em-migrate.c:1843 mail/em-migrate.c:1858
+#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
#, c-format
msgid "Failed to migrate pop3 uid caches: %s"
msgstr "Failed to migrate pop3 uid caches: %s"
-#: mail/em-migrate.c:1946 mail/em-migrate.c:2047
+#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
#, c-format
msgid "Failed to migrate folder expand state: %s"
msgstr "Failed to migrate folder expand state: %s"
-#: mail/em-migrate.c:2171 mail/em-migrate.c:2343
+#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
#, c-format
msgid "Failed to create directory `%s': %s"
msgstr "Failed to create directory `%s': %s"
-#: mail/em-migrate.c:2183
+#: mail/em-migrate.c:2185
#, c-format
msgid "Failed to open store for `%s': %s"
msgstr "Failed to open store for `%s': %s"
@@ -13236,32 +13287,32 @@ msgstr "_Add to Addressbook"
msgid "Open in %s..."
msgstr "Open in %s..."
-#: 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 "This store does not support subscriptions, or they are not enabled."
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:633
msgid "Subscribed"
msgstr "Subscribed"
-#: 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 "Folder"
#. 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 "Please select a server."
-#: mail/em-subscribe-editor.c:848
+#: mail/em-subscribe-editor.c:871
msgid "No server has been selected"
msgstr "No server has been selected"
-#: mail/em-utils.c:97
+#: mail/em-utils.c:100
msgid "Don't show this message again."
msgstr "Don't show this message again."
-#: mail/em-utils.c:279
+#: mail/em-utils.c:282
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -13270,25 +13321,25 @@ msgstr ""
"Error loading filter information:\n"
"%s"
-#: mail/em-utils.c:288
+#: mail/em-utils.c:291
msgid "Filters"
msgstr "Filters"
-#: mail/em-utils.c:533
+#: mail/em-utils.c:536
msgid "-------- Forwarded Message --------"
msgstr "-------- Forwarded Message --------"
-#: mail/em-utils.c:1139
+#: mail/em-utils.c:1142
msgid "an unknown sender"
msgstr "an unknown sender"
#. translators: attribution string used when quoting messages,
#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1149
+#: mail/em-utils.c:1152
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
-#: 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
#, c-format
msgid ""
"Cannot save to `%s'\n"
@@ -13297,7 +13348,7 @@ msgstr ""
"Cannot save to `%s'\n"
" %s"
-#: mail/em-utils.c:1431
+#: mail/em-utils.c:1440
#, c-format
msgid ""
"`%s' already exists.\n"
@@ -13306,35 +13357,35 @@ msgstr ""
"`%s' already exists.\n"
"Overwrite it?"
-#: mail/em-utils.c:1474
+#: mail/em-utils.c:1483
msgid "message"
msgstr "message"
-#: mail/em-utils.c:1526
+#: mail/em-utils.c:1535
#, c-format
msgid "Error: '%s' exists and is not a regular file"
msgstr "Error: '%s' exists and is not a regular file"
-#: mail/em-utils.c:1580
+#: mail/em-utils.c:1589
msgid "Save Message..."
msgstr "Save Message..."
-#: mail/em-utils.c:1618
+#: mail/em-utils.c:1638
msgid "Add address"
msgstr "Add address"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2052
+#: mail/em-utils.c:2073
#, c-format
msgid "Messages from %s"
msgstr "Messages from %s"
-#: mail/em-utils.c:2103
+#: mail/em-utils.c:2124
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "Could not create temporary directory: %s"
-#: mail/em-utils.c:2434
+#: mail/em-utils.c:2455
#, c-format
msgid ""
"This operation will permanently remove all deleted messages in the folder `%"
@@ -13347,7 +13398,7 @@ msgstr ""
"\n"
"Really erase these messages?"
-#: 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"
@@ -13416,46 +13467,56 @@ msgid "Default height of the Message Window"
msgstr "Default height of the Message Window"
#: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "Default height of the Message Window"
+
+#: mail/evolution-mail.schemas.in.in.h:16
msgid "Default reply style"
msgstr "Default reply style"
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
msgid "Default width of the Composer Window"
msgstr "Default width of the Composer Window"
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
msgid "Default width of the Message Window"
msgstr "Default width of the Message Window"
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:19
+#, fuzzy
+msgid "Default width of the Subscribe dialog"
+msgstr "Default width of the Message Window"
+
+#: mail/evolution-mail.schemas.in.in.h:20
msgid "Draw spelling error indicators on words as you type."
msgstr "Draw spelling error indicators on words as you type."
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:21
msgid "Empty Trash folders on exit"
msgstr "Empty Trash folders on exit"
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:22
msgid "Empty all Trash folders when exiting Evolution."
msgstr "Empty all Trash folders when exiting Evolution."
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:23
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "Enable caret mode, so that you can see a cursor when reading mail."
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:24
msgid "Enable/disable caret mode"
msgstr "Enable/disable caret mode"
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:25
msgid "Height of the message-list pane"
msgstr "Height of the message-list pane"
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:26
msgid "Height of the message-list pane."
msgstr "Height of the message-list pane."
-#: mail/evolution-mail.schemas.in.in.h:25
+#: 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 "
@@ -13465,15 +13526,19 @@ msgstr ""
"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."
-#: 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 "List of Labels and their associated colours"
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:30
msgid "List of accounts"
msgstr "List of accounts"
-#: 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."
@@ -13481,11 +13546,11 @@ msgstr ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-#: 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 "List of custom headers and whether they are enabled."
-#: 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."
@@ -13493,15 +13558,15 @@ msgstr ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:colour where colour uses the HTML hex encoding."
-#: 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 "List of mime types to check for bonobo component viewers"
-#: 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 "Load images for HTML messages over http"
-#: 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 - "
@@ -13511,81 +13576,89 @@ msgstr ""
"load images off the net 1 - Load images if sender is in the addressbook 2 - "
"Always load images off the net"
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:37
msgid "Log filter actions"
msgstr "Log filter actions"
-#: 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 "Log filter actions to the specified log file."
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:39
msgid "Logfile to log filter actions"
msgstr "Logfile to log filter actions"
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:40
msgid "Logfile to log filter actions."
msgstr "Logfile to log filter actions."
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:41
msgid "Mark as Seen after specified timeout"
msgstr "Mark as Seen after specified timeout"
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:42
msgid "Mark as Seen after specified timeout."
msgstr "Mark as Seen after specified timeout."
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:43
msgid "Mark citations in the message \"Preview\""
msgstr "Mark citations in the message \"Preview\""
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:44
msgid "Mark citations in the message \"Preview\"."
msgstr "Mark citations in the message \"Preview\"."
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:45
msgid "Message Window default hight"
msgstr "Message Window default hight"
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:46
msgid "Message Window default width"
msgstr "Message Window default width"
-#: 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 "Message-display style (normal, full headers, source)"
-#: 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 "New Mail Notify sound file"
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:51
msgid "New Mail Notify type"
msgstr "New Mail Notify type"
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:52
msgid "Prompt on empty subject"
msgstr "Prompt on empty subject"
-#: 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 "Prompt the user when he or she tries to expunge a folder."
-#: 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 ""
"Prompt the user when he or she tries to send a message without a Subject."
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:55
msgid "Prompt when user expunges"
msgstr "Prompt when user expunges"
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:56
msgid "Prompt when user only fills Bcc"
msgstr "Prompt when user only fills Bcc"
-#: 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."
@@ -13593,91 +13666,105 @@ msgstr ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
-#: 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 "Prompt when user tries to send a message with no To or Cc recipients."
-#: 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 "Prompt when user tries to send unwanted HTML"
-#: 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 "Recognize links in text and replace them."
-#: 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 "Recognize smileys in text and replace them with images."
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:62
msgid "Run junk test on incoming mail"
msgstr "Run junk test on incoming mail"
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:63
msgid "S3kr3t 0pt10n"
msgstr "S3kr3t 0pt10n"
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:64
msgid "S3kr3t 0pt10n."
msgstr "S3kr3t 0pt10n."
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:65
msgid "Send HTML mail by default"
msgstr "Send HTML mail by default"
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:66
msgid "Send HTML mail by default."
msgstr "Send HTML mail by default."
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:67
msgid "Show Animations"
msgstr "Show Animations"
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:68
msgid "Show animated images as animations."
msgstr "Show animated images as animations."
-#: 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 "Show deleted messages (with a strike-through) in the message-list."
-#: 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 "Show deleted messages in the message-list"
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:71
msgid "Show the \"Preview\" pane"
msgstr "Show the \"Preview\" pane"
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:72
msgid "Show the \"Preview\" pane."
msgstr "Show the \"Preview\" pane."
-#: 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 "Sound file to play when new mail arrives."
-#: 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 "Specifies the type of New Mail Notification the user wishes to use."
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:75
msgid "Spell check inline"
msgstr "Spell check inline"
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:76
+#, fuzzy
+msgid "Subscribe dialog default hight"
+msgstr "Message Window default hight"
+
+#: mail/evolution-mail.schemas.in.in.h:77
+#, fuzzy
+msgid "Subscribe dialog default width"
+msgstr "Message Window default width"
+
+#: mail/evolution-mail.schemas.in.in.h:78
msgid "Terminal font"
msgstr "Terminal font"
-#: 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 "The terminal font for mail display"
-#: 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 "The variable width font for mail display"
-#: 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;"
@@ -13689,99 +13776,99 @@ msgstr ""
"header enabled&gt; - set enabled if the header is to be displayed in the "
"mail view."
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:83
msgid "Thread the message list."
msgstr "Thread the message list."
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:84
msgid "Thread the message-list"
msgstr "Thread the message-list"
-#: 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 "Thread the message-list based on Subject"
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:86
msgid "Timeout for marking message as Seen"
msgstr "Timeout for marking message as Seen"
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:87
msgid "Timeout for marking message as Seen."
msgstr "Timeout for marking message as Seen."
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:88
msgid "UID string of the default account."
msgstr "UID string of the default account."
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:89
msgid "Use Spamasssassin daemon and client"
msgstr "Use Spamasssassin daemon and client"
-#: 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 "Use Spamasssassin daemon and client (spamc/spamd)"
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:91
msgid "Use custom fonts"
msgstr "Use custom fonts"
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:92
msgid "Use custom fonts for displaying mail"
msgstr "Use custom fonts for displaying mail"
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:93
msgid "Use only local spam tests."
msgstr "Use only local spam tests."
-#: 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 "Use only the local spam tests (no DNS)."
-#: mail/evolution-mail.schemas.in.in.h:87
+#: mail/evolution-mail.schemas.in.in.h:95
msgid "Variable width font"
msgstr "Variable width font"
-#: mail/evolution-mail.schemas.in.in.h:88
+#: mail/evolution-mail.schemas.in.in.h:96
msgid "View/Bcc menu item is checked"
msgstr "View/Bcc menu item is checked"
-#: mail/evolution-mail.schemas.in.in.h:89
+#: mail/evolution-mail.schemas.in.in.h:97
msgid "View/Bcc menu item is checked."
msgstr "View/Bcc menu item is checked."
-#: mail/evolution-mail.schemas.in.in.h:90
+#: mail/evolution-mail.schemas.in.in.h:98
msgid "View/Cc menu item is checked"
msgstr "View/Cc menu item is checked"
-#: mail/evolution-mail.schemas.in.in.h:91
+#: mail/evolution-mail.schemas.in.in.h:99
msgid "View/Cc menu item is checked."
msgstr "View/Cc menu item is checked."
-#: mail/evolution-mail.schemas.in.in.h:92
+#: mail/evolution-mail.schemas.in.in.h:100
msgid "View/From menu item is checked"
msgstr "View/From menu item is checked"
-#: mail/evolution-mail.schemas.in.in.h:93
+#: mail/evolution-mail.schemas.in.in.h:101
msgid "View/From menu item is checked."
msgstr "View/From menu item is checked."
-#: mail/evolution-mail.schemas.in.in.h:94
+#: mail/evolution-mail.schemas.in.in.h:102
msgid "View/PostTo menu item is checked"
msgstr "View/PostTo menu item is checked"
-#: mail/evolution-mail.schemas.in.in.h:95
+#: mail/evolution-mail.schemas.in.in.h:103
msgid "View/PostTo menu item is checked."
msgstr "View/PostTo menu item is checked."
-#: mail/evolution-mail.schemas.in.in.h:96
+#: mail/evolution-mail.schemas.in.in.h:104
msgid "View/ReplyTo menu item is checked"
msgstr "View/ReplyTo menu item is checked"
-#: mail/evolution-mail.schemas.in.in.h:97
+#: mail/evolution-mail.schemas.in.in.h:105
msgid "View/ReplyTo menu item is checked."
msgstr "View/ReplyTo menu item is checked."
-#: 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."
@@ -13789,11 +13876,11 @@ msgstr ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
-#: mail/evolution-mail.schemas.in.in.h:99
+#: mail/evolution-mail.schemas.in.in.h:107
msgid "port for starting user runned spamd"
msgstr "port for starting user runned spamd"
-#: mail/evolution-mail.schemas.in.in.h:100
+#: mail/evolution-mail.schemas.in.in.h:108
msgid "spamd port"
msgstr "spamd port"
@@ -13832,14 +13919,14 @@ msgstr "Evolution is importing your old Elm mail"
#: mail/importers/elm-importer.c:89
#: mail/importers/evolution-mbox-importer.c:220
#: mail/importers/evolution-outlook-importer.c: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 "Importing..."
#: 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 "Please wait"
@@ -13884,12 +13971,12 @@ msgstr "Importing mailbox"
msgid "Scanning %s"
msgstr "Scanning %s"
-#: mail/importers/netscape-importer.c:72
+#: mail/importers/netscape-importer.c:73
#, c-format
msgid "Priority Filter \"%s\""
msgstr "Priority Filter \"%s\""
-#: 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"
@@ -13915,7 +14002,7 @@ msgstr ""
"of priorities. Check the imported filters to make sure\n"
"everything still works as intended."
-#: 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"
@@ -13927,7 +14014,7 @@ msgstr ""
"feature, which is not supported in Evolution.\n"
"These filters will be dropped."
-#: 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"
@@ -13941,23 +14028,23 @@ msgstr ""
"were modified to test whether that string is or is not\n"
"contained in the message body."
-#: mail/importers/netscape-importer.c:1219
+#: mail/importers/netscape-importer.c:1220
msgid "Evolution is importing your old Netscape data"
msgstr "Evolution is importing your old Netscape data"
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1678
msgid "Importing Netscape data"
msgstr "Importing Netscape data"
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1878
msgid "Settings"
msgstr "Settings"
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1883
msgid "Mail Filters"
msgstr "Mail Filters"
-#: 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?"
@@ -13989,62 +14076,28 @@ msgstr ""
msgid "Pine"
msgstr "Pine"
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Current store format:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "Index body contents"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "New store format:"
-
-#: 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 ""
-"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."
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#: mail/mail-account-editor.c:102
+#: mail/mail-account-editor.c:110
msgid "You have not filled in all of the required information."
msgstr "You have not filled in all of the required information."
#. 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 "Evolution Account Editor"
-#: 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 "_Host:"
-#: 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 "User_name:"
-#: 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 "_Path:"
-#: mail/mail-account-gui.c:1969
+#: mail/mail-account-gui.c:2095
msgid "You may not create two accounts with the same name."
msgstr "You may not create two accounts with the same name."
@@ -14077,11 +14130,11 @@ msgstr "Replies to %s"
msgid "Add Filter Rule"
msgstr "Add Filter Rule"
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:430
msgid "The following filter rule(s):\n"
msgstr "The following filter rule(s):\n"
-#: mail/mail-autofilter.c:428
+#: mail/mail-autofilter.c:436
#, c-format
msgid ""
"Used the removed folder:\n"
@@ -14096,39 +14149,39 @@ msgstr ""
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "You have unsent messages, do you wish to quit anyway?"
-#: mail/mail-component.c:578
+#: mail/mail-component.c:587
msgid "New Mail Message"
msgstr "New Mail Message"
-#: mail/mail-component.c:579
+#: mail/mail-component.c:588
msgid "_Mail Message"
msgstr "_Mail Message"
-#: mail/mail-component.c:580
+#: mail/mail-component.c:589
msgid "Compose a new mail message"
msgstr "Compose a new mail message"
-#: mail/mail-component.c:585
+#: mail/mail-component.c:594
msgid "New Mail Folder"
msgstr "New Mail Folder"
-#: mail/mail-component.c:586
+#: mail/mail-component.c:595
msgid "Mail _Folder"
msgstr "Mail _Folder"
-#: mail/mail-component.c:587
+#: mail/mail-component.c:596
msgid "Create a new mail folder"
msgstr "Create a new mail folder"
-#: mail/mail-component.c:754
+#: mail/mail-component.c:760
msgid "URI of the mail source that the view will display"
msgstr "URI of the mail source that the view will display"
-#: 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 "Identity"
-#: 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 "
@@ -14138,11 +14191,12 @@ msgstr ""
"below do not need to be filled in, unless you wish to include this "
"information in email you send."
-#: 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 "Receiving Mail"
-#: 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."
@@ -14150,15 +14204,15 @@ msgstr ""
"Please enter information about your incoming mail server below. If you are "
"not sure, ask your system administrator or Internet Service Provider."
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:383
msgid "Please select among the following options"
msgstr "Please select among the following options"
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
msgid "Sending Mail"
msgstr "Sending Mail"
-#: 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."
@@ -14166,11 +14220,11 @@ msgstr ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
-#: 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 "Account Management"
-#: 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 "
@@ -14184,123 +14238,256 @@ msgstr ""
"name for this account in the space below. This name will be used for display "
"purposes only."
-#: mail/mail-config.c:1092
+#: mail/mail-config.c:898
msgid "Checking Service"
msgstr "Checking Service"
-#: 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 "Connecting to server..."
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " Ch_eck for Supported Types "
msgstr " _Check for supported types "
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Preview"
+
#: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(SSL is not supported in this build of Evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
+msgstr "(SSL is not supported in this build of evolution)"
#: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
-msgstr "(SSL is not supported in this build of evolution)"
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>Status:</b>"
+
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>Status:</b>"
#: mail/mail-config.glade.h:7
-msgid "<b>_Displayed Mail Headers</b>"
-msgstr "<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"
-msgstr "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"
-msgstr "Account Editor"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
#: mail/mail-config.glade.h:10
-msgid "Account Information"
-msgstr "Account Information"
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Checking for New Mail"
#: mail/mail-config.glade.h:12
-msgid "Add Sc_ript"
-msgstr "Add Sc_ript"
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
#: mail/mail-config.glade.h:13
-msgid "Add new signature..."
-msgstr "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"
-msgstr "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
+#, fuzzy
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr "<b>_Displayed Mail Headers</b>"
#: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "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:"
-msgstr "Always _carbon-copy (Cc) to:"
+msgid "<span weight=\"bold\">General</span>"
+msgstr ""
#: mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+#, fuzzy
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr "New Mail Notification"
+
+#: mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "Sent and Draft Messages"
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "A_lso encrypt to self when sending encrypted mail"
+
+#: mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Account Editor"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Add new signature..."
+
+#: mail/mail-config.glade.h:37
+#, fuzzy
+msgid "Add _Script"
+msgstr "Add Sc_ript"
+
+#: mail/mail-config.glade.h:38
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Al_ways encrypt to myself when sending encrypted mail"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Always _carbon-copy (Cc) to:"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Always _blind carbon-copy (Bcc) to:"
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "_Always sign outgoing messages when using this account"
+
+#: mail/mail-config.glade.h:43
msgid "Always _trust keys in my keyring when encrypting"
msgstr "Always _trust keys in my keyring when encrypting"
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:44
msgid "Attach original message"
msgstr "Attach original message"
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "Attachment"
-#: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Authentication"
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Automatically insert smiley images"
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Automatically check for new mail every"
+
+#: mail/mail-config.glade.h:48
msgid "Baltic (ISO-8859-13)"
msgstr "Baltic (ISO-8859-13)"
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:49
msgid "Baltic (ISO-8859-4)"
msgstr "Baltic (ISO-8859-4)"
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_Beep when new mail arrives"
+
+#: mail/mail-config.glade.h:51
msgid "C_haracter set:"
msgstr "C_haracter set:"
-#: mail/mail-config.glade.h:26
-msgid "C_olors"
-msgstr "C_olours"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr " _Check for supported types "
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:53
msgid "Check _Incoming Mail"
msgstr "Check _Incoming Mail"
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:54
msgid "Check spelling while I _type"
msgstr "Check spelling while I _type"
-#: mail/mail-config.glade.h:29
-msgid "Checking for New Mail"
-msgstr "Checking for New Mail"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:55
msgid "Checks incoming mail messages to be Junk"
msgstr "Checks incoming mail messages to be Junk"
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:56
msgid "Color for _misspelled words:"
msgstr "Colour for _misspelled words:"
-#: mail/mail-config.glade.h:32
-msgid "Composing Messages"
-msgstr "Composing Messages"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Colors"
+msgstr "C_olours"
-#: mail/mail-config.glade.h:33
-msgid "Configuration"
-msgstr "Configuration"
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "_Confirm when expunging a folder"
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:59
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -14316,135 +14503,114 @@ msgstr ""
"\n"
"Click \"Apply\" to save your settings."
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:65
msgid "De_fault"
msgstr "De_fault"
-#: mail/mail-config.glade.h:42
-msgid "Default Behavior"
-msgstr "Default Behaviour"
-
-#: mail/mail-config.glade.h:43
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Default character e_ncoding:"
msgstr "Default character _encoding:"
-#: mail/mail-config.glade.h:44
-msgid "Deleting Mail"
-msgstr "Deleting Mail"
-
-#: mail/mail-config.glade.h:46
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "Digitally _sign outgoing messages (by default)"
+#: mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Defaults"
+msgstr "_Defaults"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:70
msgid "Do not quote original message"
msgstr "Do not quote original message"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:71
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "Don't sign _meeting requests (for Outlook compatibility)"
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "Done"
-#: mail/mail-config.glade.h:50
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Drafts _Folder:"
msgstr "Drafts _folder:"
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:75
msgid "Email Accounts"
msgstr "Email Accounts"
-#: mail/mail-config.glade.h:53
-msgid "Email _address:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Email _Address:"
msgstr "Email _address:"
-#: mail/mail-config.glade.h:54
-msgid "Empty _trash folders on exit"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Empty trash folders on e_xit"
msgstr "Empty _trash folders on exit"
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:78
msgid "Encry_ption certificate:"
msgstr "Encry_ption certificate:"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:79
msgid "Evolution Account Assistant"
msgstr "Evolution Account Assistant"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:80
msgid "Execute Command..."
msgstr "Execute Command..."
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:81
msgid "Fi_xed -width:"
msgstr "Fi_xed -width:"
-#: mail/mail-config.glade.h:59
-msgid "Filter Options"
-msgstr "Filter Options"
-
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:82
msgid "Font Properties"
msgstr "Font Properties"
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:83
msgid "Format messages in _HTML"
msgstr "Format messages in _HTML"
-#: mail/mail-config.glade.h:62
-msgid "H_eaders"
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_HTML Mail"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Headers"
msgstr "H_eaders"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
msgid "Highlight _quotations with"
msgstr "Highlight _quotations with"
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:88
msgid "IMAPv4 "
msgstr "IMAPv4 "
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:91
msgid "Inline"
msgstr "Inline"
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
msgid "Kerberos "
msgstr "Kerberos "
-#: mail/mail-config.glade.h:69
-msgid "Labels and Colors"
-msgstr "Labels and Colours"
-
-#: mail/mail-config.glade.h:71
-msgid "Loading Images"
-msgstr "Loading Images"
-
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:95
msgid "Mail Configuration"
msgstr "Mail Configuration"
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:97
msgid "Mailbox location"
msgstr "Mailbox location"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:98
msgid "Message Composer"
msgstr "Message Composer"
-#: mail/mail-config.glade.h:76
-msgid "Message Display"
-msgstr "Message Display"
-
-#: mail/mail-config.glade.h:77
-msgid "Message Fonts"
-msgstr "Message Fonts"
-
-#: mail/mail-config.glade.h:79
-msgid "New Mail Notification"
-msgstr "New Mail Notification"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:101
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
@@ -14452,139 +14618,148 @@ msgstr ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
-#: mail/mail-config.glade.h:82
-msgid "Optional Information"
-msgstr "Optional Information"
-
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:102
msgid "Or_ganization:"
msgstr "Or_ganization:"
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:103
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG _Key ID:"
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:107
msgid "Pick a color"
msgstr "Pick a colour"
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:108
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_Play sound file when new mail arrives"
+
+#: mail/mail-config.glade.h:109
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
-#: mail/mail-config.glade.h:91
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
-
-#: mail/mail-config.glade.h:92
-msgid "Printed Fonts"
-msgstr "Printed Fonts"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:110
msgid "Qmail maildir "
msgstr "Qmail maildir "
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:111
msgid "Quote original message"
msgstr "Quote original message"
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:112
msgid "Quoted"
msgstr "Quoted"
-#: mail/mail-config.glade.h:96
-msgid "Re_member this password"
-msgstr "Re_member this password"
+#: mail/mail-config.glade.h:113
+#, fuzzy
+msgid "Re_member password"
+msgstr "Remember password"
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:114
msgid "Re_ply-To:"
msgstr "Re_ply-To:"
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:115
msgid "Receiving Email"
msgstr "Receiving Email"
-#: mail/mail-config.glade.h:99
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Receiving Options"
msgstr "Receiving _Options"
-#: mail/mail-config.glade.h:100
-msgid "Remember this _password"
-msgstr "Remember this _password"
-
-#: mail/mail-config.glade.h:101
-msgid "Required Information"
-msgstr "Required Information"
-
-#: mail/mail-config.glade.h:102
-msgid "Restore Defaults"
-msgstr "Restore Defaults"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Remember _password"
+msgstr "Remember password"
-#: mail/mail-config.glade.h:104
-msgid "S_ecurity"
-msgstr "S_ecurity"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "_Standard Font:"
-#: mail/mail-config.glade.h:105
-msgid "Secure MIME (S/MIME)"
-msgstr "Secure MIME (S/MIME)"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Security"
+msgstr "_Security"
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:122
msgid "Select HTML fixed width font"
msgstr "Select HTML fixed width font"
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:123
msgid "Select HTML fixed width font for printing"
msgstr "Select HTML fixed width font for printing"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:124
msgid "Select HTML variable width font"
msgstr "Select HTML variable width font"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:125
msgid "Select HTML variable width font for printing"
msgstr "Select HTML variable width font for printing"
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "Select..."
+msgstr "_Select..."
+
+#: mail/mail-config.glade.h:127
msgid "Sending Email"
msgstr "Sending Email"
-#: mail/mail-config.glade.h:112
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:130
+#, fuzzy
+msgid "Sent _Messages Folder:"
msgstr "Sent _messages folder:"
-#: mail/mail-config.glade.h:113
-msgid "Sent and Draft Messages"
-msgstr "Sent and Draft Messages"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:131
msgid "Ser_ver requires authentication"
msgstr "Ser_ver requires authentication"
-#: mail/mail-config.glade.h:115
-msgid "Server Configuration"
-msgstr "Server Configuration"
-
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:132
msgid "Server _Type: "
msgstr "Server _Type: "
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:133
msgid "Si_gning certificate:"
msgstr "Si_gning certificate:"
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Signature:"
+
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Signatures"
+msgstr "_Signatures"
+
+#: mail/mail-config.glade.h:136
msgid "Specify _filename:"
msgstr "Specify _filename:"
-#: mail/mail-config.glade.h:119
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Spell Checking"
msgstr "Spell _Checking"
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:138
msgid "Standard Unix mbox"
msgstr "Standard Unix mbox"
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:139
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "_Terminal Font:"
+
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "T_ype: "
+msgstr "Type:"
+
+#: 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"
@@ -14594,7 +14769,7 @@ msgstr ""
"signature. The name you specify will be used\n"
"for display purposes only. "
-#: mail/mail-config.glade.h:124
+#: 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 "
@@ -14604,7 +14779,7 @@ msgstr ""
"list of languages here reflects only the languages for which you have a "
"dictionary installed."
-#: mail/mail-config.glade.h:126
+#: 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\""
@@ -14612,15 +14787,15 @@ msgstr ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:148
msgid "Use _Daemon"
msgstr "Use _Daemon"
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:150
msgid "V_ariable-width:"
msgstr "V_ariable-width:"
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:151
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -14630,167 +14805,100 @@ msgstr ""
"\n"
"Click \"Forward\" to begin. "
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:156
msgid "_Add Signature"
msgstr "_Add Signature"
-#: mail/mail-config.glade.h:137
-msgid "_Always load images off the net"
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Always load images from the Internet"
msgstr "_Always load images off the net"
-#: mail/mail-config.glade.h:138
-msgid "_Always sign outgoing messages when using this account"
-msgstr "_Always sign outgoing messages when using this account"
-
-#: mail/mail-config.glade.h:139
-msgid "_Authentication Type: "
-msgstr "_Authentication Type: "
-
-#: mail/mail-config.glade.h:140
-msgid "_Authentication type: "
-msgstr "_Authentication type: "
-
-#: mail/mail-config.glade.h:141
-msgid "_Automatically check for new mail every"
-msgstr "_Automatically check for new mail every"
-
-#: mail/mail-config.glade.h:142
-msgid "_Automatically insert smiley images"
-msgstr "_Automatically insert smiley images"
-
-#: mail/mail-config.glade.h:143
-msgid "_Beep when new mail arrives"
-msgstr "_Beep when new mail arrives"
-
-#: mail/mail-config.glade.h:144
-msgid "_Confirm when expunging a folder"
-msgstr "_Confirm when expunging a folder"
-
-#: mail/mail-config.glade.h:145
-msgid "_Default signature:"
-msgstr "_Default signature:"
-
-#: mail/mail-config.glade.h:146
-msgid "_Defaults"
-msgstr "_Defaults"
+#: mail/mail-config.glade.h:158
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "Digitally _sign outgoing messages (by default)"
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:159
msgid "_Do not notify me when new mail arrives"
msgstr "_Do not notify me when new mail arrives"
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:161
msgid "_Enable"
msgstr "_Enable"
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:162
msgid "_Encrypt outgoing messages (by default)"
msgstr "_Encrypt outgoing messages (by default)"
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:163
msgid "_Forward style:"
msgstr "_Forward style:"
-#: mail/mail-config.glade.h:152
-msgid "_Full name:"
-msgstr "_Full name:"
-
-#: mail/mail-config.glade.h:154
-msgid "_HTML Mail"
-msgstr "_HTML Mail"
-
-#: mail/mail-config.glade.h:156
-msgid "_Identity"
-msgstr "_Identity"
-
-#: mail/mail-config.glade.h:157
-msgid "_Junk"
-msgstr "_Junk"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:166
msgid "_Load images if sender is in address book"
msgstr "_Load images if sender is in address book"
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:167
msgid "_Local Tests Only"
msgstr "_Local Tests Only"
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:168
msgid "_Make this my default account"
msgstr "_Make this my default account"
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:169
msgid "_Mark messages as read after"
msgstr "_Mark messages as read after"
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:170
msgid "_Name:"
msgstr "_Name:"
-#: mail/mail-config.glade.h:163
-msgid "_Never load images off the net"
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Never load images from the Internet"
msgstr "_Never load images off the net"
-#: mail/mail-config.glade.h:165
-msgid "_Play sound file when new mail arrives"
-msgstr "_Play sound file when new mail arrives"
-
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:173
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr "_Prompt when sending HTML messages to contacts that don't want them"
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:174
msgid "_Prompt when sending messages with an empty subject line"
msgstr "_Prompt when sending messages with an empty subject line"
-#: mail/mail-config.glade.h:168
-msgid "_Receiving Mail"
-msgstr "_Receiving Mail"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
msgid "_Reply style:"
msgstr "_Reply style:"
-#: mail/mail-config.glade.h:170
-msgid "_Restore defaults"
-msgstr "_Restore defaults"
-
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
msgid "_Script:"
msgstr "_Script:"
-#: mail/mail-config.glade.h:172
-msgid "_Select..."
-msgstr "_Select..."
-
-#: mail/mail-config.glade.h:173
-msgid "_Sending Mail"
-msgstr "_Sending Mail"
-
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
msgid "_Show animated images"
msgstr "_Show animated images"
-#: mail/mail-config.glade.h:175
-msgid "_Signatures"
-msgstr "_Signatures"
-
-#: mail/mail-config.glade.h:176
-msgid "_Standard Font:"
-msgstr "_Standard Font:"
-
-#: mail/mail-config.glade.h:177
-msgid "_Terminal Font:"
-msgstr "_Terminal Font:"
-
#: mail/mail-config.glade.h:178
-msgid "_Use secure connection (SSL):"
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
msgstr "_Use secure connection (SSL):"
#: mail/mail-config.glade.h:179
msgid "_Use the same fonts as other applications"
msgstr "_Use the same fonts as other applications"
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_minute(s)"
+msgstr "minute(s)"
+
#: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "colour"
+
+#: mail/mail-config.glade.h:182
msgid "description"
msgstr "description"
@@ -14799,7 +14907,7 @@ msgstr "description"
msgid "Pinging %s"
msgstr "Pinging %s"
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:261
#, c-format
msgid ""
"Error while '%s':\n"
@@ -14808,7 +14916,7 @@ msgstr ""
"Error while '%s':\n"
"%s"
-#: mail/mail-mt.c:263
+#: mail/mail-mt.c:264
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -14817,7 +14925,7 @@ msgstr ""
"Error while performing operation:\n"
"%s"
-#: mail/mail-mt.c:902
+#: mail/mail-mt.c:903
msgid "Working"
msgstr "Working"
@@ -14848,111 +14956,110 @@ msgstr ""
msgid "Failed to append to local `Sent' folder: %s"
msgstr "Failed to append to local `Sent' folder: %s"
-#: mail/mail-ops.c:610
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Sending \"%s\""
-
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:664
#, c-format
msgid "Sending message %d of %d"
msgstr "Sending message %d of %d"
-#: mail/mail-ops.c:747
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Failed on message %d of %d"
+#: mail/mail-ops.c:695
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Failed at message %d of %d"
-#: mail/mail-ops.c:749
+#: mail/mail-ops.c:699
msgid "Complete."
msgstr "Complete."
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:796
msgid "Saving message to folder"
msgstr "Saving message to folder"
-#: mail/mail-ops.c:928
+#: mail/mail-ops.c:881
#, c-format
msgid "Moving messages to %s"
msgstr "Moving messages to %s"
-#: mail/mail-ops.c:928
+#: mail/mail-ops.c:881
#, c-format
msgid "Copying messages to %s"
msgstr "Copying messages to %s"
-#: mail/mail-ops.c:1041
+#: mail/mail-ops.c:994
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Scanning folders in \"%s\""
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1190
msgid "Forwarded messages"
msgstr "Forwarded messages"
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1233
#, c-format
msgid "Opening folder %s"
msgstr "Opening folder %s"
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1305
#, c-format
msgid "Opening store %s"
msgstr "Opening store %s"
-#: mail/mail-ops.c:1430
+#: mail/mail-ops.c:1383
#, c-format
msgid "Removing folder %s"
msgstr "Removing folder %s"
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1477
#, c-format
msgid "Storing folder '%s'"
msgstr "Storing folder '%s'"
-#: mail/mail-ops.c:1589
+#: mail/mail-ops.c:1542
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Expunging and storing account '%s'"
-#: mail/mail-ops.c:1590
+#: mail/mail-ops.c:1543
#, c-format
msgid "Storing account '%s'"
msgstr "Storing account '%s'"
-#: mail/mail-ops.c:1645
+#: mail/mail-ops.c:1598
msgid "Refreshing folder"
msgstr "Refreshing folder"
-#: mail/mail-ops.c:1681 mail/mail-ops.c:1732
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
msgid "Expunging folder"
msgstr "Expunging folder"
-#: mail/mail-ops.c:1729
+#: mail/mail-ops.c:1682
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Emptying trash in '%s'"
-#: mail/mail-ops.c:1730
+#: mail/mail-ops.c:1683
msgid "Local Folders"
msgstr "Local Folders"
-#: mail/mail-ops.c:1813
+#: mail/mail-ops.c:1766
#, c-format
msgid "Retrieving message %s"
msgstr "Retrieving message %s"
-#: mail/mail-ops.c:1885
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Retrieving %d message(s)"
+#: mail/mail-ops.c:1838
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Retrieving %d message(s)"
+msgstr[1] "Retrieving %d message(s)"
-#: mail/mail-ops.c:1969
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Saving %d messsage(s)"
+#: mail/mail-ops.c:1924
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Saving %d messsage(s)"
+msgstr[1] "Saving %d messsage(s)"
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:1974
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -14961,7 +15068,7 @@ msgstr ""
"Unable to create output file: %s\n"
" %s"
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2002
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -14970,11 +15077,11 @@ msgstr ""
"Error saving messages to: %s:\n"
" %s"
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2073
msgid "Saving attachment"
msgstr "Saving attachment"
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2090
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -14983,25 +15090,21 @@ msgstr ""
"Cannot create output file: %s:\n"
" %s"
-#: mail/mail-ops.c:2163
+#: mail/mail-ops.c:2120
#, c-format
msgid "Could not write data: %s"
msgstr "Could not write data: %s"
-#: mail/mail-ops.c:2311
+#: mail/mail-ops.c:2268
#, c-format
msgid "Disconnecting from %s"
msgstr "Disconnecting from %s"
-#: mail/mail-ops.c:2311
+#: mail/mail-ops.c:2268
#, c-format
msgid "Reconnecting to %s"
msgstr "Reconnecting to %s"
-#: mail/mail-ops.c:2413
-msgid "Changing junk status"
-msgstr "Changing junk status"
-
#: mail/mail-search.glade.h:2
msgid "Case Sensitive"
msgstr "Case Sensitive"
@@ -15014,84 +15117,80 @@ msgstr "Find in Message"
msgid "Find:"
msgstr "Find:"
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "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 "Digital Signature"
-
-#: mail/mail-security.glade.h:3
-msgid "Encryption"
-msgstr "Encryption"
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
#: mail/mail-security.glade.h:4
msgid "Security Information"
msgstr "Security Information"
-#: mail/mail-send-recv.c:151
+#: mail/mail-send-recv.c:156
msgid "Cancelling..."
msgstr "Cancelling..."
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:263
#, c-format
msgid "Server: %s, Type: %s"
msgstr "Server: %s, Type: %s"
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:265
#, c-format
msgid "Path: %s, Type: %s"
msgstr "Path: %s, Type: %s"
-#: mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:267
#, c-format
msgid "Type: %s"
msgstr "Type: %s"
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:317
msgid "Send & Receive Mail"
msgstr "Send & Receive Mail"
-#: mail/mail-send-recv.c:315
+#: mail/mail-send-recv.c:320
msgid "Cancel _All"
msgstr "Cancel _All"
-#: mail/mail-send-recv.c:396
+#: mail/mail-send-recv.c:401
msgid "Updating..."
msgstr "Updating..."
-#: 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 "Waiting..."
-#: mail/mail-session.c:233
+#: mail/mail-session.c:236
msgid "User canceled operation."
msgstr "User canceled operation."
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
#, c-format
msgid "Enter Password for %s"
msgstr "Enter Password for %s"
-#: mail/mail-session.c:268
+#: mail/mail-session.c:271
msgid "Enter Password"
msgstr "Enter Password"
-#: mail/mail-session.c:295
+#: mail/mail-session.c:298
msgid "_Remember this password"
msgstr "_Remember this password"
-#: mail/mail-session.c:296
+#: mail/mail-session.c:299
msgid "_Remember this password for the remainder of this session"
msgstr "_Remember this password for the remainder of this session"
-#: mail/mail-signature-editor.c:80
+#: mail/mail-signature-editor.c:86
#, c-format
msgid "Could not save signature file: %s"
msgstr "Could not save signature file: %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"
@@ -15101,23 +15200,23 @@ msgstr ""
"\n"
"Do you wish to save your changes?"
-#: mail/mail-signature-editor.c:229
+#: mail/mail-signature-editor.c:236
msgid "_Discard changes"
msgstr "_Discard changes"
-#: mail/mail-signature-editor.c:233
+#: mail/mail-signature-editor.c:240
msgid "Save signature"
msgstr "Save signature"
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:388
msgid "Edit signature"
msgstr "Edit signature"
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:428
msgid "Enter a name for this signature."
msgstr "Enter a name for this signature."
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:431
msgid "Name:"
msgstr "Name:"
@@ -15145,17 +15244,17 @@ msgstr "Forwarded message"
msgid "Invalid folder: `%s'"
msgstr "Invalid folder: `%s'"
-#: mail/mail-vfolder.c:87
+#: mail/mail-vfolder.c:88
#, c-format
msgid "Setting up vfolder: %s"
msgstr "Setting up vfolder: %s"
-#: mail/mail-vfolder.c:206
+#: mail/mail-vfolder.c:207
#, c-format
msgid "Updating vfolders for uri: %s"
msgstr "Updating vfolders for uri: %s"
-#: mail/mail-vfolder.c:524
+#: mail/mail-vfolder.c:525
#, c-format
msgid ""
"The following vFolder(s):\n"
@@ -15168,84 +15267,84 @@ msgstr ""
" '%s'\n"
"And have been updated."
-#: mail/mail-vfolder.c:925
+#: mail/mail-vfolder.c:926
msgid "vFolders"
msgstr "vFolders"
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:965
msgid "Edit VFolder"
msgstr "Edit VFolder"
-#: mail/mail-vfolder.c:984
+#: mail/mail-vfolder.c:985
#, c-format
msgid "Trying to edit a vfolder '%s' which doesn't exist."
msgstr "Trying to edit a vfolder '%s' which doesn't exist."
-#: mail/mail-vfolder.c:1056
+#: mail/mail-vfolder.c:1057
msgid "New VFolder"
msgstr "New VFolder"
-#: mail/message-list.c:927
+#: mail/message-list.c:935
msgid "Unseen"
msgstr "Unseen"
-#: mail/message-list.c:928
+#: mail/message-list.c:936
msgid "Seen"
msgstr "Seen"
-#: mail/message-list.c:929
+#: mail/message-list.c:937
msgid "Answered"
msgstr "Answered"
-#: mail/message-list.c:930
+#: mail/message-list.c:938
msgid "Multiple Unseen Messages"
msgstr "Multiple Unseen Messages"
-#: mail/message-list.c:931
+#: mail/message-list.c:939
msgid "Multiple Messages"
msgstr "Multiple Messages"
-#: mail/message-list.c:935
+#: mail/message-list.c:943
msgid "Lowest"
msgstr "Lowest"
-#: mail/message-list.c:936
+#: mail/message-list.c:944
msgid "Lower"
msgstr "Lower"
-#: mail/message-list.c:940
+#: mail/message-list.c:948
msgid "Higher"
msgstr "Higher"
-#: mail/message-list.c:941
+#: mail/message-list.c:949
msgid "Highest"
msgstr "Highest"
-#: 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 "Today %l:%M %p"
-#: mail/message-list.c:1278
+#: mail/message-list.c:1286
msgid "Yesterday %l:%M %p"
msgstr "Yesterday %l:%M %p"
-#: mail/message-list.c:1290
+#: mail/message-list.c:1298
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:1298
+#: mail/message-list.c:1306
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
-#: mail/message-list.c:1300
+#: mail/message-list.c:1308
msgid "%b %d %Y"
msgstr "%d %b %Y"
-#: mail/message-list.c:3115
+#: mail/message-list.c:3124
msgid "Generating message list"
msgstr "Generating message list"
@@ -15330,7 +15429,8 @@ msgstr ""
"Please select a follow up action from the \"Flag\" menu."
#: mail/message-tags.glade.h:6
-msgid "_Due by:"
+#, fuzzy
+msgid "_Due By:"
msgstr "_Due by:"
#: mail/message-tags.glade.h:7
@@ -15539,7 +15639,7 @@ msgstr ""
msgid "Choose the destination for this import"
msgstr "Choose the destination for this import"
-#: 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 "Please select the information that you would like to import:"
@@ -15568,26 +15668,26 @@ msgstr ""
msgid "Select importer"
msgstr "Select importer"
-#: 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 "File %s does not exist"
-#: shell/e-shell-importer.c:456
+#: shell/e-shell-importer.c:457
msgid "Importing"
msgstr "Importing"
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:465
#, c-format
msgid "Importing %s.\n"
msgstr "Importing %s.\n"
-#: 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 "Error loading %s"
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:492
#, c-format
msgid ""
"Importing %s\n"
@@ -15596,31 +15696,31 @@ msgstr ""
"Importing %s\n"
"Importing item 1."
-#: shell/e-shell-importer.c:544
+#: shell/e-shell-importer.c:546
msgid "Automatic"
msgstr "Automatic"
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:595
msgid "_Filename:"
msgstr "_Filename:"
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:600
msgid "Select a file"
msgstr "Select a file"
-#: shell/e-shell-importer.c:608
+#: shell/e-shell-importer.c:610
msgid "File _type:"
msgstr "File _type:"
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:649
msgid "Import data and settings from _older programs"
msgstr "Import data and settings from _older programs"
-#: shell/e-shell-importer.c:650
+#: shell/e-shell-importer.c:652
msgid "Import a _single file"
msgstr "Import a _single file"
-#: 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"
@@ -15628,25 +15728,25 @@ msgstr ""
"Please wait...\n"
"Scanning for existing setups"
-#: shell/e-shell-importer.c:721
+#: shell/e-shell-importer.c:724
msgid "Starting Intelligent Importers"
msgstr "Starting Intelligent Importers"
-#: 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 "From %s:"
-#: shell/e-shell-importer.c:1034
+#: shell/e-shell-importer.c:1037
#, c-format
msgid "No importer available for file %s"
msgstr "No importer available for file %s"
-#: shell/e-shell-importer.c:1046
+#: shell/e-shell-importer.c:1049
msgid "Unable to execute importer"
msgstr "Unable to execute importer"
-#: shell/e-shell-importer.c:1156
+#: shell/e-shell-importer.c:1159
msgid "_Import"
msgstr "_Import"
@@ -15654,7 +15754,7 @@ msgstr "_Import"
msgid "Closing connections..."
msgstr "Closing connections..."
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:327
msgid "Evolution Settings"
msgstr "Evolution Settings"
@@ -15688,11 +15788,11 @@ msgstr "Could not open shared folder: %s."
msgid "Cannot find the specified shared folder."
msgstr "Cannot find the specified shared folder."
-#: shell/e-shell-startup-wizard.c:569
+#: shell/e-shell-startup-wizard.c:570
msgid "Starting import"
msgstr "Starting import"
-#: 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 "
@@ -15808,7 +15908,6 @@ msgstr "Checkbox"
#: 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 "New"
@@ -15862,16 +15961,17 @@ msgid "Create a new test item"
msgstr "Create a new test item"
#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
+#, fuzzy
+msgid "<b>Active Connections</b>"
msgstr "Active Connections"
#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Click OK to close these connections and go offline"
+msgid "Active Connections"
+msgstr "Active Connections"
#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "The following connections are currently active:"
+msgid "Click OK to close these connections and go offline"
+msgstr "Click OK to close these connections and go offline"
#: shell/glade/e-shell-config-default-folders.glade.h:1
msgid "C_alendar:"
@@ -15989,28 +16089,28 @@ msgstr ""
"With this assistant you will be guided through the process of\n"
"importing external files into Evolution."
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
msgid "Importers"
msgstr "Importers"
-#: 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 "Import"
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
msgid "Don't import"
msgstr "Don't import"
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
msgid "Don't ask me again"
msgstr "Don't ask me again"
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
msgid "Evolution can import data from the following files:"
msgstr "Evolution can import data from the following files:"
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:217
+#: shell/main.c:231
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -16045,7 +16145,7 @@ msgstr ""
"We hope that you enjoy the results of our hard work, and we\n"
"eagerly await your contributions!\n"
-#: shell/main.c:241
+#: shell/main.c:255
msgid ""
"Thanks\n"
"The Ximian Evolution Team\n"
@@ -16053,48 +16153,48 @@ msgstr ""
"Thanks\n"
"The Ximian Evolution Team\n"
-#: shell/main.c:249
+#: shell/main.c:262
msgid "Don't tell me again"
msgstr "Don't tell me again"
-#: shell/main.c:381
+#: shell/main.c:392
msgid "Cannot access the Ximian Evolution shell."
msgstr "Cannot access the Ximian Evolution shell."
-#: shell/main.c:390
+#: shell/main.c:401
#, c-format
msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Cannot initialize the Ximian Evolution shell: %s"
-#: shell/main.c:487
+#: shell/main.c:498
msgid "Start Evolution activating the specified component"
msgstr "Start Evolution activating the specified component"
-#: shell/main.c:489
+#: shell/main.c:500
msgid "Start in offline mode"
msgstr "Start in offline mode"
-#: shell/main.c:491
+#: shell/main.c:502
msgid "Start in online mode"
msgstr "Start in online mode"
-#: shell/main.c:494
+#: shell/main.c:505
msgid "Forcibly shut down all evolution components"
msgstr "Forcibly shut down all evolution components"
-#: shell/main.c:498
+#: shell/main.c:509
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Forcibly re-migrate from Evolution 1.4"
-#: shell/main.c:501
+#: shell/main.c:512
msgid "Send the debugging output of all components to a file."
msgstr "Send the debugging output of all components to a file."
-#: shell/main.c:524
+#: shell/main.c:535
msgid "Evolution"
msgstr "Evolution"
-#: shell/main.c:528
+#: shell/main.c:539
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -16103,30 +16203,30 @@ msgstr ""
"%s: --online and --offline cannot be used together.\n"
" Use %s --help for more information.\n"
-#: 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 "Select a cert to import..."
-#: 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
msgid "Certificate Name"
msgstr "Certificate Name"
-#: smime/gui/certificate-manager.c:246 smime/gui/certificate-manager.c:416
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
msgid "Purposes"
msgstr "Purposes"
-#: 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 "Serial Number"
-#: smime/gui/certificate-manager.c:262
+#: smime/gui/certificate-manager.c:267
msgid "Expires"
msgstr "Expires"
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:417
msgid "E-Mail Address"
msgstr "E-Mail Address"
@@ -16135,11 +16235,22 @@ msgstr "E-Mail Address"
msgid "Certificate Viewer: %s"
msgstr "Certificate Viewer: %s"
-#: smime/gui/component.c:41
+#: smime/gui/component.c:45
#, c-format
msgid "Enter the password for `%s'"
msgstr "Enter the password for `%s'"
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Enter the password for %s"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Enter password"
+
#. FIXME: add serial no, validity date, uses
#: smime/gui/e-cert-selector.c:121
#, c-format
@@ -16330,7 +16441,8 @@ msgstr "You have certificates on file that identify these people:"
msgid "Your Certificates"
msgstr "Your Certificates"
-#: 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
msgid "Certificate already exists"
msgstr "Certificate already exists"
@@ -16601,7 +16713,7 @@ msgstr "Move Contact(s) to Another Folder..."
msgid "Move to Folder..."
msgstr "Move to Folder..."
-#: 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 "Paste the clipboard"
@@ -16611,7 +16723,7 @@ msgstr "Previews the contacts to be printed"
#: 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:81
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr "Print Pre_view"
@@ -16659,13 +16771,13 @@ msgstr "Stop Loading"
msgid "View the current contact"
msgstr "View the current contact"
-#: 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: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 "_Actions"
@@ -16686,14 +16798,10 @@ msgid "_Save as VCard"
msgstr "_Save as VCard"
#: ui/evolution-addressbook.xml.h:42
-msgid "_Search for Contacts"
-msgstr "_Search for Contacts"
-
-#: ui/evolution-addressbook.xml.h:43
msgid "_Select All"
msgstr "_Select All"
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
msgid "_Send Message to Contact..."
msgstr "_Send Message to Contact..."
@@ -16701,58 +16809,54 @@ msgstr "_Send Message to Contact..."
msgid "Day"
msgstr "Day"
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
msgid "Delete All Occurrences"
msgstr "Delete All Occurrences"
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
msgid "Delete the appointment"
msgstr "Delete the appointment"
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
msgid "Delete this Occurrence"
msgstr "Delete this Occurrence"
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
msgid "Delete this occurrence"
msgstr "Delete this occurrence"
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
msgid "Go To"
msgstr "Go To"
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
msgid "Go back"
msgstr "Go back"
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
msgid "Go forward"
msgstr "Go forward"
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Go to _Date"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Go to a specific date"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Go to today"
-
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:13
msgid "List"
msgstr "List"
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:14
msgid "Month"
msgstr "Month"
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Next"
+
+#: ui/evolution-calendar.xml.h:17
msgid "Previews the calendar to be printed"
msgstr "Previews the calendar to be printed"
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Previous"
+
#: ui/evolution-calendar.xml.h:21
msgid "Print this calendar"
msgstr "Print this calendar"
@@ -16761,7 +16865,7 @@ msgstr "Print this calendar"
msgid "Publish Free/Busy information for this calendar"
msgstr "Publish Free/Busy information for this calendar"
-#: 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 "Purg_e"
@@ -16770,34 +16874,54 @@ msgid "Purge old appointments and meetings"
msgstr "Purge old appointments and meetings"
#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Select all text"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Go to a specific date"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Select folder"
+
+#: ui/evolution-calendar.xml.h:29
msgid "Show as list"
msgstr "Show as list"
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
msgid "Show one day"
msgstr "Show one day"
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
msgid "Show one month"
msgstr "Show one month"
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
msgid "Show one week"
msgstr "Show one week"
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
msgid "Show the working week"
msgstr "Show the working week"
-#: 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 "Today"
+
+#: ui/evolution-calendar.xml.h:35
msgid "View the current appointment"
msgstr "View the current appointment"
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:36
msgid "Week"
msgstr "Week"
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:42
msgid "_Open Appointment"
msgstr "_Open Appointment"
@@ -17335,10 +17459,6 @@ msgstr "Move"
msgid "Move selected message(s) to another folder"
msgstr "Move selected message(s) to another folder"
-#: ui/evolution-mail-message.xml.h:65
-msgid "Next"
-msgstr "Next"
-
#: ui/evolution-mail-message.xml.h:66
msgid "Next _Important Message"
msgstr "Next _Important Message"
@@ -17387,10 +17507,6 @@ msgstr "Pr_evious Important Message"
msgid "Preview the message to be printed"
msgstr "Preview the message to be printed"
-#: ui/evolution-mail-message.xml.h:79
-msgid "Previous"
-msgstr "Previous"
-
#: ui/evolution-mail-message.xml.h:82
msgid "Print this message"
msgstr "Print this message"
@@ -17801,39 +17917,39 @@ msgstr "Copy selected task"
msgid "Cut selected task"
msgstr "Cut selected task"
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
msgid "Delete completed tasks"
msgstr "Delete completed tasks"
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
msgid "Delete selected tasks"
msgstr "Delete selected tasks"
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
msgid "Mar_k as Complete"
msgstr "Mar_k as Complete"
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
msgid "Mark selected tasks as complete"
msgstr "Mark selected tasks as complete"
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
msgid "Paste task from the clipboard"
msgstr "Paste task from the clipboard"
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
msgid "Previews the list of tasks to be printed"
msgstr "Previews the list of tasks to be printed"
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
msgid "Print the list of tasks"
msgstr "Print the list of tasks"
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:18
msgid "View the selected task"
msgstr "View the selected task"
-#: ui/evolution-tasks.xml.h:21
+#: ui/evolution-tasks.xml.h:23
msgid "_Open Task"
msgstr "_Open Task"
@@ -17962,10 +18078,15 @@ msgid "_Day View"
msgstr "_Day View"
#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "List View"
+
+#: views/calendar/galview.xml.h:4
msgid "_Month View"
msgstr "_Month View"
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
msgid "_Work Week View"
msgstr "_Work Week View"
@@ -17994,10 +18115,16 @@ msgid "_Messages"
msgstr "_Messages"
#: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "With _Category"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Due Date:"
#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Set Status"
+
+#: views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "_Tasks"
@@ -18056,14 +18183,10 @@ msgstr "MTWTFSS"
msgid "%B %Y"
msgstr "%B %Y"
-#: 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 "Now"
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "Today"
-
#: widgets/misc/e-cell-date-edit.c:805
#, c-format
msgid "The time must be in the format: %s"
@@ -18073,82 +18196,87 @@ msgstr "The time must be in the format: %s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "The percent value must be between 0 and 100, inclusive"
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
msgid "Baltic"
msgstr "Baltic"
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
msgid "Central European"
msgstr "Central European"
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
msgid "Chinese"
msgstr "Chinese"
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
msgid "Cyrillic"
msgstr "Cyrillic"
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
msgid "Greek"
msgstr "Greek"
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
msgid "Hebrew"
msgstr "Hebrew"
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
msgid "Japanese"
msgstr "Japanese"
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
msgid "Korean"
msgstr "Korean"
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
msgid "Turkish"
msgstr "Turkish"
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
msgid "Unicode"
msgstr "Unicode"
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
msgid "Western European"
msgstr "Western European"
-#: 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
+#, fuzzy
+msgid "Western European, New"
+msgstr "Western European"
+
+#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
+#: widgets/misc/e-charset-picker.c:92
msgid "Traditional"
msgstr "Traditional"
-#: 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 "Simplified"
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:99
msgid "Ukrainian"
msgstr "Ukrainian"
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:102
msgid "Visual"
msgstr "Visual"
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:170
#, c-format
msgid "Unknown character set: %s"
msgstr "Unknown character set: %s"
-#: 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 "Character Encoding"
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:224
msgid "Enter the character set to use"
msgstr "Enter the character set to use"
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:320
msgid "Other..."
msgstr "Other..."
@@ -18213,11 +18341,16 @@ msgid "Spacing around expander arrow"
msgstr "Spacing around expander arrow"
#: widgets/misc/e-filter-bar.c:191
+#, fuzzy
+msgid "_Searches"
+msgstr "_Search"
+
+#: widgets/misc/e-filter-bar.c:193
msgid "Search Editor"
msgstr "Search Editor"
#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:212
+#: widgets/misc/e-filter-bar.c:214
msgid "Save Search"
msgstr "Save Search"
@@ -18237,15 +18370,15 @@ msgstr "_Advanced..."
msgid "Choose Image"
msgstr "Choose Image"
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-search-bar.c:540
msgid "_Search"
msgstr "_Search"
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
msgid "_Find Now"
msgstr "_Find Now"
-#: 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 "_Clear"
@@ -18275,6 +18408,321 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% complete)"
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "Address Book Sources"
+#~ msgstr "Address Book Sources"
+
+#~ msgid "Selected:"
+#~ msgstr "Selected:"
+
+#~ msgid "1 contact"
+#~ msgstr "1 contact"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "and %d other contacts."
+
+#~ msgid "1 day"
+#~ msgstr "1 day"
+
+#~ msgid "1 week"
+#~ msgstr "1 week"
+
+#~ msgid "1 hour"
+#~ msgstr "1 hour"
+
+#~ msgid "1 minute"
+#~ msgstr "1 minute"
+
+#~ msgid "1 second"
+#~ msgstr "1 second"
+
+#~ msgid "Description"
+#~ msgstr "Description"
+
+#~ msgid "component"
+#~ msgstr "component"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarms"
+
+#~ msgid "Geographical Position"
+#~ msgstr "Geographical Position"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Every %d days"
+#~ msgstr "Every %d days"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "Every %d weeks"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "Every %d weeks on "
+
+#~ msgid "every %d months"
+#~ msgstr "every %d months"
+
+#~ msgid "Every %d years"
+#~ msgstr "Every %d years"
+
+#~ msgid "Go To Date"
+#~ msgstr "Go To Date"
+
+#~ msgid "_Go To Today"
+#~ msgstr "_Go To Today"
+
+#~ msgid "LDAP Server Name:"
+#~ msgstr "LDAP Server Name:"
+
+#~ msgid "Search base:"
+#~ msgstr "Search base:"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "STARTTLS request timed out: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "STARTTLS response error"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "HELO request timed out: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "HELO response error"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "AUTH request timed out: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH request failed."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "MAIL FROM response error"
+
+#~ msgid "DATA response error"
+#~ msgstr "DATA response error"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr "DATA send timed out: message termination: %s: mail not sent"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "DATA termination response error"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "RSET request timed out: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "RSET response error"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "QUIT request timed out: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "QUIT response error"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "%d seconds ago"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "%d minutes ago"
+
+#~ msgid "%d hours ago"
+#~ msgstr "%d hours ago"
+
+#~ msgid "%d days ago"
+#~ msgstr "%d days ago"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "%d weeks ago"
+
+#~ msgid "%d months ago"
+#~ msgstr "%d months ago"
+
+#~ msgid "%d years ago"
+#~ msgstr "%d years ago"
+
+#~ msgid "Then"
+#~ msgstr "Then"
+
+#~ msgid "If"
+#~ msgstr "If"
+
+#~ msgid "Edit Filters"
+#~ msgstr "Edit Filters"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "Edit VFolders"
+
+#~ msgid "Outgoing"
+#~ msgstr "Outgoing"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "Pipe Message to Shell Command"
+
+#~ msgid "Shell Command"
+#~ msgstr "Shell Command"
+
+#~ msgid "Rules"
+#~ msgstr "Rules"
+
+#~ msgid "[script]"
+#~ msgstr "[script]"
+
+#~ msgid "Add script signature"
+#~ msgstr "Add script signature"
+
+#~ msgid "Current store format:"
+#~ msgstr "Current store format:"
+
+#~ msgid "Index body contents"
+#~ msgstr "Index body contents"
+
+#~ msgid "New store format:"
+#~ msgstr "New store format:"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "maildir"
+#~ msgstr "maildir"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL is not supported in this build of Evolution)"
+
+#~ msgid "Account Information"
+#~ msgstr "Account Information"
+
+#~ msgid "Authentication"
+#~ msgstr "Authentication"
+
+#~ msgid "Composing Messages"
+#~ msgstr "Composing Messages"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuration"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Default Behaviour"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "Deleting Mail"
+
+#~ msgid "Filter Options"
+#~ msgstr "Filter Options"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "Labels and Colours"
+
+#~ msgid "Loading Images"
+#~ msgstr "Loading Images"
+
+#~ msgid "Message Display"
+#~ msgstr "Message Display"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Message Fonts"
+
+#~ msgid "Optional Information"
+#~ msgstr "Optional Information"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Printed Fonts"
+
+#~ msgid "Re_member this password"
+#~ msgstr "Re_member this password"
+
+#~ msgid "Remember this _password"
+#~ msgstr "Remember this _password"
+
+#~ msgid "Required Information"
+#~ msgstr "Required Information"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Restore Defaults"
+
+#~ msgid "S_ecurity"
+#~ msgstr "S_ecurity"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "Secure MIME (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Server Configuration"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "_Authentication Type: "
+
+#~ msgid "_Authentication type: "
+#~ msgstr "_Authentication type: "
+
+#~ msgid "_Default signature:"
+#~ msgstr "_Default signature:"
+
+#~ msgid "_Full name:"
+#~ msgstr "_Full name:"
+
+#~ msgid "_Identity"
+#~ msgstr "_Identity"
+
+#~ msgid "_Junk"
+#~ msgstr "_Junk"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Receiving Mail"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "_Restore defaults"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "_Sending Mail"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "Sending \"%s\""
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Failed on message %d of %d"
+
+#~ msgid "Changing junk status"
+#~ msgstr "Changing junk status"
+
+#~ msgid "Search"
+#~ msgstr "Search"
+
+#~ msgid "Digital Signature"
+#~ msgstr "Digital Signature"
+
+#~ msgid "Encryption"
+#~ msgstr "Encryption"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "The following connections are currently active:"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_Search for Contacts"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Go to _Date"
+
+#~ msgid "Go to today"
+#~ msgstr "Go to today"
+
+#~ msgid "With _Category"
+#~ msgstr "With _Category"
+
#~ msgid "Send an Email"
#~ msgstr "Send an Email"
@@ -18294,9 +18742,6 @@ msgstr "%s (%d%% complete)"
#~ "Run junk test on incoming mail for IMAP accounts (only valid if "
#~ "check_incoming is set to true)"
-#~ msgid " "
-#~ msgstr " "
-
#~ msgid "Do _Not Check Incoming Mail For IMAP Accounts"
#~ msgstr "Do _Not Check Incoming Mail For IMAP Accounts"